ソースを参照

fix flow bug

release_toaliyun_real
xiaohanzi 5年前
コミット
3c99bc9135
2個のファイルの変更19行の追加3行の削除
  1. +5
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
  2. +14
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 5
- 2
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<String,Object> generateFlowParams(EnumFlowKey flowType,EnumCouponAppType approvalType, Long couponId,String remark) {
private Map<String,Object> generateFlowParams(EnumFlowKey flowType,EnumCouponAppType approvalType, Long couponId,String remark,String phone) {
Map<String,Object> map = new HashMap<String,Object>();
map.put("businessId", String.valueOf(couponId));
map.put("businessType", flowType.getCode());
map.put("remark", remark);
map.put("phone", phone);
List<Map> variablesList = new ArrayList<Map>();
Map contractTypeMap = new HashMap<String,Object>();
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,"提交审批成功");
}


+ 14
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java ファイルの表示

@@ -491,6 +491,14 @@ public class WxFlowServiceImpl implements WxFlowService {
return null;
}

private Map<String,Object> generatSimpleStarter(String userName,String phone) {
Map<String,Object> map = new HashMap<String,Object>();
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<String, Object> 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+"");


読み込み中…
キャンセル
保存