|
|
|
@@ -436,11 +436,6 @@ public class WxCouponServiceImpl implements WxCouponService { |
|
|
|
return resultData; |
|
|
|
} |
|
|
|
List<JSONObject> merchantParamList = JSONObject.parseArray(record.getMerchantParams(), JSONObject.class); |
|
|
|
if(merchantParamList != null && merchantParamList.size() == 1){ |
|
|
|
record.setMerchantType(EnumCouponMerchantType.ONE_MERCHANT.getCode()); |
|
|
|
}else if(merchantParamList != null && merchantParamList.size() > 1){ |
|
|
|
record.setMerchantType(EnumCouponMerchantType.MULTIPLE_MERCHANT.getCode()); |
|
|
|
} |
|
|
|
|
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
if (record.getId() == null) { |
|
|
|
@@ -687,8 +682,10 @@ public class WxCouponServiceImpl implements WxCouponService { |
|
|
|
}else if(list.size() > 1){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "直连模式多门店券只能包含一个商管商户"); |
|
|
|
} |
|
|
|
record.setMerchantType(EnumCouponMerchantType.MULTIPLE_MERCHANT.getCode()); |
|
|
|
merchantId = list.get(0); |
|
|
|
}else{ |
|
|
|
record.setMerchantType(EnumCouponMerchantType.ONE_MERCHANT.getCode()); |
|
|
|
merchantId = merchantParamList.get(0).getLong("id"); |
|
|
|
} |
|
|
|
WxProfitSharingReceiver psReceiverQ = new WxProfitSharingReceiver(); |
|
|
|
|