Просмотр исходного кода

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

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
b01b67c809
5 измененных файлов: 14 добавлений и 14 удалений
  1. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCouponService.java
  4. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  5. +6
    -6
      mallinkService/src/main/java/com/iformall/service/util/CouponCacheUtils.java

+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java Просмотреть файл

@@ -317,7 +317,7 @@ public class WxCouponController extends BaseController {
CouponCacheUtils.setCouponChannelCache(redisTemplate, couponChannelIdL, couponChannel);
}
Map<WxMall,List<WxMerchantVo>> volist = CouponCacheUtils.getCouponMerchantCache(redisTemplate, couponChannel.getId());
Map<String,List<WxMerchantVo>> volist = CouponCacheUtils.getCouponMerchantCache(redisTemplate, couponChannel.getId());
if (null == volist) {
volist = couponService.getCouponMerchantList(getTenantInfo(), couponChannel.getCouponId());
if (null != volist && volist.size() > 0 ) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java Просмотреть файл

@@ -232,7 +232,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@TableField(exist = false)
private Date verifyEndDate;

@Excel(name = "类型", width = 50, orderNum = "16", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "预购商品_10", "可配送商品_11", "券礼包_12", "积分券_50", "积分停车券_51", "消费卡_100"})
@Excel(name = "类型", width = 50, orderNum = "16", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "预购商品_10", "可配送商品_11", "券礼包_12", "积分券_50", "积分停车券_51","抖音券_66","抖音平台券_67","抖音品牌券_68", "消费卡_100"})
@TableField(exist = false)
private Integer couponType;



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCouponService.java Просмотреть файл

@@ -279,7 +279,7 @@ public interface WxCouponService {

Map<Long, WxCoupon> getCouponMap(List<Long> couponIds, TenantEntity tenantEntity);

Map<WxMall,List<WxMerchantVo>> getCouponMerchantList(TenantEntity tenantInfo, Long couponId);
Map<String,List<WxMerchantVo>> getCouponMerchantList(TenantEntity tenantInfo, Long couponId);

/**
* 作废卷


+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Просмотреть файл

@@ -1684,7 +1684,7 @@ public class WxCouponServiceImpl implements WxCouponService {
}

@Override
public Map<WxMall,List<WxMerchantVo>> getCouponMerchantList(TenantEntity tenantInfo, Long couponId) {
public Map<String,List<WxMerchantVo>> getCouponMerchantList(TenantEntity tenantInfo, Long couponId) {
WxCoupon wxCoupon = wxCouponMapper.selectById(couponId,tenantInfo.getTenantId());
if (EnumCouponType.isParentCoupon(wxCoupon.getType())){
WxCouponMall couponMall = new WxCouponMall();
@@ -1693,19 +1693,19 @@ public class WxCouponServiceImpl implements WxCouponService {
couponMall.setStatus(EnumCouponMallStatus.FINISED.getCode());
List<WxCouponMall> couponMallList = wxCouponMallMapper.findList(couponMall);
if (null != couponMallList && couponMallList.size()> 0 ) {
Map<WxMall,List<WxMerchantVo>> mallMerchantMap = new HashMap<WxMall,List<WxMerchantVo>>();
Map<String,List<WxMerchantVo>> mallMerchantMap = new HashMap<String,List<WxMerchantVo>>();
for (int i = 0 ; i < couponMallList.size();i++) {
WxCouponMall cm = couponMallList.get(i);
WxMall mall = wxMallMapper.getByTenantId(cm.getMallTenantId());
mallMerchantMap.put(mall, getCouponMerchantList(couponId,mall));
mallMerchantMap.put(mall.getTenantId()+"|"+mall.getName(), getCouponMerchantList(couponId,mall));
}
return mallMerchantMap;
}
return null;
}else {
Map<WxMall,List<WxMerchantVo>> mallMerchantMap = new HashMap<WxMall,List<WxMerchantVo>>();
Map<String,List<WxMerchantVo>> mallMerchantMap = new HashMap<String,List<WxMerchantVo>>();
WxMall mall = wxMallMapper.getByTenantId(tenantInfo.getTenantId());
mallMerchantMap.put(mall, getCouponMerchantList(couponId,mall));
mallMerchantMap.put(mall.getTenantId()+"|"+mall.getName(), getCouponMerchantList(couponId,mall));
return mallMerchantMap;
}
}


+ 6
- 6
mallinkService/src/main/java/com/iformall/service/util/CouponCacheUtils.java Просмотреть файл

@@ -48,18 +48,18 @@ public class CouponCacheUtils {
}
public static void removeCouponMerchantCache(RedisTemplate<String, Object> template,Long couponId) {
String key = "couponMerchant:"+couponId;
String key = "couponMerchantNew:"+couponId;
RedisCacheUtils.removeCache(template, key);
}
public static void setCouponMerchantCache(RedisTemplate<String, Object> template,Long couponId,Map<WxMall,List<WxMerchantVo>> merchantList) {
String key = "couponMerchant:"+couponId;
public static void setCouponMerchantCache(RedisTemplate<String, Object> template,Long couponId,Map<String,List<WxMerchantVo>> merchantList) {
String key = "couponMerchantNew:"+couponId;
RedisCacheUtils.cache(template, key, merchantList, 24*3600);
}
public static Map<WxMall,List<WxMerchantVo>> getCouponMerchantCache(RedisTemplate<String, Object> template,Long couponId) {
String key = "couponMerchant:"+couponId;
return (Map<WxMall, List<WxMerchantVo>>) RedisCacheUtils.getCacheListObject(template, key,Map.class);
public static Map<String,List<WxMerchantVo>> getCouponMerchantCache(RedisTemplate<String, Object> template,Long couponId) {
String key = "couponMerchantNew:"+couponId;
return (Map<String, List<WxMerchantVo>>) RedisCacheUtils.getCacheListObject(template, key,Map.class);
}
public static void removeDouyinLivePageCache(RedisTemplate<String, Object> template,String tenantId,Integer targetAd,Integer bussiness) {


Загрузка…
Отмена
Сохранить