diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 0d2415702..41660ac40 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -103,9 +103,9 @@ public class WxCouponController extends BaseController { return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } - private Map generateFlowParams(EnumFlowKey flowType,EnumCouponAppType approvalType, Long couponId,String remark,String phone) { + private Map generateFlowParams(EnumFlowKey flowType,EnumCouponAppType approvalType, WxCoupon wxCoupon,String remark,String phone) { Map map = new HashMap(); - map.put("businessId", String.valueOf(couponId)); + map.put("businessId", String.valueOf(wxCoupon.getId())); map.put("businessType", flowType.getCode()); map.put("remark", remark); map.put("phone", phone); @@ -114,6 +114,17 @@ public class WxCouponController extends BaseController { contractTypeMap.put("key","approvalType"); contractTypeMap.put("value",String.valueOf(approvalType.getCode())); variablesList.add(contractTypeMap); + + Map couponNameMap = new HashMap(); + couponNameMap.put("key","couponName"); + couponNameMap.put("value",wxCoupon.getTitle()); + variablesList.add(couponNameMap); + + Map couponTypeMap = new HashMap(); + couponTypeMap.put("key","couponType"); + couponTypeMap.put("value",wxCoupon.getType()); + variablesList.add(couponTypeMap); + map.put("variables", variablesList); return map; } @@ -162,7 +173,7 @@ public class WxCouponController extends BaseController { return new ResultData(Result.ERROR,EnumFlowKey.B_COUPON_MERCHANT_CREATE.getMessage()+"未配置审批流程"); } WxMerchantBUser buser = getUser(); - wxFlowService.start(generateFlowParams(EnumFlowKey.B_COUPON_MERCHANT_CREATE,EnumCouponAppType.PUT,wxCoupon.getId(),wxCoupon.getRemark(), buser.getPhone()), getBuserId(), buser.getName(), wxCoupon); + wxFlowService.start(generateFlowParams(EnumFlowKey.B_COUPON_MERCHANT_CREATE,EnumCouponAppType.PUT,wxCoupon,wxCoupon.getRemark(), buser.getPhone()), getBuserId(), buser.getName(), wxCoupon); return new ResultData(Result.SUCCESS,"提交审批成功"); }