Browse Source

/、

release_toaliyun_real
xhxu 4 years ago
parent
commit
82a9a3a55f
2 changed files with 13 additions and 5 deletions
  1. +0
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java
  2. +13
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java

+ 0
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxMallController.java View File

@@ -86,7 +86,6 @@ public class WxMallController extends BaseController {
@ApiOperation("商场信息")
@GetMapping("/mallInfo")
public ResultData getMallInfo() {
//TODO 缓存优化
WxMall mall = wxMallService.getByTenantInfo(getTenantInfo());
if (mall == null) {
return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND);


+ 13
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java View File

@@ -287,12 +287,21 @@ public class WxCampaignServiceImpl implements WxCampaignService {
return;
}

Date beginTime = null;
Date endTime = null;
if(wxCoupon.getType().equals(EnumCouponType.COUPON_PREORDER.getCode())){
beginTime = wxCoupon.getValidStartDate();
}else{
beginTime = new Date();
}
endTime = wxCoupon.getValidEndDate();

// 已有的couponChannel, 更新
WxCouponChannel wxCouponChannel = wxCouponChannelsMap.get(couponId);
if (wxCouponChannel != null) {
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setBeginTime(record.getValidStartDate());
wxCouponChannel.setEndTime(record.getValidEndDate());
wxCouponChannel.setBeginTime(beginTime);
wxCouponChannel.setEndTime(endTime);
wxCouponChannel.setUpdateDate(new Date());
wxCouponChannelMapper.updateById(wxCouponChannel);
wxCouponChannelsMap.remove(couponId);
@@ -308,8 +317,8 @@ public class WxCampaignServiceImpl implements WxCampaignService {
if(voList != null && voList.size() > 0){
wxCouponChannel.setShowBeginTime(voList.get(0).getShowBeginTime());
}
wxCouponChannel.setBeginTime(record.getValidStartDate());
wxCouponChannel.setEndTime(record.getValidEndDate());
wxCouponChannel.setBeginTime(beginTime);
wxCouponChannel.setEndTime(endTime);
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode());
wxCouponChannel.setCouponId(couponId);
wxCouponChannel.setType(wxCoupon.getType());


Loading…
Cancel
Save