Browse Source

wx_coupon_merchant添加分表

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
831d6f9643
8 changed files with 22 additions and 27 deletions
  1. +1
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java
  2. +5
    -3
      mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  4. +3
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
  5. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  6. +5
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  7. +3
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  8. +3
    -3
      mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml

+ 1
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java View File

@@ -236,9 +236,7 @@ public class WxCouponController extends BaseController {
wxcv.setEndTime(cc.getEndTime());
wxcv.setQrCode(cc.getQrCode());

Map param = new HashMap();
param.put("productId", cc.getCouponId());
List<WxMerchantVo> chantlist = merchantService.findMerchantVoList(param);
List<WxMerchantVo> chantlist = merchantService.findMerchantVoList(cc.getCouponId(),cc.getTenantId());
if (null != chantlist && chantlist.size()>0) {
wxcv.setMerchantVoList(chantlist);
}


+ 5
- 3
mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java View File

@@ -8,10 +8,12 @@ import com.iformall.domain.vo.WxMerchantVo;
import java.util.List;
import java.util.Map;

import org.apache.ibatis.annotations.Param;

public interface WxCouponMerchantMapper extends CommonMapper<WxCouponMerchant, Long> {

List<WxCouponMerchant> findList(WxCouponMerchant wxCouponMerchant);
List<WxMerchantVo> findMerchantVoList(Map paramMap);
List<WxMerchantVo> findMerchantNameList(Map paramMap);
List<WxMerchantVo> findMerchantBaseList(Map paramMap);
List<WxMerchantVo> findMerchantVoList(@Param("productId")Long productId,@Param("tenantId")String tenantId);
List<WxMerchantVo> findMerchantNameList(@Param("productId")Long productId,@Param("tenantId")String tenantId);
List<WxMerchantVo> findMerchantBaseList(@Param("productId")Long productId,@Param("tenantId")String tenantId);
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java View File

@@ -147,7 +147,7 @@ public interface WxMerchantService {

PageInfo<WxMerchant> listVoAsPage(WxMerchant wxMerchant, Integer pageNum, Integer pageSize);
List<WxMerchantVo> findMerchantVoList(Map paramMap);
List<WxMerchantVo> findMerchantVoList(Long productId,String tenantId);

PageInfo<WxMerchant> listVoAsPage2(WxMerchant wxMerchant, Integer pageNum, Integer pageSize);



+ 3
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java View File

@@ -200,10 +200,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
return new ResultData(Result.SUCCESS, "查询成功", data);
}

private boolean isCouponMerchantValid(Long couponId) {
Map paramMap = new HashMap<>();
paramMap.put("productId",couponId);
List<WxMerchantVo> merchantVoList = wxCouponMerchantMapper.findMerchantNameList(paramMap);
private boolean isCouponMerchantValid(Long couponId,String tenantId) {
List<WxMerchantVo> merchantVoList = wxCouponMerchantMapper.findMerchantNameList(couponId,tenantId);
if (merchantVoList.stream().anyMatch((cm->cm.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())))){
return true;
}
@@ -242,7 +240,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
return vo;
}

if(!isCouponMerchantValid(wxCoupon.getId())) {
if(!isCouponMerchantValid(wxCoupon.getId(),wxCoupon.getTenantId())) {
logger.debug(wxCoupon.getId()+couponid+ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage());
vo.toCouponChannnelVo(wxCoupon,channelId);
vo.setErrorMsg(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage());


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -630,6 +630,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {

couponMerchantQ.setProductId(couponOrder.getCouponId());
couponMerchantQ.setMerchantId(merchantId);
couponMerchantQ.updateTenantInfo(couponOrder);
WxCouponMerchant couponMerchant;
try {
couponMerchant = wxCouponMerchantMapper.selectOne(new QueryWrapper(couponMerchantQ));


+ 5
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -238,10 +238,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}


private boolean isCouponMerchantValid(Long couponId) {
Map paramMap = new HashMap<>();
paramMap.put("productId",couponId);
List<WxMerchantVo> merchantVoList = wxCouponMerchantMapper.findMerchantNameList(paramMap);
private boolean isCouponMerchantValid(Long couponId,String tenantId) {
List<WxMerchantVo> merchantVoList = wxCouponMerchantMapper.findMerchantNameList(couponId,tenantId);
if (merchantVoList.stream().anyMatch((cm->cm.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())))){
return true;
}
@@ -313,7 +311,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
List<WxCouponMerchant> wxCouponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant);
List<Long> couponIds = wxCouponMerchantList.stream().map(cm -> cm.getProductId()).collect(Collectors.toList());

couponIds.stream().filter(cid -> !isCouponMerchantValid(cid)).forEach(cid -> {
couponIds.stream().filter(cid -> !isCouponMerchantValid(cid,wxCouponMerchant.getTenantId())).forEach(cid -> {
WxCoupon wxCoupon = new WxCoupon();
wxCoupon.setId(cid);
wxCoupon.updateTenantInfo(wxMerchant);
@@ -857,8 +855,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {


@Override
public List<WxMerchantVo> findMerchantVoList(Map paramMap) {
return wxCouponMerchantMapper.findMerchantVoList(paramMap);
public List<WxMerchantVo> findMerchantVoList(Long productId,String tenantId) {
return wxCouponMerchantMapper.findMerchantVoList(productId,tenantId);
}

@Override


+ 3
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -817,10 +817,8 @@ public class WxOrderServiceImpl implements WxOrderService {
* @param couponId
* @return
*/
private boolean isCouponMerchantValid(Long couponId) {
Map paramMap = new HashMap<>();
paramMap.put("productId", couponId);
List<WxMerchantVo> merchantVoList = wxCouponMerchantMapper.findMerchantNameList(paramMap);
private boolean isCouponMerchantValid(Long couponId,String tenantId) {
List<WxMerchantVo> merchantVoList = wxCouponMerchantMapper.findMerchantNameList(couponId,tenantId);
if (merchantVoList.stream().anyMatch((cm -> cm.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())))) {
return true;
}
@@ -2144,7 +2142,7 @@ public class WxOrderServiceImpl implements WxOrderService {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_INVALID);
}
// 检查券商户信息
if (!isCouponMerchantValid(coupon.getId())) {
if (!isCouponMerchantValid(coupon.getId(),coupon.getTenantId())) {
logger.error("商户不存在, couponId: " + coupon.getId());
throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}


+ 3
- 3
mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml View File

@@ -103,7 +103,7 @@
from wx_coupon_merchant cm
left join wx_merchant m on m.id = cm.merchant_id
where cm.status = 0
and cm.product_id = #{productId}
and cm.product_id = #{productId} and cm.tenant_id = #{tenantId}
</select>

<sql id="allMerchantNameColumns">
@@ -122,7 +122,7 @@
from wx_coupon_merchant cm
left join wx_merchant m on m.id = cm.merchant_id
where cm.status = 0
and cm.product_id = #{productId}
and cm.product_id = #{productId} and cm.tenant_id = #{tenantId}
</select>

<select id="findMerchantBaseList" parameterType="java.util.Map" resultMap="MerchantVoResultMap">
@@ -131,7 +131,7 @@
from wx_coupon_merchant cm
left join wx_merchant m on m.id = cm.merchant_id
where cm.status = 0
and cm.product_id = #{productId}
and cm.product_id = #{productId} and cm.tenant_id = #{tenantId}
</select>




Loading…
Cancel
Save