| @@ -236,9 +236,7 @@ public class WxCouponController extends BaseController { | |||||
| wxcv.setEndTime(cc.getEndTime()); | wxcv.setEndTime(cc.getEndTime()); | ||||
| wxcv.setQrCode(cc.getQrCode()); | 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) { | if (null != chantlist && chantlist.size()>0) { | ||||
| wxcv.setMerchantVoList(chantlist); | wxcv.setMerchantVoList(chantlist); | ||||
| } | } | ||||
| @@ -8,10 +8,12 @@ import com.iformall.domain.vo.WxMerchantVo; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | import java.util.Map; | ||||
| import org.apache.ibatis.annotations.Param; | |||||
| public interface WxCouponMerchantMapper extends CommonMapper<WxCouponMerchant, Long> { | public interface WxCouponMerchantMapper extends CommonMapper<WxCouponMerchant, Long> { | ||||
| List<WxCouponMerchant> findList(WxCouponMerchant wxCouponMerchant); | 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); | |||||
| } | } | ||||
| @@ -147,7 +147,7 @@ public interface WxMerchantService { | |||||
| PageInfo<WxMerchant> listVoAsPage(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); | 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); | PageInfo<WxMerchant> listVoAsPage2(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); | ||||
| @@ -200,10 +200,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { | |||||
| return new ResultData(Result.SUCCESS, "查询成功", data); | 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())))){ | if (merchantVoList.stream().anyMatch((cm->cm.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())))){ | ||||
| return true; | return true; | ||||
| } | } | ||||
| @@ -242,7 +240,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { | |||||
| return vo; | return vo; | ||||
| } | } | ||||
| if(!isCouponMerchantValid(wxCoupon.getId())) { | |||||
| if(!isCouponMerchantValid(wxCoupon.getId(),wxCoupon.getTenantId())) { | |||||
| logger.debug(wxCoupon.getId()+couponid+ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage()); | logger.debug(wxCoupon.getId()+couponid+ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage()); | ||||
| vo.toCouponChannnelVo(wxCoupon,channelId); | vo.toCouponChannnelVo(wxCoupon,channelId); | ||||
| vo.setErrorMsg(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage()); | vo.setErrorMsg(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage()); | ||||
| @@ -630,6 +630,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| couponMerchantQ.setProductId(couponOrder.getCouponId()); | couponMerchantQ.setProductId(couponOrder.getCouponId()); | ||||
| couponMerchantQ.setMerchantId(merchantId); | couponMerchantQ.setMerchantId(merchantId); | ||||
| couponMerchantQ.updateTenantInfo(couponOrder); | |||||
| WxCouponMerchant couponMerchant; | WxCouponMerchant couponMerchant; | ||||
| try { | try { | ||||
| couponMerchant = wxCouponMerchantMapper.selectOne(new QueryWrapper(couponMerchantQ)); | couponMerchant = wxCouponMerchantMapper.selectOne(new QueryWrapper(couponMerchantQ)); | ||||
| @@ -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())))){ | if (merchantVoList.stream().anyMatch((cm->cm.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())))){ | ||||
| return true; | return true; | ||||
| } | } | ||||
| @@ -313,7 +311,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| List<WxCouponMerchant> wxCouponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); | List<WxCouponMerchant> wxCouponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); | ||||
| List<Long> couponIds = wxCouponMerchantList.stream().map(cm -> cm.getProductId()).collect(Collectors.toList()); | 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 wxCoupon = new WxCoupon(); | ||||
| wxCoupon.setId(cid); | wxCoupon.setId(cid); | ||||
| wxCoupon.updateTenantInfo(wxMerchant); | wxCoupon.updateTenantInfo(wxMerchant); | ||||
| @@ -857,8 +855,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| @Override | @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 | @Override | ||||
| @@ -817,10 +817,8 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| * @param couponId | * @param couponId | ||||
| * @return | * @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())))) { | if (merchantVoList.stream().anyMatch((cm -> cm.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())))) { | ||||
| return true; | return true; | ||||
| } | } | ||||
| @@ -2144,7 +2142,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| throw new MallinkException(ErrorCode.COUPON_ORDER_IS_INVALID); | throw new MallinkException(ErrorCode.COUPON_ORDER_IS_INVALID); | ||||
| } | } | ||||
| // 检查券商户信息 | // 检查券商户信息 | ||||
| if (!isCouponMerchantValid(coupon.getId())) { | |||||
| if (!isCouponMerchantValid(coupon.getId(),coupon.getTenantId())) { | |||||
| logger.error("商户不存在, couponId: " + coupon.getId()); | logger.error("商户不存在, couponId: " + coupon.getId()); | ||||
| throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); | throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); | ||||
| } | } | ||||
| @@ -103,7 +103,7 @@ | |||||
| from wx_coupon_merchant cm | from wx_coupon_merchant cm | ||||
| left join wx_merchant m on m.id = cm.merchant_id | left join wx_merchant m on m.id = cm.merchant_id | ||||
| where cm.status = 0 | where cm.status = 0 | ||||
| and cm.product_id = #{productId} | |||||
| and cm.product_id = #{productId} and cm.tenant_id = #{tenantId} | |||||
| </select> | </select> | ||||
| <sql id="allMerchantNameColumns"> | <sql id="allMerchantNameColumns"> | ||||
| @@ -122,7 +122,7 @@ | |||||
| from wx_coupon_merchant cm | from wx_coupon_merchant cm | ||||
| left join wx_merchant m on m.id = cm.merchant_id | left join wx_merchant m on m.id = cm.merchant_id | ||||
| where cm.status = 0 | where cm.status = 0 | ||||
| and cm.product_id = #{productId} | |||||
| and cm.product_id = #{productId} and cm.tenant_id = #{tenantId} | |||||
| </select> | </select> | ||||
| <select id="findMerchantBaseList" parameterType="java.util.Map" resultMap="MerchantVoResultMap"> | <select id="findMerchantBaseList" parameterType="java.util.Map" resultMap="MerchantVoResultMap"> | ||||
| @@ -131,7 +131,7 @@ | |||||
| from wx_coupon_merchant cm | from wx_coupon_merchant cm | ||||
| left join wx_merchant m on m.id = cm.merchant_id | left join wx_merchant m on m.id = cm.merchant_id | ||||
| where cm.status = 0 | where cm.status = 0 | ||||
| and cm.product_id = #{productId} | |||||
| and cm.product_id = #{productId} and cm.tenant_id = #{tenantId} | |||||
| </select> | </select> | ||||