diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 519532461..fddbb2568 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -49,7 +49,7 @@ public class BaseController { MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); // MallUserInfo user = new MallUserInfo(); // user.setId(321127266275430400L); -// user.setName("富茂光谷测试版管理员"); +// user.setName("alitest"); // user.setTenantId("789"); // user.setParentTenantId(null); return user; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 876332856..ac2a3a4fd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -276,6 +276,12 @@ public class WxMerchantController extends BaseController { wxMerchant.updateTenantInfo(getTenantInfo()); return wxMerchantService.updateMerchantLevel(wxMerchant); } + + @ApiOperation("商户手填收款账号") + @PostMapping("setMerchantAccount") + public ResultData setMerchantAccount(@RequestBody WxMerchant wxMerchant) { + return null; + } @ApiOperation("查询当前租户下商户名称列表") @GetMapping("/name_list") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 37b2e84f5..1b779efa8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -456,17 +456,23 @@ public class WxCouponController extends BaseController { // wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); // } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - //根据上架时间查询券 - WxCouponChannel couponChannelQ = new WxCouponChannel(); - couponChannelQ.updateTenantInfo(tenantEntity); - couponChannelQ.setStartdate(wxCoupon.getStartdate()); - couponChannelQ.setEnddate(wxCoupon.getEnddate()); - List 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 couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + wxCoupon.setIds(couponIds); + }else { + wxCoupon.setId(-1L); + } }else { - wxCoupon.setId(-1L); + } + + PageInfo pageInfo = wxCouponService.findCountData(wxCoupon,tenantEntitys, pageNum, pageSize); for (WxCouponStatisVo coupon : pageInfo.getList()) { 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.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - //根据上架时间查询券 - WxCouponChannel couponChannelQ = new WxCouponChannel(); - couponChannelQ.updateTenantInfo(tenantEntity); - couponChannelQ.setStartdate(wxCoupon.getStartdate()); - couponChannelQ.setEnddate(wxCoupon.getEnddate()); - List 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 couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + wxCoupon.setIds(couponIds); + }else { + wxCoupon.setId(-1L); + } } wxCouponService.exportCardData(wxCoupon,tenantEntitys, request, response); } @@ -532,16 +540,18 @@ public class WxCouponController extends BaseController { // } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - //根据上架时间查询券 - WxCouponChannel couponChannelQ = new WxCouponChannel(); - couponChannelQ.updateTenantInfo(tenantEntity); - couponChannelQ.setStartdate(wxCoupon.getStartdate()); - couponChannelQ.setEnddate(wxCoupon.getEnddate()); - List 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 couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + wxCoupon.setIds(couponIds); + }else { + wxCoupon.setId(-1L); + } } PageInfo pageInfo = wxCouponService.findCouponData(wxCoupon, tenantEntitys, pageNum, pageSize); @@ -572,16 +582,18 @@ public class WxCouponController extends BaseController { // } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - //根据上架时间查询券 - WxCouponChannel couponChannelQ = new WxCouponChannel(); - couponChannelQ.updateTenantInfo(tenantEntity); - couponChannelQ.setStartdate(wxCoupon.getStartdate()); - couponChannelQ.setEnddate(wxCoupon.getEnddate()); - List 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 couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + wxCoupon.setIds(couponIds); + }else { + wxCoupon.setId(-1L); + } } wxCouponService.exportCouponData(wxCoupon,tenantEntitys, request, response); } @@ -624,16 +636,18 @@ public class WxCouponController extends BaseController { //根据投放时间搜索 private void handleCouponStartDate(WxCoupon wxCoupon){ - WxCouponChannel couponChannelQ = new WxCouponChannel(); - couponChannelQ.updateTenantInfo(wxCoupon); - couponChannelQ.setStartdate(wxCoupon.getStartdate()); - couponChannelQ.setEnddate(wxCoupon.getEnddate()); - List 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 couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + wxCoupon.setIds(couponIds); + }else { + wxCoupon.setId(-1L); + } + } } @GetMapping("exportCouponPassword") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java index 19d8483de..0fdfd1a38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -8,6 +8,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxOrderGroupMarketing; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxMallService; import com.iformall.service.WxOrderGroupService; @@ -79,16 +80,18 @@ public class WxOrderGroupController extends BaseController { //处理投放时间 private void handleCouponStartDate(WxOrderGroupMarketing wxOrderGroupMarketing){ - WxCouponChannel couponChannelQ = new WxCouponChannel(); - couponChannelQ.updateTenantInfo(wxOrderGroupMarketing); - couponChannelQ.setStartdate(wxOrderGroupMarketing.getStartdate()); - couponChannelQ.setEnddate(wxOrderGroupMarketing.getEnddate()); - List 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 couponIds = wxCouponChannelService.findCouponIdList(couponChannelQ); + if (null != couponIds && couponIds.size() > 0 ) { + wxOrderGroupMarketing.setCouponIdList(couponIds); + }else { + wxOrderGroupMarketing.setCouponId("-1"); + } + } } } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 636a9c4cc..4a03af478 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -376,8 +376,6 @@ public class WxCarController extends BaseController { Integer used = ParkCacheUtils.getCarCouponUseCacheLock(redisTemplate, vendor.getMessage(), carNumber); - - if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { if (null == used || (null != used && used.intValue() < 1)) { 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()); return new ResultData(wxResult); } catch (Exception e) { - logger.error("park getCarStopFee error",e); + logger.error("park createPayOrder error",e); return new ResultData(Result.ERROR,e.getMessage()); } } @@ -526,6 +524,7 @@ public class WxCarController extends BaseController { public ResultData payOrderList(Integer pageNum, Integer pageSize) { WxCarPayOrder carPayOrder = new WxCarPayOrder(); carPayOrder.updateTenantInfo(getTenantInfo()); + carPayOrder.setCUserId(getMemberId()); carPayOrder.setSortColumn(SortField.CreateTime_DESC.getValue()); return new ResultData(wxParkPayService.listPayOrderAsPage(carPayOrder, pageNum, pageSize)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index bf9a33813..796ee3210 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -395,6 +395,14 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) 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) private Integer hasCarVendor; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java index 817a359f1..be1752080 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java @@ -59,5 +59,8 @@ public class WxOrderGroupMarketing extends TenantEntity { @TableField(exist = false) private List couponIdList; + + @TableField(exist = false) + private Integer putIn;//是否已投放 } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index fe5ceac85..5f5adceb2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -850,6 +850,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { record.setStatus(wxRentContract.getStatus()); } record.setApplyStatus(wxRentContract.getApplyStatus()); + if (StringUtils.isBlank(record.getOperatingManagementFee())){ + record.setOperatingManagementFee(null); + } + if (StringUtils.isBlank(record.getBussinessManagementFee())){ + record.setBussinessManagementFee(null); + } wxRentContractMapper.updateById(record); record.setRentalStartDate(tempDate); } catch (Exception e) {