From 3c99bc9135c54c9126b651367cdb620c89adf5d6 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 9 Sep 2020 19:27:31 +0800 Subject: [PATCH] fix flow bug --- .../iformall/controller/WxCouponController.java | 7 +++++-- .../iformall/service/impl/WxFlowServiceImpl.java | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 6b770a6d4..0d2415702 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxCouponPassword; import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.enums.*; @@ -102,11 +103,12 @@ public class WxCouponController extends BaseController { return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } - private Map generateFlowParams(EnumFlowKey flowType,EnumCouponAppType approvalType, Long couponId,String remark) { + private Map generateFlowParams(EnumFlowKey flowType,EnumCouponAppType approvalType, Long couponId,String remark,String phone) { Map map = new HashMap(); map.put("businessId", String.valueOf(couponId)); map.put("businessType", flowType.getCode()); map.put("remark", remark); + map.put("phone", phone); List variablesList = new ArrayList(); Map contractTypeMap = new HashMap(); contractTypeMap.put("key","approvalType"); @@ -159,7 +161,8 @@ public class WxCouponController extends BaseController { if (!hasMerchantCouponFlow()) { return new ResultData(Result.ERROR,EnumFlowKey.B_COUPON_MERCHANT_CREATE.getMessage()+"未配置审批流程"); } - wxFlowService.start(generateFlowParams(EnumFlowKey.B_COUPON_MERCHANT_CREATE,EnumCouponAppType.PUT,wxCoupon.getId(),wxCoupon.getRemark()), getBuserId(), getUser().getName(), wxCoupon); + WxMerchantBUser buser = getUser(); + wxFlowService.start(generateFlowParams(EnumFlowKey.B_COUPON_MERCHANT_CREATE,EnumCouponAppType.PUT,wxCoupon.getId(),wxCoupon.getRemark(), buser.getPhone()), getBuserId(), buser.getName(), wxCoupon); return new ResultData(Result.SUCCESS,"提交审批成功"); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index a8b738348..c9c476cd2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -491,6 +491,14 @@ public class WxFlowServiceImpl implements WxFlowService { return null; } + private Map generatSimpleStarter(String userName,String phone) { + Map map = new HashMap(); + map.put("name", userName); + map.put("phone", phone); + map.put("email",""); + return map; + } + @Override @Transactional(propagation = Propagation.REQUIRED,rollbackFor = {Exception.class}) public ResultData start(Map params,Long userId,String userName,TenantEntity tenantEntity) { @@ -509,7 +517,12 @@ public class WxFlowServiceImpl implements WxFlowService { // map info,设置发起人等信息 Date startDate = new Date(); MallUserInfo starterInfo = this.mallUserInfoService.getById(userId); - map.put("starter", mallUserInfoToMap(starterInfo)); + if (null != starterInfo) { + map.put("starter", mallUserInfoToMap(starterInfo)); + }else { + String phone = params.get("phone").toString(); + map.put("starter", generatSimpleStarter(userName,phone)); + } map.put("startTime", startDate.getTime()); map.put("startDate", startDate); map.put("businessId",businessId+"");