From 2415ae19ddef1dea0caab33d43c3fe8fa8e96d51 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 2 Aug 2019 22:40:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A0=8D=E4=BB=B7=E7=BB=9F=E8=AE=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponController.java | 6 ---- .../main/resources/mapper/WxCouponMapper.xml | 29 ++++++++----------- 2 files changed, 12 insertions(+), 23 deletions(-) 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/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 52cfc7a5b..ec986f131 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -654,23 +654,17 @@ From 764b9b93a7e3467b245e8e2c468ffcaed97b74df Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 3 Aug 2019 10:51:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index ec986f131..4ab13d62d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -663,7 +663,7 @@ left join (SELECT count(id) as press_count, coupon_id FROM wx_order_press WHERE `tenant_id` = #{tenantId} AND `first` = 1 group by coupon_id) op on op.coupon_id = c.id left join (SELECT count(id) as press_succ_count, product_id FROM wx_order WHERE `tenant_id` = #{tenantId} AND order_status = 1 group by product_id) o on o.product_id = c.id left join (SELECT count(id) as join_count, coupon_id FROM wx_order_press op WHERE `tenant_id` = #{tenantId} group by coupon_id) op2 on op2.coupon_id = c.id - left join (SELECT count(id) as xCount, coupon_id FROM wx_coupon_order WHERE `tenant_id` = #{tenantId} AND coupon_order_status = 1) cop on cop.coupon_id = c.id + left join (SELECT count(id) as xCount, coupon_id FROM wx_coupon_order WHERE `tenant_id` = #{tenantId} AND coupon_order_status = 1 group by coupon_id) cop on cop.coupon_id = c.id where c.type = 8 and c.tenant_id=#{tenantId} From 84270e11187fe5ab7594f5a9ff9e7eb1117bf932 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 3 Aug 2019 10:58:25 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[C=E7=AB=AF=E9=A6=96=E9=A1=B5][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=8D=A2=E4=B8=80=E6=8D=A2=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E4=B8=8E=E7=A0=8D=E4=BB=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxCouponChannelServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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); } From e4828f00d69b3a3e5a5a0e26a21c321da8ec5051 Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 3 Aug 2019 13:59:28 +0800 Subject: [PATCH 4/7] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=B4=A6=E5=8D=95=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 679366023..42116a0d9 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); From a9d741f22d74872f22ad8d63cafa57444d0bc7c2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 3 Aug 2019 15:16:23 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=B4=A6=E5=8D=95=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 42116a0d9..85d16264b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2037,8 +2037,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; } From cb3a997833367be7f8611779ce62fe97da95f197 Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 3 Aug 2019 17:08:25 +0800 Subject: [PATCH 6/7] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E8=B4=A6=E5=8D=95=E7=94=9F=E6=88=90?= =?UTF-8?q?=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/car/WxCarController.java | 31 ++++++++++++++++--- .../com/iformall/domain/po/WxCouponCar.java | 4 ++- .../com/iformall/domain/vo/WxCouponCarVo.java | 3 ++ 3 files changed, 33 insertions(+), 5 deletions(-) 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/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; } From ed404e16665737f686d87aab57befd801b09484d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 3 Aug 2019 17:19:06 +0800 Subject: [PATCH 7/7] =?UTF-8?q?[C=E7=AB=AF=E6=B6=88=E8=B4=B9=E5=8D=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=8F=AF=E8=BD=AC=E8=B5=A0=E7=8A=B6?= =?UTF-8?q?=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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