Browse Source

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
winter 4 years ago
parent
commit
262f1c5396
2 changed files with 16 additions and 4 deletions
  1. +13
    -4
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java

+ 13
- 4
mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java View File

@@ -64,12 +64,21 @@ public class WxCouponChannelController extends BaseController {
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode());

if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
// if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
//
// }else{
// wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC);
// }
wxCouponChannel.setSortColumn(null);
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC);
wxCouponChannel.setShowBeginTime(new Date());

}else{
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC);
if(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode().equals(wxCouponChannel.getTargetAd())
|| EnumCouponChannelType.COUPON_CHANNEL_ID_CREDIT.getCode().equals(wxCouponChannel.getTargetAd())){
PageInfo<WxCouponChannelVo> page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize);
filterTimed(wxCouponChannel, page);
return new ResultData(page);
}
wxCouponChannel.setShowBeginTime(new Date());

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


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

@@ -306,6 +306,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
if(wxCouponChannel.getSourceType() != null){
couponQ.setSourceType(wxCouponChannel.getSourceType());
}
if(wxCouponChannel.getSupportTransfer() != null){
couponQ.setSupportTransfer(wxCouponChannel.getSupportTransfer());
}
List<Long> cids = wxCouponMapper.findIdList(couponQ);
return cids;
}


Loading…
Cancel
Save