|
|
|
@@ -117,7 +117,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
Boolean supplement = (Boolean)mapInfo.get("supplement"); |
|
|
|
Integer contractType = 0; |
|
|
|
String str = (String)getVariableByKey(variables,"contractType"); |
|
|
|
Integer operateType = (Integer)getVariableByKey(variables,"operateType"); |
|
|
|
Integer operateType = (Integer)getVariableByKey(variables,"approvalType"); |
|
|
|
if(StringUtils.isNotBlank(str)){ |
|
|
|
contractType = Integer.parseInt(str); |
|
|
|
} |
|
|
|
@@ -204,14 +204,6 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
|
|
|
|
if(EnumCouponAppType.PUT.getCode().equals(operateType)){ |
|
|
|
wxCoupon.setPutApplyStatus(applyStatus); |
|
|
|
String idsV = (String)getVariableByKey(variables,"ids"); |
|
|
|
String channelIdV = (String)getVariableByKey(variables,"channelId"); |
|
|
|
String[] ids = idsV.split(","); |
|
|
|
String[] channelId = channelIdV.split(","); |
|
|
|
Date beginTime = (Date)getVariableByKey(variables,"beginTime"); |
|
|
|
Date endTime = (Date)getVariableByKey(variables,"endTime"); |
|
|
|
String tenantId = (String)getVariableByKey(variables,"tenantId"); |
|
|
|
wxCouponChannelService.addBatch(ids, channelId, tenantId, beginTime,endTime); |
|
|
|
}else if(EnumCouponAppType.STOCK.getCode().equals(operateType)){ |
|
|
|
wxCoupon.setStockApplyStatus(applyStatus); |
|
|
|
if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue() |
|
|
|
|