| @@ -553,7 +553,9 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| Map<TenantEntity,String> tenantMerchantMap = null; | Map<TenantEntity,String> tenantMerchantMap = null; | ||||
| if (EnumCouponType.checkCreateWithMerchants(record.getType())) { | if (EnumCouponType.checkCreateWithMerchants(record.getType())) { | ||||
| try { | try { | ||||
| tenantMerchantMap = checkCouponMerchantReceiver(record,true); | |||||
| tenantMerchantMap = checkCouponMerchantReceiver(record, true); | |||||
| }catch(MallinkException e){ | |||||
| return new ResultData(e.getErrorCode(),e.getMessage()); | |||||
| }catch(Exception e) { | }catch(Exception e) { | ||||
| return new ResultData(Result.ERROR,e.getMessage()); | return new ResultData(Result.ERROR,e.getMessage()); | ||||
| } | } | ||||
| @@ -886,7 +888,7 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| List<String> badNames = new ArrayList(); | List<String> badNames = new ArrayList(); | ||||
| if (EnumPayMchType.DIRECT.equals(payMchType)) { | if (EnumPayMchType.DIRECT.equals(payMchType)) { | ||||
| //多商户券,抖音 直连 门店只有进件支付宝才能参加活动 todo | //多商户券,抖音 直连 门店只有进件支付宝才能参加活动 todo | ||||
| if(EnumCouponMerchantType.MULTIPLE_MERCHANT.getCode().equals(record.getMerchantType())){ | |||||
| if(EnumAppPlat.TOUTIAO.equals(plat) && EnumCouponMerchantType.MULTIPLE_MERCHANT.getCode().equals(record.getMerchantType())){ | |||||
| for (WxMerchant merchant:merchantList) { | for (WxMerchant merchant:merchantList) { | ||||
| WxProfitSharingReceiver receiver = payShareServie.getReceiver(mallTenantEntity, merchant.getId(), null, payMchType.getCode()); | WxProfitSharingReceiver receiver = payShareServie.getReceiver(mallTenantEntity, merchant.getId(), null, payMchType.getCode()); | ||||
| if (receiver == null) { | if (receiver == null) { | ||||