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

fix coupon flow

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
8a5d9d9256
1 измененных файлов: 14 добавлений и 3 удалений
  1. +14
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java

+ 14
- 3
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<String,Object> generateFlowParams(EnumFlowKey flowType,EnumCouponAppType approvalType, Long couponId,String remark,String phone) {
private Map<String,Object> generateFlowParams(EnumFlowKey flowType,EnumCouponAppType approvalType, WxCoupon wxCoupon,String remark,String phone) {
Map<String,Object> map = new HashMap<String,Object>();
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<String,Object>();
couponNameMap.put("key","couponName");
couponNameMap.put("value",wxCoupon.getTitle());
variablesList.add(couponNameMap);
Map couponTypeMap = new HashMap<String,Object>();
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,"提交审批成功");
}


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