diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 7de6bf29e..d51d265b9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -1,14 +1,17 @@ package com.iformall.mapper; -import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.vo.WxMerchantVo; +import java.util.HashMap; +import java.util.List; + public interface WxMerchantMapper extends CommonMapper { List findList(WxMerchant wxMerchant); List findListCVo(WxMerchantVo wxMerchantVo); WxMerchantVo getMerchantByCode(HashMap params); - + + WxMerchant queryMerchantByMerchantIdOfSharingReceiver(WxMerchant wxMerchant); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index c49362471..72696425d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -8,18 +8,13 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.dto.WxCouponMerchantDto; -import com.iformall.domain.po.WxCoupon; -import com.iformall.domain.po.WxCouponChannel; -import com.iformall.domain.po.WxCouponMerchant; +import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; -import com.iformall.mapper.WxCouponChannelMapper; -import com.iformall.mapper.WxCouponMapper; -import com.iformall.mapper.WxCouponMerchantMapper; -import com.iformall.mapper.WxMerchantMapper; +import com.iformall.mapper.*; import com.iformall.service.*; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -63,11 +58,9 @@ public class WxCouponServiceImpl implements WxCouponService { @Autowired WxScreenAdService wxScreenAdService; - @Autowired WxCouponChannelMapper wxCouponChannelMapper; - @Override public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); @@ -212,8 +205,25 @@ public class WxCouponServiceImpl implements WxCouponService { } } - final IdWorker idWorker = IdWorker.get(); List merchantParamList = JSONObject.parseArray(record.getMerchantParams(), JSONObject.class); + //有价券判断商户是否配置了分账账号 + if (record.getSalePrice() > 0) { + StringBuffer sb = new StringBuffer(); + for (int i = 0, size = merchantParamList.size(); i < size; i++) { + JSONObject jsonObject = merchantParamList.get(i); + Long id = jsonObject.getLong("id"); + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setId(id); + WxMerchant merchant = wxMerchantMapper.queryMerchantByMerchantIdOfSharingReceiver(wxMerchant); + if (merchant.getId() == null) { + sb.append("[").append(merchant.getName()).append("]"); + } + } + String message = sb.toString(); + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "商户:" + message + "还未配置分账账户"); + } + + final IdWorker idWorker = IdWorker.get(); if (record.getId() == null) { // check 卡券补贴设置 diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index cb0232314..2ab18fa09 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -207,5 +207,12 @@ + +