|
|
|
@@ -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,"提交审批成功"); |
|
|
|
} |
|
|
|
|
|
|
|
|