Browse Source

[券][修改][添加券时有价券判断商户是否配置了分账账号]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
a6290cf478
3 changed files with 32 additions and 12 deletions
  1. +5
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java
  2. +20
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  3. +7
    -0
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 5
- 2
mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java View File

@@ -1,14 +1,17 @@
package com.iformall.mapper; package com.iformall.mapper;


import java.util.*;
import com.iformall.common.CommonMapper; import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.vo.WxMerchantVo; import com.iformall.domain.vo.WxMerchantVo;


import java.util.HashMap;
import java.util.List;

public interface WxMerchantMapper extends CommonMapper<WxMerchant, Long> { public interface WxMerchantMapper extends CommonMapper<WxMerchant, Long> {


List<WxMerchant> findList(WxMerchant wxMerchant); List<WxMerchant> findList(WxMerchant wxMerchant);
List<WxMerchantVo> findListCVo(WxMerchantVo wxMerchantVo); List<WxMerchantVo> findListCVo(WxMerchantVo wxMerchantVo);
WxMerchantVo getMerchantByCode(HashMap<String, String> params); WxMerchantVo getMerchantByCode(HashMap<String, String> params);

WxMerchant queryMerchantByMerchantIdOfSharingReceiver(WxMerchant wxMerchant);
} }

+ 20
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java View File

@@ -8,18 +8,13 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.dto.WxCouponMerchantDto; 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.WxCouponCVo;
import com.iformall.domain.vo.WxCouponStatisVo; import com.iformall.domain.vo.WxCouponStatisVo;
import com.iformall.domain.vo.WxMerchantVo; import com.iformall.domain.vo.WxMerchantVo;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException; 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 com.iformall.service.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -63,11 +58,9 @@ public class WxCouponServiceImpl implements WxCouponService {
@Autowired @Autowired
WxScreenAdService wxScreenAdService; WxScreenAdService wxScreenAdService;



@Autowired @Autowired
WxCouponChannelMapper wxCouponChannelMapper; WxCouponChannelMapper wxCouponChannelMapper;



@Override @Override
public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) {
if (null == wxCoupon) wxCoupon = new WxCoupon(); if (null == wxCoupon) wxCoupon = new WxCoupon();
@@ -212,8 +205,25 @@ public class WxCouponServiceImpl implements WxCouponService {
} }
} }


final IdWorker idWorker = IdWorker.get();
List<JSONObject> merchantParamList = JSONObject.parseArray(record.getMerchantParams(), JSONObject.class); List<JSONObject> 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) { if (record.getId() == null) {


// check 卡券补贴设置 // check 卡券补贴设置


+ 7
- 0
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml View File

@@ -207,5 +207,12 @@
</if> </if>


</select> </select>
<select id="queryMerchantByMerchantIdOfSharingReceiver" resultType="com.iformall.domain.po.WxMerchant"
parameterType="com.iformall.domain.po.WxMerchant">
select m.name,psr.id from wx_merchant m
left join wx_profit_sharing_receiver psr on m.id=psr.merchant_id
where m.id=#{id}
</select>


</mapper> </mapper>

Loading…
Cancel
Save