Преглед изворни кода

//..coupon_

release_toaliyun_real
xhxu пре 2 година
родитељ
комит
9e58d0d923
3 измењених фајлова са 27 додато и 4 уклоњено
  1. +12
    -3
      mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java
  2. +14
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 12
- 3
mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java Прегледај датотеку

@@ -19,6 +19,7 @@ import com.iformall.mapper.*;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.service.pay.PayServiceFactory; import com.iformall.service.pay.PayServiceFactory;
import com.iformall.service.pay.service.fee.ServiceFeeAdapterService; import com.iformall.service.pay.service.fee.ServiceFeeAdapterService;
import com.iformall.service.util.CouponCacheUtils;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxErrorException;
@@ -27,7 +28,9 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
@@ -98,6 +101,10 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService {
@Autowired @Autowired
PayServiceFactory payServiceFactory; PayServiceFactory payServiceFactory;


@Autowired
@Qualifier("objectCommonRedisTemplate")
RedisTemplate<String, Object> redisTemplate;

// @Override // @Override
// public ResultData couponList(TtCouponVo ttCouponVo, Integer pageNum, Integer pageSize) { // public ResultData couponList(TtCouponVo ttCouponVo, Integer pageNum, Integer pageSize) {
// PageInfo<TtCouponVo> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.ttCouponList(ttCouponVo)); // PageInfo<TtCouponVo> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.ttCouponList(ttCouponVo));
@@ -552,11 +559,10 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService {
wxCouponMerchantMapper.insert(cmt); wxCouponMerchantMapper.insert(cmt);
} }
} }

//审核通过即上架
handlePullOn(ttCouponChannelPoi,now);
} }
} }
//审核通过即上架
handlePullOn(ttCouponChannelPoi,now);


return new ResultData(product); return new ResultData(product);
}else{ }else{
@@ -650,6 +656,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService {
wxCouponChannelMapper.insert(addCouponChannel); wxCouponChannelMapper.insert(addCouponChannel);
} }


CouponCacheUtils.removeCouponCache(redisTemplate, wxCoupon.getId());
CouponCacheUtils.removeCouponMerchantCache(redisTemplate, wxCoupon.getId(),null);

} }


@Override @Override


+ 14
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Прегледај датотеку

@@ -1833,6 +1833,20 @@ public class WxCouponServiceImpl implements WxCouponService {
@Override @Override
@Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class})
public ResultData disable(TenantEntity tenantInfo, Long couponId, MallUserInfo user) { public ResultData disable(TenantEntity tenantInfo, Long couponId, MallUserInfo user) {
TtCouponChannelPoi onlineStatus = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(), couponId);
if(onlineStatus != null){
if(EnumSpuSyncStatus.sync_auditing.getCode().equals(onlineStatus.getStatus())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"此券审核中");
}
Long draftId = wxCouponMapper.selectDraftId(couponId,tenantInfo.getTenantId());
if(draftId != null){
TtCouponChannelPoi draftStatus = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(), couponId);
if(draftStatus != null && EnumSpuSyncStatus.sync_auditing.getCode().equals(draftStatus.getStatus())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"此券草稿审核中");
}
}
}

WxCoupon couponUpd = new WxCoupon(); WxCoupon couponUpd = new WxCoupon();
couponUpd.updateTenantInfo(tenantInfo); couponUpd.updateTenantInfo(tenantInfo);
couponUpd.setId(couponId); couponUpd.setId(couponId);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Прегледај датотеку

@@ -455,8 +455,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return false; return false;
} }


@Transactional(rollbackFor = {Exception.class})
@Override @Override
@Transactional(rollbackFor = {Exception.class})
public void disable(Long id) { public void disable(Long id) {
WxMerchant wxMerchant = wxMerchantMapper.selectById(id); WxMerchant wxMerchant = wxMerchantMapper.selectById(id);
if (wxMerchant == null) { if (wxMerchant == null) {


Loading…
Откажи
Сачувај