Ver código fonte

Merge branch 'release_toaliyun_real_202302' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202302

 Conflicts:
	mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
release_toaliyun_real
xhxu 3 anos atrás
pai
commit
541ecc17c5
8 arquivos alterados com 102 adições e 63 exclusões
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  2. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  3. +63
    -49
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  4. +13
    -10
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java
  5. +2
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  6. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  7. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java
  8. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java Ver arquivo

@@ -49,7 +49,7 @@ public class BaseController {
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
// MallUserInfo user = new MallUserInfo(); // MallUserInfo user = new MallUserInfo();
// user.setId(321127266275430400L); // user.setId(321127266275430400L);
// user.setName("富茂光谷测试版管理员");
// user.setName("alitest");
// user.setTenantId("789"); // user.setTenantId("789");
// user.setParentTenantId(null); // user.setParentTenantId(null);
return user; return user;


+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Ver arquivo

@@ -276,6 +276,12 @@ public class WxMerchantController extends BaseController {
wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.updateTenantInfo(getTenantInfo());
return wxMerchantService.updateMerchantLevel(wxMerchant); return wxMerchantService.updateMerchantLevel(wxMerchant);
} }
@ApiOperation("商户手填收款账号")
@PostMapping("setMerchantAccount")
public ResultData setMerchantAccount(@RequestBody WxMerchant wxMerchant) {
return null;
}


@ApiOperation("查询当前租户下商户名称列表") @ApiOperation("查询当前租户下商户名称列表")
@GetMapping("/name_list") @GetMapping("/name_list")


+ 63
- 49
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Ver arquivo

@@ -456,17 +456,23 @@ public class WxCouponController extends BaseController {
// wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); // wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
// } // }
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) {
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
}else { }else {
wxCoupon.setId(-1L);
} }
PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCountData(wxCoupon,tenantEntitys, pageNum, pageSize); PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCountData(wxCoupon,tenantEntitys, pageNum, pageSize);
for (WxCouponStatisVo coupon : pageInfo.getList()) { for (WxCouponStatisVo coupon : pageInfo.getList()) {
if (coupon.getSaleAmount() == null) { if (coupon.getSaleAmount() == null) {
@@ -498,16 +504,18 @@ public class WxCouponController extends BaseController {
// wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); // wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"));
// } // }
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) {
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
} }
wxCouponService.exportCardData(wxCoupon,tenantEntitys, request, response); wxCouponService.exportCardData(wxCoupon,tenantEntitys, request, response);
} }
@@ -532,16 +540,18 @@ public class WxCouponController extends BaseController {
// } // }


wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) {
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
} }


PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCouponData(wxCoupon, tenantEntitys, pageNum, pageSize); PageInfo<WxCouponStatisVo> pageInfo = wxCouponService.findCouponData(wxCoupon, tenantEntitys, pageNum, pageSize);
@@ -572,16 +582,18 @@ public class WxCouponController extends BaseController {
// } // }


wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode());
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) {
//根据上架时间查询券
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(tenantEntity);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
} }
wxCouponService.exportCouponData(wxCoupon,tenantEntitys, request, response); wxCouponService.exportCouponData(wxCoupon,tenantEntitys, request, response);
} }
@@ -624,16 +636,18 @@ public class WxCouponController extends BaseController {


//根据投放时间搜索 //根据投放时间搜索
private void handleCouponStartDate(WxCoupon wxCoupon){ private void handleCouponStartDate(WxCoupon wxCoupon){
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(wxCoupon);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) {
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(wxCoupon);
couponChannelQ.setStartdate(wxCoupon.getStartdate());
couponChannelQ.setEnddate(wxCoupon.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxCoupon.setIds(couponIds);
}else {
wxCoupon.setId(-1L);
}
}
} }


@GetMapping("exportCouponPassword") @GetMapping("exportCouponPassword")


+ 13
- 10
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java Ver arquivo

