From 504fcc6ca772794ed73315621b59c4bf652a00ea Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Jan 2022 11:00:51 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81.optimize?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCampaignController.java | 4 +- .../controller/WxCampaignController.java | 11 +-- .../controller/WxTopicController.java | 9 +- .../java/com/iformall/domain/po/WxCoupon.java | 4 + .../mapper/WxCouponChannelMapper.java | 7 ++ .../com/iformall/mapper/WxCouponMapper.java | 7 ++ .../mapper/WxCouponMerchantMapper.java | 1 + .../service/WxCouponChannelService.java | 1 + .../com/iformall/service/WxCouponService.java | 5 +- .../service/impl/WxCampaignServiceImpl.java | 2 +- .../impl/WxCouponChannelServiceImpl.java | 78 ++++++++++++++-- .../impl/WxCouponOrderServiceImpl.java | 1 - .../service/impl/WxCouponSendServiceImpl.java | 2 +- .../service/impl/WxCouponServiceImpl.java | 17 +++- .../service/impl/WxGameServiceImpl.java | 12 +-- .../service/impl/WxTopicServiceImpl.java | 6 +- .../mapper/WxCouponChannelMapper.xml | 90 +++++++++++++++++-- .../main/resources/mapper/WxCouponMapper.xml | 20 +++++ .../mapper/WxCouponMerchantMapper.xml | 13 +++ 19 files changed, 239 insertions(+), 51 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 36a91e652..31c9cac3e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -169,8 +169,8 @@ public class WxCampaignController extends BaseController { wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_CAMPAIN.getCode()); wxCouponChannel.setSubTargetId(wxCampaign.getId()); wxCouponChannel.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); - List couponList = wxCouponChannelService.listVo(wxCouponChannel); - wxCampaign.setCoupons(couponList); + List voList = wxCouponChannelService.listVo(wxCouponChannel); + wxCampaign.setCoupons(voList); } return new ResultData(Result.SUCCESS, "查询成功", wxCampaign); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index 1e3ce50a9..94c301c71 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -77,15 +77,8 @@ public class WxCampaignController extends BaseController { wxCouponChannel.setSubTargetId(wxCampaign.getId()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setShowBeginTime(new Date()); - //TODO待优化数据 - List couponList = RedisCacheUtils.getCacheListObject(redisTemplate, "wxCampaignCoupons:"+wxCouponChannel.getTenantId(), WxCouponChannelVo.class); - if (null == couponList) { - couponList = wxCouponChannelService.listVo(wxCouponChannel); - if (null != couponList) { - RedisCacheUtils.cache(redisTemplate, "wxCampaignCoupons:"+wxCouponChannel.getTenantId(), couponList, 3600); - } - } - wxCampaign.setCoupons(couponList); + List voList = wxCouponChannelService.newfindListVo(wxCouponChannel); + wxCampaign.setCoupons(voList); } return new ResultData(Result.SUCCESS, "查询成功", wxCampaign); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index 825ac41f4..5967cdc52 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -58,14 +58,7 @@ public class WxTopicController extends BaseController { public ResultData findById(WxTopic wxTopic) { logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); wxTopic.updateTenantInfo(getTenantInfo()); - //TODO 待优化数据 - WxTopic queryTopic =RedisCacheUtils.getCacheObject(redisTemplate, "topic:"+wxTopic.getId(), WxTopic.class); - if (null == queryTopic) { - queryTopic = wxTopicService.findCById(wxTopic); - if (null != queryTopic) { - RedisCacheUtils.cache(redisTemplate, "topic:"+wxTopic.getId(), queryTopic, 3600); - } - } + WxTopic queryTopic = wxTopicService.findCById(wxTopic); return new ResultData(queryTopic); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 01d4a90e2..1cc8afe3f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -197,6 +197,10 @@ public class WxCoupon extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="投放频道参数,用来过滤",name="couponId") private Long couponId; + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value = "用户积分,用来过滤", name = "userCredit") + private Integer userCredit; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="修改库存有效期参数, 用来做乐观锁",name="orgRemainInventory") private Integer orgRemainInventory; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java index 3583af424..4d0491627 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponChannelMapper.java @@ -44,4 +44,11 @@ public interface WxCouponChannelMapper extends CommonMapper findQrcodeEmptyList(); void cardDefer(@Param("couponId")Long couponId,@Param("tenantId")String tenantId,@Param("endTime")Date endTime); + + /** + * C端列表查询,尽量减少字段 + * @param wxCouponChannel + * @return + */ + List newfindCList(WxCouponChannel wxCouponChannel); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 98c6aa08e..70f8d5c5a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -98,4 +98,11 @@ public interface WxCouponMapper extends CommonMapper { Integer findCouponListCount(WxCoupon wxCoupon); void updateValidEndDate(WxCoupon wxCoupon); + + /** + * c端列表查询,尽量减少字段 + * @param couponQ + * @return + */ + List newfindCList(WxCoupon couponQ); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java index 6986639f5..edd86cf30 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java @@ -19,5 +19,6 @@ public interface WxCouponMerchantMapper extends CommonMapper findMerchantBaseList(@Param("productId")Long productId,@Param("tenantId")String tenantId); List findMerchantProduct(@Param("tenantId")String tenantId,@Param("merchantIdList")List merchantIdList); List findMerchantProductIds(@Param("tenantId")String tenantId,@Param("merchantIdList")List merchantIdList); + List findOneMerchantProductIds(@Param("tenantId")String tenantId,@Param("merchantId")Long merchantIdList); List findMerchantByProductIds(@Param("tenantId")String tenantId,@Param("productIds")List productIds); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index d1842ade2..f4e576f60 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -79,4 +79,5 @@ public interface WxCouponChannelService { int countCoupon(WxCouponChannel wxCouponChannel, List tenantEntitys); + List newfindListVo(WxCouponChannel wxCouponChannel); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index f8f4ba069..a25ae114d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.domain.vo.WxCouponStatisVo; @@ -258,5 +259,7 @@ public interface WxCouponService { * 获取券商户map * */ - Map getCouponMerchant(List couponIds,TenantEntity tenantEntity); + Map getCouponMerchantMap(List couponIds,TenantEntity tenantEntity); + + Map getCouponMap(List couponIds, TenantEntity tenantEntity); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 6d45d313c..36cb508ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -311,7 +311,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { wxCouponChannelQ.setCouponId(couponId); wxCouponChannelQ.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCouponChannelQ.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_LIST.getCode()); - List voList = wxCouponChannelMapper.findVoList(wxCouponChannelQ); + List voList = wxCouponChannelMapper.newfindCList(wxCouponChannelQ); // 不存在的, 新增 wxCouponChannel = new WxCouponChannel(); if(voList != null && voList.size() > 0){ 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 70c9d692e..58be40d16 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -42,6 +42,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Autowired WxCouponChannelMapper wxCouponChannelMapper; @Autowired + WxCouponMapper wxCouponMapper; + @Autowired WxCouponService wxCouponService; @Autowired WxMerchantMapper wxMerchantMapper; @@ -226,13 +228,10 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { couponId = record.getCouponId(); record.setCouponId(null); } - //TODO 待优化数据,暂时放缓存 - List voList = RedisCacheUtils.getCacheListObject(redisTemplate, "changeCoupon:"+record.getTenantId(), WxCouponChannelVo.class); - if (null == voList) { - voList = wxCouponChannelMapper.findVoList(record); - RedisCacheUtils.cache(redisTemplate,"changeCoupon:"+record.getTenantId(), voList, 600); - } - if (voList.isEmpty()) { + + List voList = this.newfindListVo(record); + + if (voList == null || voList.isEmpty()) { return new ResultData(Result.SUCCESS, "查询成功", null); } Map data = new HashMap<>(); @@ -264,6 +263,71 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { return count; } + @Override + public List newfindListVo(WxCouponChannel wxCouponChannel) { + + List mcids = new ArrayList<>(); + if(wxCouponChannel.getMerchantId() != null){ + mcids = wxCouponMerchantMapper.findOneMerchantProductIds(wxCouponChannel.getTenantId(), wxCouponChannel.getMerchantId()); + if(mcids == null || mcids.isEmpty()){ + return null; + } + } + WxCoupon couponQ = new WxCoupon(); + couponQ.setStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); + if(wxCouponChannel.getSupportTransfer() != null){ + couponQ.setSupportTransfer(wxCouponChannel.getSupportTransfer()); + } + if(wxCouponChannel.getUserCredit() != null){ + couponQ.setUserCredit(wxCouponChannel.getUserCredit()); + } + if(wxCouponChannel.getSourceType() != null){ + couponQ.setSourceType(wxCouponChannel.getSourceType()); + } + List cids = wxCouponMapper.findIdList(couponQ); + if(cids == null || cids.isEmpty()){ + return null; + } + cids.retainAll(mcids); + wxCouponChannel.setCouponIds(cids); + + List list = wxCouponChannelMapper.newfindCList(wxCouponChannel); + List couponIds = list.stream().map(cc -> cc.getCouponId()).collect(Collectors.toList()); + Map couponMap = wxCouponService.getCouponMap(couponIds,wxCouponChannel); + for (WxCouponChannelVo cc:list) { + WxCoupon c = couponMap.get(cc.getCouponId()); + if(c != null){ + cc.setRemainInventory(c.getRemainInventory()); + cc.setInventory(c.getInventory()); + cc.setCoverImg(c.getCoverImg()); + cc.setSubTitle(c.getSubTitle()); + cc.setSalePrice(c.getSalePrice()); + cc.setUsePrice(c.getUsePrice()); + cc.setPrice(c.getPrice()); + cc.setTailPrice(c.getTailPrice()); + cc.setOrigPrice(c.getOrigPrice()); + cc.setUnit(c.getUnit()); + cc.setUseLimitRule(c.getUseLimitRule()); + cc.setUseLimitQuantity(c.getUseLimitQuantity()); + cc.setSendType(c.getSendType()); + cc.setSupportTransfer(c.getSupportTransfer()); + cc.setPressLimitNum(c.getPressLimitNum()); + cc.setAutoRefund(c.getAutoRefund()); + cc.setConditions(c.getConditions()); + cc.setValidType(c.getValidType()); + cc.setValidStartDate(c.getValidStartDate()); + cc.setValidEndDate(c.getValidEndDate()); + cc.setPickStartDate(c.getPickStartDate()); + cc.setPickEndDate(c.getPickEndDate()); + cc.setValidDays(c.getValidDays()); + cc.setCreditPrice(c.getCreditPrice()); + cc.setContentType(c.getContentType()); + cc.setSourceType(c.getSourceType()); + } + } + return list; + } + private boolean isCouponMerchantValid(Long couponId,String tenantId) { List merchantVoList = wxCouponMerchantMapper.findMerchantNameList(couponId,tenantId); if (merchantVoList.stream().anyMatch((cm->cm.getMerchantStatus().equals(EnumMerchantStatus.VALID.getCode())))){ 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 a1e5a5f5e..12dcc7a78 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -133,7 +133,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired ExcelService excelService; - @Autowired WxCreditHistoryService wxCreditHistoryService; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index c378c3094..af157518a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -107,7 +107,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { record.setSortColumns(BaseEntity.SortField.CreateDate_DESC); pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVo(record)); List couponIds = pageInfo.getList().stream().map(cs -> cs.getCouponId()).collect(Collectors.toList()); - Map couponMerchantMap = wxCouponService.getCouponMerchant(couponIds,record); + Map couponMerchantMap = wxCouponService.getCouponMerchantMap(couponIds,record); for (WxCouponSendVo cs:pageInfo.getList()){ cs.setMerchantName(couponMerchantMap.get(cs.getCouponId())); cs.setSendCount(wxCouponActionLogService.getCountByChannelId(record, cs.getSendType(), cs.getId())); 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 c068dd860..c3fc9e6db 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -964,7 +964,7 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public Map getCouponMerchant(List couponIds, TenantEntity tenantEntity) { + public Map getCouponMerchantMap(List couponIds, TenantEntity tenantEntity) { Map couponMerchantMap = new HashMap(); if(null != couponIds && couponIds.size() > 0){ List merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(tenantEntity.getTenantId(),couponIds); @@ -999,5 +999,20 @@ public class WxCouponServiceImpl implements WxCouponService { return couponMerchantMap; } + @Override + public Map getCouponMap(List couponIds, TenantEntity tenantEntity) { + Map couponMap = new HashMap(); + if(null != couponIds && couponIds.size() > 0){ + WxCoupon couponQ = new WxCoupon(); + couponQ.updateTenantInfo(tenantEntity); + couponQ.setIds(couponIds); + List couponList = wxCouponMapper.newfindCList(couponQ); + for (WxCoupon c:couponList) { + couponMap.put(c.getId(),c); + } + } + return couponMap; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index 9f833fe1b..89bcb9903 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -230,16 +230,10 @@ public class WxGameServiceImpl implements WxGameService { couponChannelQ.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_GAME.getCode()); couponChannelQ.setSubTargetId(record.getId()); couponChannelQ.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - //TODO 待优化数据 - List wxCouponChannelVos = RedisCacheUtils.getCacheListObject(redisTemplate, "gameCoupons:"+record.getId(), WxCouponChannelVo.class); - if (null == wxCouponChannelVos) { - wxCouponChannelVos = wxCouponChannelService.listVo(couponChannelQ); - if (null != wxCouponChannelVos) { - RedisCacheUtils.cache(redisTemplate, "gameCoupons:"+record.getId(), wxCouponChannelVos, 3600); - } - } + List voList = wxCouponChannelService.newfindListVo(couponChannelQ); + Map wxCouponChannelsMap = new HashMap(); - for(WxCouponChannelVo wxCouponChannelVo: wxCouponChannelVos) { + for(WxCouponChannelVo wxCouponChannelVo: voList) { wxCouponChannelsMap.put(wxCouponChannelVo.getCouponId(), wxCouponChannelVo); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index 8a94377ac..611c567ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -257,10 +257,8 @@ public class WxTopicServiceImpl implements WxTopicService { wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); wxCouponChannel.setShowBeginTime(new Date()); wxCouponChannel.setSubTargetId(wxTopic.getId()); - List wxCouponChannelVos = wxCouponChannelService.listVo(wxCouponChannel); - if(wxCouponChannelVos != null && wxCouponChannelVos.size() > 0){ - wxTopic.setCouponList(wxCouponChannelVos); - } + List voList = wxCouponChannelService.newfindListVo(wxCouponChannel); + wxTopic.setCouponList(voList); } return wxTopic; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 4290842d5..3b27de0a4 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -211,13 +211,6 @@ - - - + select cc.`id`,cc.`tenant_id`,cc.`parent_tenant_id`,cc.`coupon_id`,cc.`coupon_status`,cc.`type`,cc.`title`, + cc.`target_ad`,cc.`business`,cc.`sub_business`,cc.`show_begin_time`,cc.`begin_time`,cc.`end_time`,cc.`status`, + cc.`create_date`,cc.`update_date`,cc.`sub_target_id`,cc.qr_code + from wx_coupon_channel cc + where cc.status = 0 + + + and cc.`id` = #{id} + + + + and cc.`tenant_id` = #{tenantId} + + + and cc.`parent_tenant_id` = #{parentTenantId} + + + + and cc.`coupon_id` = #{couponId} + + + + and cc.`type` = #{type} + + + + and cc.`title` like concat('%', #{title},'%') + + + + and cc.`target_ad` = #{targetAd} + + + + and cc.`business` = #{business} + + + + and cc.`sub_business` = #{subBusiness} + + + + and cc.`show_begin_time` <= #{showBeginTime} + + + + and cc.`create_date` between #{startdate} and #{enddate} + + + + and cc.`status` = #{status} + + + + and cc.`create_date` = #{createDate} + + + + and cc.`update_date` = #{updateDate} + + + + and cc.`sub_target_id` = #{subTargetId} + + + and cm.`merchant_id` = #{merchantId} + + + + and cc.id in + + #{idItem} + + + + and cc.coupon_id in + + #{couponIdsItem} + + + order by ${sortColumns} + diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index de5452bce..fb2324019 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -255,6 +255,9 @@ and `credit_price` = #{creditPrice} + + and `credit_price` <= #{userCredit} + and `credit_refund` = #{creditRefund} @@ -1222,4 +1225,21 @@ update wx_coupon set valid_end_date = #{validEndDate} , update_date = #{updateDate} where id = #{id} + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index 4aa444bca..61fcb41b7 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -173,6 +173,19 @@ + +