记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 21f1d7de authored by wanglele's avatar wanglele
Browse files
Options

兑换码sku--->时间

parent e594e802
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 75 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExSkuVo.java
View file @ 21f1d7de
......@@ -102,6 +102,9 @@ public class GoblinNftExSkuVo {
@ApiModelProperty(position = 20,required = true,value ="修改时间")
private LocalDateTime updatedAt;
private String rdStartTime;
private String rdStopTime;
private static final GoblinNftExSkuVo obj = new GoblinNftExSkuVo();
public static GoblinNftExSkuVo getNew(){
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinGoodsSkuMapper.xml
View file @ 21f1d7de
......@@ -6,13 +6,13 @@
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="unbox" property="unbox" jdbcType="VARCHAR"/>
<result column="hit_ratio" property="hitRatio" jdbcType="DECIMAL"/>
<result column="sku_type" property="sku_type" jdbcType="INTEGER"/>
<result column="sku_type" property="skuType" jdbcType="INTEGER"/>
<result column="status" property="status" jdbcType="VARCHAR"/>
<result column="shelves_status" property="shelves_status" jdbcType="VARCHAR"/>
<result column="sku_appear" property="sku_appear" jdbcType="VARCHAR"/>
<result column="del_flg" property="del_flg" jdbcType="VARCHAR"/>
<result column="soldout_status" property="soldout_status" jdbcType="VARCHAR"/>
<result column="sale_start_time" property="sale_start_time" jdbcType="TIMESTAMP"/>
<result column="shelves_status" property="shelvesStatus" jdbcType="VARCHAR"/>
<result column="sku_appear" property="skuAppear" jdbcType="VARCHAR"/>
<result column="del_flg" property="delFlg" jdbcType="VARCHAR"/>
<result column="soldout_status" property="soldoutStatus" jdbcType="VARCHAR"/>
<result column="sale_start_time" property="saleStartTime" jdbcType="TIMESTAMP"/>
</resultMap>
<select id="selectSkuLikeName" resultMap="BaseResult">
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExCodeServiceImpl.java
View file @ 21f1d7de
......@@ -123,9 +123,8 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
for (GoblinNftExCodeVo gnc : goblinNftExCodeArrayList) {
List<GoblinNftExSku> goblinNftExSkuList = map.get(gnc.getActivityId());
for (GoblinNftExSku goblinNftExSku : goblinNftExSkuList) {
if (gnc.getSkuId().equals(goblinNftExSku.getSkuId())) {
for (GoblinNftExSku goblinNftExSku:goblinNftExSkus) {
if (goblinNftExSku.getSkuId().equals(gnc.getSkuId())){
gnc.setExStartTime(goblinNftExSku.getExStartTime());
gnc.setExStopTime(goblinNftExSku.getExStopTime());
break;
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExSkuServiceImpl.java
View file @ 21f1d7de
......@@ -114,9 +114,7 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
int stock = goblinRedisUtils.decrSkuStock(null, key, stockNum);
if (stock < 0) {
goblinRedisUtils.incrSkuStock(null, key, stockNum);
}
}else {
for (int i = 0; i < stockNum; i++) {
GoblinNftExCode goblinNftExCode = GoblinNftExCode.getNew();
goblinNftExCode.setCodeId(IDGenerator.nextSnowId());
......@@ -149,8 +147,9 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
// redis 存储
goblinRedisUtils.addCode(code, goblinNftExCodeVo, millisNum);
}
goblinNftExSkuParamMap.put(key, goblinNftExSkuParam);
goblinNftExSkus.add(goblinNftExSku);
}
}
......@@ -161,8 +160,7 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
int stock = goblinRedisUtils.decrSkuStock(null, goblinNftExSkuParam.getSkuId(), goblinNftExSkuParam.getExStock());
if (stock < 0) {
goblinRedisUtils.incrSkuStock(null, goblinNftExSkuParam.getSkuId(), goblinNftExSkuParam.getExStock());
}
}else {
// 构建兑换码数量
for (int i = 0; i < goblinNftExSkuParam.getExStock(); i++) {
GoblinNftExCode goblinNftExCode = GoblinNftExCode.getNew();
......@@ -202,6 +200,9 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
goblinNftExSkuParamMap.put(goblinNftExSkuParam.getSkuId(), goblinNftExSkuParam);
}
goblinNftExSkus.add(goblinNftExSku);
}
// goblinNftExSkuArrayList.add(GoblinNftExSkuVo.getNew().copy(goblinNftExSku));
}
......@@ -209,18 +210,17 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
for (String key : goblinNftExSkuParamMap.keySet()) {
Object object = goblinRedisUtils.getSkuTime(key);
GoblinNftExSkuVo goblinNftExSkuVo = goblinRedisUtils.getSkuTime(key);
GoblinNftExSkuParam goblinNftExSkuParam = goblinNftExSkuParamMap.get(key);
LocalDateTime exStartTime = goblinNftExSkuParam.getExStartTime(); // "2022-06-26 19:00:00";
LocalDateTime exStopTime = goblinNftExSkuParam.getExStopTime(); // "2024-06-26 19:00:00";
if (!StringUtil.isEmpty(object)) {
GoblinNftExSkuVo goblinNftExSkuVo = JSON.parseObject(object.toString(), GoblinNftExSkuVo.class);
if (!StringUtil.isEmpty(goblinNftExSkuVo)) {
// redis存储 单个sku的开始和结束时间
LocalDateTime rdExStartTime = goblinNftExSkuVo.getExStartTime(); // "2019-06-26 19:00:00";
LocalDateTime rdExStopTime = goblinNftExSkuVo.getExStopTime(); // "2023-06-26 19:00:00";
LocalDateTime rdExStartTime = LocalDateTime.parse(goblinNftExSkuVo.getRdStartTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); // "2019-06-26 19:00:00";
LocalDateTime rdExStopTime = LocalDateTime.parse(goblinNftExSkuVo.getRdStopTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); // "2019-06-26 19:00:00";
// 时间比对
......@@ -233,11 +233,11 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
}
}
GoblinNftExSkuVo goblinNftExSkuVo = GoblinNftExSkuVo.getNew();
goblinNftExSkuVo.setExStartTime(exStartTime);
goblinNftExSkuVo.setExStopTime(exStopTime);
GoblinNftExSkuVo goblinNftExSku = GoblinNftExSkuVo.getNew();
goblinNftExSku.setRdStartTime(exStartTime.toString());
goblinNftExSku.setRdStopTime(exStopTime.toString());
goblinRedisUtils.addSkuTime(key,goblinNftExSkuVo);
goblinRedisUtils.addSkuTime(key,goblinNftExSku);
}
log.debug("RDM耗时：ms", System.currentTimeMillis() - startr);
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/GoblinRedisUtils.java
View file @ 21f1d7de
package com.liquidnet.service.platform.utils;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.goblin.constant.GoblinRedisConst;
import com.liquidnet.service.goblin.dto.GoblinQueueBizIntegralDto;
......@@ -235,9 +238,14 @@ public class GoblinRedisUtils {
* @param skuId
* @return
*/
public Object getSkuTime(String skuId) {
public GoblinNftExSkuVo getSkuTime(String skuId) {
String key = GoblinRedisConst.ACTIVITY_SKU_TIME.concat(skuId);
return getRedis().get(key);
GoblinNftExSkuVo goblinNftExSkuVo = null;
if (!StringUtil.isEmpty(getRedis().get(key))){
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.convertValue (getRedis().get(key), GoblinNftExSkuVo.class);
}
return goblinNftExSkuVo;
}
/**
......@@ -246,9 +254,9 @@ public class GoblinRedisUtils {
* @param obj
* @return
*/
public boolean addSkuTime(String skuId,Object obj) {
public boolean addSkuTime(String skuId,GoblinNftExSkuVo goblinNftExSkuVo) {
String key = GoblinRedisConst.ACTIVITY_SKU_TIME.concat(skuId);
return getRedis().set(key,obj);
return getRedis().set(key,goblinNftExSkuVo);
}
/* ---------------------------------------- ---------------------------------------- */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment