Просмотр исходного кода

[合同][修改][修改预账单生成逻辑]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
cb3a997833
3 измененных файлов: 33 добавлений и 5 удалений
  1. +27
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java

+ 27
- 4
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.ErrorCode;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController; 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.domain.vo.WxCouponCarVo;
import com.iformall.enums.EnumCarVendor; import com.iformall.enums.EnumCarVendor;
import com.iformall.enums.EnumCouponStatus;
import com.iformall.enums.EnumETCPCode; import com.iformall.enums.EnumETCPCode;
import com.iformall.enums.EnumRentContractAppStatus;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxCouponMapper;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.ETCPUtil; import com.iformall.utils.ETCPUtil;
import com.iformall.utils.TJDCarUtil; import com.iformall.utils.TJDCarUtil;
@@ -57,6 +57,12 @@ public class WxCarController extends BaseController {
@Autowired @Autowired
WxCouponCarService wxCouponCarService; WxCouponCarService wxCouponCarService;


@Autowired
WxFlowService wxFlowService;

@Autowired
WxCouponMapper wxCouponMapper;

private WxPark getCurrentPark() { private WxPark getCurrentPark() {
WxPark parkQ = new WxPark(); WxPark parkQ = new WxPark();
parkQ.setTenantId(getTenantId()); parkQ.setTenantId(getTenantId());
@@ -239,6 +245,23 @@ public class WxCarController extends BaseController {
wxCouponCarService.update(couponCar); 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()); return new ResultData(coupon.getId());
} }




+ 3
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCouponCar.java Просмотреть файл

@@ -33,5 +33,7 @@ public class WxCouponCar extends BaseEntity {
private Date createDate; private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate; private Date updateDate;
@Transient
@io.swagger.annotations.ApiModelProperty(value = "审批流参数", name = "flowParams")
private Map<String, Object> flowParams;
} }

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCarVo.java Просмотреть файл

@@ -22,4 +22,7 @@ public class WxCouponCarVo extends WxCoupon implements Serializable {
private String vendorType; private String vendorType;
@io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams") @io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams")
private String vendorParams; private String vendorParams;

@Transient
private Integer status;
} }

Загрузка…
Отмена
Сохранить