Browse Source

/、..

release_toaliyun_real
xhxu 4 years ago
parent
commit
274a82108d
2 changed files with 8 additions and 1 deletions
  1. +7
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml

+ 7
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java View File

@@ -71,6 +71,13 @@ public class WxCouponChannelController extends BaseController {
}
wxCouponChannel.setShowBeginTime(new Date());

if(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.equals(wxCouponChannel.getTargetAd())
|| EnumCouponChannelType.COUPON_CHANNEL_ID_CREDIT.equals(wxCouponChannel.getTargetAd())){
PageInfo<WxCouponChannelVo> page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page);
return new ResultData(page);
}

String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage()
+ wxCouponChannel.getTenantId() + "_"
+ wxCouponChannel.getTargetAd() + "_"


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml View File

@@ -511,6 +511,6 @@
#{targetAdsItem}
</foreach>
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>
<!--<if test=" null != sortColumns"> order by ${sortColumns} </if>-->
</select>
</mapper>

Loading…
Cancel
Save