From cb3a997833367be7f8611779ce62fe97da95f197 Mon Sep 17 00:00:00 2001 From: luozukai Date: Sat, 3 Aug 2019 17:08:25 +0800 Subject: [PATCH] =?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; }