@@ -8,6 +8,7 @@ import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxOrderGroupMarketing; import com.iformall.domain.vo.WxOrderGroupMarketing;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxMallService; import com.iformall.service.WxMallService;
import com.iformall.service.WxOrderGroupService; import com.iformall.service.WxOrderGroupService;
@@ -79,16 +80,18 @@ public class WxOrderGroupController extends BaseController {


//处理投放时间 //处理投放时间
private void handleCouponStartDate(WxOrderGroupMarketing wxOrderGroupMarketing){ private void handleCouponStartDate(WxOrderGroupMarketing wxOrderGroupMarketing){
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(wxOrderGroupMarketing);
couponChannelQ.setStartdate(wxOrderGroupMarketing.getStartdate());
couponChannelQ.setEnddate(wxOrderGroupMarketing.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxOrderGroupMarketing.setCouponIdList(couponIds);
}else {
wxOrderGroupMarketing.setCouponId("-1");
}
if (null != wxOrderGroupMarketing.getStartdate() || null != wxOrderGroupMarketing.getEnddate()) {
WxCouponChannel couponChannelQ = new WxCouponChannel();
couponChannelQ.updateTenantInfo(wxOrderGroupMarketing);
couponChannelQ.setStartdate(wxOrderGroupMarketing.getStartdate());
couponChannelQ.setEnddate(wxOrderGroupMarketing.getEnddate());
List<Long> couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ);
if (null != couponIds && couponIds.size() > 0 ) {
wxOrderGroupMarketing.setCouponIdList(couponIds);
}else {
wxOrderGroupMarketing.setCouponId("-1");
}
}
} }


} }

+ 2
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java Ver arquivo

@@ -376,8 +376,6 @@ public class WxCarController extends BaseController {
Integer used = ParkCacheUtils.getCarCouponUseCacheLock(redisTemplate, vendor.getMessage(), carNumber); Integer used = ParkCacheUtils.getCarCouponUseCacheLock(redisTemplate, vendor.getMessage(), carNumber);


if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) {
if (null == used || (null != used && used.intValue() < 1)) { if (null == used || (null != used && used.intValue() < 1)) {
ResultData result = etcpHelper.getCoupon(paramMap, park, userCar,carNumber); ResultData result = etcpHelper.getCoupon(paramMap, park, userCar,carNumber);
@@ -506,7 +504,7 @@ public class WxCarController extends BaseController {
"127.0.0.1", park.getPaidCallBack(), payAccount.getApiKey(), new Date()); "127.0.0.1", park.getPaidCallBack(), payAccount.getApiKey(), new Date());
return new ResultData(wxResult); return new ResultData(wxResult);
} catch (Exception e) { } catch (Exception e) {
logger.error("park getCarStopFee error",e);
logger.error("park createPayOrder error",e);
return new ResultData(Result.ERROR,e.getMessage()); return new ResultData(Result.ERROR,e.getMessage());
} }
} }
@@ -526,6 +524,7 @@ public class WxCarController extends BaseController {
public ResultData payOrderList(Integer pageNum, Integer pageSize) { public ResultData payOrderList(Integer pageNum, Integer pageSize) {
WxCarPayOrder carPayOrder = new WxCarPayOrder(); WxCarPayOrder carPayOrder = new WxCarPayOrder();
carPayOrder.updateTenantInfo(getTenantInfo()); carPayOrder.updateTenantInfo(getTenantInfo());
carPayOrder.setCUserId(getMemberId());
carPayOrder.setSortColumn(SortField.CreateTime_DESC.getValue()); carPayOrder.setSortColumn(SortField.CreateTime_DESC.getValue());
return new ResultData(wxParkPayService.listPayOrderAsPage(carPayOrder, pageNum, pageSize)); return new ResultData(wxParkPayService.listPayOrderAsPage(carPayOrder, pageNum, pageSize));
} }


+ 8
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Ver arquivo

@@ -395,6 +395,14 @@ public class WxMerchant extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private BigDecimal latitude; private BigDecimal latitude;
@io.swagger.annotations.ApiModelProperty(value="首款账号",name="account")
@TableField(exist = false)
private String account;
@io.swagger.annotations.ApiModelProperty(value="收款账号",name="apiKey")
@TableField(exist = false)
private String apiKey;
//查询停车商户根据此字段 //查询停车商户根据此字段
@TableField(exist = false) @TableField(exist = false)
private Integer hasCarVendor; private Integer hasCarVendor;


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java Ver arquivo

@@ -59,5 +59,8 @@ public class WxOrderGroupMarketing extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private List<Long> couponIdList; private List<Long> couponIdList;
@TableField(exist = false)
private Integer putIn;//是否已投放


} }

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Ver arquivo

@@ -850,6 +850,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
record.setStatus(wxRentContract.getStatus()); record.setStatus(wxRentContract.getStatus());
} }
record.setApplyStatus(wxRentContract.getApplyStatus()); record.setApplyStatus(wxRentContract.getApplyStatus());
if (StringUtils.isBlank(record.getOperatingManagementFee())){
record.setOperatingManagementFee(null);
}
if (StringUtils.isBlank(record.getBussinessManagementFee())){
record.setBussinessManagementFee(null);
}
wxRentContractMapper.updateById(record); wxRentContractMapper.updateById(record);
record.setRentalStartDate(tempDate); record.setRentalStartDate(tempDate);
} catch (Exception e) { } catch (Exception e) {


Carregando…
Cancelar
Salvar