diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java index c8d7eba2a..34c4d844e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java @@ -6,14 +6,14 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxCouponCar; -import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxPark; +import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponCarVo; import com.iformall.enums.EnumCarVendor; +import com.iformall.enums.EnumCouponStatus; import com.iformall.enums.EnumETCPCode; +import com.iformall.enums.EnumRentContractAppStatus; import com.iformall.exception.MallinkException; +import com.iformall.mapper.WxCouponMapper; import com.iformall.service.*; import com.iformall.utils.ETCPUtil; import com.iformall.utils.TJDCarUtil; @@ -57,6 +57,12 @@ public class WxCarController extends BaseController { @Autowired WxCouponCarService wxCouponCarService; + @Autowired + WxFlowService wxFlowService; + + @Autowired + WxCouponMapper wxCouponMapper; + private WxPark getCurrentPark() { WxPark parkQ = new WxPark(); parkQ.setTenantId(getTenantId()); @@ -239,6 +245,23 @@ public class WxCarController extends BaseController { wxCouponCarService.update(couponCar); } + //启动审批流 + if (coupon.getFlowParams() != null && coupon.getFlowParams().size() > 0) { + WxCoupon wc = new WxCoupon(); + wc.setId(coupon.getId()); + + coupon.getFlowParams().put("businessId",coupon.getId()); + wxFlowService.start(coupon.getFlowParams(), getUserId(), getUser().getName(), getTenantId()); + //作废审批 + if (EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(coupon.getStatus())) { + wc.setCancleApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); + }else{ + //投放审批 + wc.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); + } + wxCouponMapper.updateByPrimaryKeySelective(wc); + } + return new ResultData(coupon.getId()); } 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 dabec7127..40871032b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -329,12 +329,6 @@ public class WxCouponController extends BaseController { @SystemControllerLog(description = "券投放-砍价营销列表") public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { Map result = new HashedMap(); - if(wxCoupon.getStartdate() == null){ - wxCoupon.setStartdate(DateUtils.getFirstDayForCurrMonth()); - } - if(wxCoupon.getEnddate() == null){ - wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); - } wxCoupon.setTenantId(getTenantId()); PageInfo pages = wxCouponService.findPressData(wxCoupon,pageNum,pageSize); return new ResultData(pages); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java index 0f2a613da..4ef8e8ae3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java @@ -33,5 +33,7 @@ public class WxCouponCar extends BaseEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; - + @Transient + @io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams") + private Map flowParams; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java index ebd3d62c2..28fc955bd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java @@ -22,4 +22,7 @@ public class WxCouponCarVo extends WxCoupon implements Serializable { private String vendorType; @io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams") private String vendorParams; + + @Transient + private Integer status; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 12f5447b7..d0fb244c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -156,12 +156,13 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { return new ResultData(Result.SUCCESS, "查询成功", data); } Long finalCouponId = couponId; + int size = voList.size(); + data.put("size", size); voList = voList.stream() .filter(wxCouponChannelVo -> !wxCouponChannelVo.getCouponId().equals(finalCouponId)) .collect(Collectors.toList()); - int size = voList.size(); + size = voList.size(); Random random = new Random(); - data.put("size", size); data.put("data", voList.get(random.nextInt(size))); return new ResultData(Result.SUCCESS, "查询成功", data); } 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 f63f42500..2f0e0e79e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1052,7 +1052,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { needpayFront = getNeedPayMoney(wxRentContract,priceArrs[index-1],billTimeVo.getStartDate(),endDate,i,billTimeVoList.size(),saveDb); }else{ if(billTimeVo.getStartDate().before(endDate)){ - needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index - 1], billTimeVo.getStartDate(), endDate, i, billTimeVoList.size(), saveDb); + needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index - 1], billTimeVo.getStartDate(), DateUtils.getDaySet(endDate,Calendar.DATE,-1), i, billTimeVoList.size(), saveDb); needpayAfter = getNeedPayMoney(wxRentContract, priceArrs[index], endDate, billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb); }else{ needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index], billTimeVo.getStartDate(), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb); @@ -2040,8 +2040,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { //判断是否满足整月 int startInt = Integer.parseInt(sdD.format(start)); - int endInt = Integer.parseInt(sdD.format(end)); - if(startInt == (endInt+1)){ + int endInt = Integer.parseInt(sdD.format(DateUtils.getDaySet(end,Calendar.DATE,1))); + + if(startInt == endInt){ int months = getMonths(sdM.format(start)+"-01",sdM.format(end)+"-01"); return months * price; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 52cfc7a5b..4ab13d62d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -654,23 +654,17 @@ diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index a048b5fb8..119318492 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -956,7 +956,7 @@ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, c.cover_img,c.title,c.sub_title,c.sale_price,c.price,c.unit,c.detail,c.remark, - a.amount,a.remaining_amount,a.support_transfer + a.amount,a.remaining_amount,case when c.status=1 then 0 else a.support_transfer end support_transfer