From 831d6f96435e338d307d75e29e12d6f305d770b4 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 16 Oct 2020 09:48:23 +0800 Subject: [PATCH] =?UTF-8?q?wx=5Fcoupon=5Fmerchant=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCouponController.java | 4 +--- .../com/iformall/mapper/WxCouponMerchantMapper.java | 8 +++++--- .../java/com/iformall/service/WxMerchantService.java | 2 +- .../service/impl/WxCouponChannelServiceImpl.java | 8 +++----- .../service/impl/WxCouponOrderServiceImpl.java | 1 + .../iformall/service/impl/WxMerchantServiceImpl.java | 12 +++++------- .../iformall/service/impl/WxOrderServiceImpl.java | 8 +++----- .../main/resources/mapper/WxCouponMerchantMapper.xml | 6 +++--- 8 files changed, 22 insertions(+), 27 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 5175bbad5..48b1558bf 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -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 chantlist = merchantService.findMerchantVoList(param); + List chantlist = merchantService.findMerchantVoList(cc.getCouponId(),cc.getTenantId()); if (null != chantlist && chantlist.size()>0) { wxcv.setMerchantVoList(chantlist); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java index f75806b89..bf3ed8705 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java @@ -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 { List findList(WxCouponMerchant wxCouponMerchant); - List findMerchantVoList(Map paramMap); - List findMerchantNameList(Map paramMap); - List findMerchantBaseList(Map paramMap); + List findMerchantVoList(@Param("productId")Long productId,@Param("tenantId")String tenantId); + List findMerchantNameList(@Param("productId")Long productId,@Param("tenantId")String tenantId); + List findMerchantBaseList(@Param("productId")Long productId,@Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index cef1e1d79..40015b1f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -147,7 +147,7 @@ public interface WxMerchantService { PageInfo listVoAsPage(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); - List findMerchantVoList(Map paramMap); + List findMerchantVoList(Long productId,String tenantId); PageInfo listVoAsPage2(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 560250433..a5f27e149 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -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 merchantVoList = wxCouponMerchantMapper.findMerchantNameList(paramMap); + private boolean isCouponMerchantValid(Long couponId,String tenantId) { + List 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()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index b482daa5a..ee451d6d1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -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)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index a1e73c76e..5b5467668 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -238,10 +238,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { } - private boolean isCouponMerchantValid(Long couponId) { - Map paramMap = new HashMap<>(); - paramMap.put("productId",couponId); - List merchantVoList = wxCouponMerchantMapper.findMerchantNameList(paramMap); + private boolean isCouponMerchantValid(Long couponId,String tenantId) { + List 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 wxCouponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); List 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 findMerchantVoList(Map paramMap) { - return wxCouponMerchantMapper.findMerchantVoList(paramMap); + public List findMerchantVoList(Long productId,String tenantId) { + return wxCouponMerchantMapper.findMerchantVoList(productId,tenantId); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index f9f527b4b..179f88166 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -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 merchantVoList = wxCouponMerchantMapper.findMerchantNameList(paramMap); + private boolean isCouponMerchantValid(Long couponId,String tenantId) { + List 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); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index ce7d24072..acd6114ca 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -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} @@ -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}