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

Skip to content

L
liquidnet-bus-v1
Commit 849e9436 authored by wanglele's avatar wanglele
Browse files
Options

兑换码sku--->时间

parent 306f20f7
Show whitespace changes
Inline Side-by-side
Showing with 174 additions and 113 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExActivityVo.java
View file @ 849e9436
......@@ -84,8 +84,6 @@ public class GoblinNftExActivityVo implements Serializable,Cloneable {
@ApiModelProperty(position = 16,required = true,value ="未使用数量")
private Integer unUseNumber;
@ApiModelProperty(position = 17,required = true,value ="sku基本所属信息集合")
private List<GoblinNftSkuVo> goblinNftSkuVos;
/**
*
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftExActivityService.java
View file @ 849e9436
......@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
import com.liquidnet.service.goblin.dto.vo.GoblinNftSkuVo;
import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
import com.liquidnet.service.goblin.param.GoblinNftExActivityParam;
import javax.servlet.http.HttpServletResponse;
......@@ -25,7 +26,7 @@ public interface IGoblinNftExActivityService {
* @param goblinNftExActivityParam
* @return
*/
PageInfo<GoblinNftExActivityVo> pageList(GoblinNftExActivityParam goblinNftExActivityParam);
PageInfoVo pageList(GoblinNftExActivityParam goblinNftExActivityParam);
/**
* 根据活动id获取活动下商品
......
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftExCodeService.java
View file @ 849e9436
......@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.service;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo;
import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
import com.liquidnet.service.goblin.param.GoblinNftExCodeParam;
import javax.servlet.http.HttpServletResponse;
......@@ -12,7 +13,7 @@ public interface IGoblinNftExCodeService {
/**
* 获取兑换码
*/
PageInfo<GoblinNftExCodeVo> selectCodePageList(GoblinNftExCodeParam goblinNftExCodeParam);
PageInfoVo selectCodePageList(GoblinNftExCodeParam goblinNftExCodeParam);
/**
* 兑换码主动失效
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinNftExActivityMapper.java
View file @ 849e9436
......@@ -49,4 +49,10 @@ public interface GoblinNftExActivityMapper extends BaseMapper<GoblinNftExActivit
* @return
*/
GoblinNftExActivity selectByTitle(@Param("title") String title);
/**
* 获取
* @return
*/
int selectActivityCount();
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinNftExCodeMapper.java
View file @ 849e9436
......@@ -21,6 +21,7 @@ public interface GoblinNftExCodeMapper extends BaseMapper<GoblinNftExCode> {
/**
* 批量添加兑换码信息
*
* @param goblinNftExCodes
* @return
*/
......@@ -28,6 +29,7 @@ public interface GoblinNftExCodeMapper extends BaseMapper<GoblinNftExCode> {
/**
* 根据活动ids查询
*
* @param activityIds
* @return
*/
......@@ -36,6 +38,7 @@ public interface GoblinNftExCodeMapper extends BaseMapper<GoblinNftExCode> {
/**
* 条件查询 兑换码
*
* @param goblinNftExCode
* @return
*/
......@@ -43,6 +46,7 @@ public interface GoblinNftExCodeMapper extends BaseMapper<GoblinNftExCode> {
/**
* 根据codeIds 获取
*
* @param codeIds
* @return
*/
......@@ -50,6 +54,7 @@ public interface GoblinNftExCodeMapper extends BaseMapper<GoblinNftExCode> {
/**
* 批量修改
*
* @param goblinNftExCodes
* @return
*/
......@@ -59,4 +64,9 @@ public interface GoblinNftExCodeMapper extends BaseMapper<GoblinNftExCode> {
* 根据code获取兑换码信息
*/
GoblinNftExCode selectGoblinNftCodeByCode(@Param("code") String code);
/*
* 获取数量
*/
int selectGoblinNftCodeCount(GoblinNftExCode goblinNftExCode);
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftExActivityMapper.xml
View file @ 849e9436
......@@ -33,6 +33,10 @@
select activity_id,title,created_at from goblin_nft_ex_activity where activity_id = #{activityId}
</select>
<select id="selectActivityCount" resultType="java.lang.Integer">
select count(0) from goblin_nft_ex_activity
</select>
<insert id="addGoblinNftExActivity" parameterType="com.liquidnet.service.goblin.entity.GoblinNftExActivity">
insert into goblin_nft_ex_activity
(
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftExCodeMapper.xml
View file @ 849e9436
......@@ -80,10 +80,45 @@
<if test="isDrivi != null">
<choose>
<when test="isDrivi == 1">
and admin_uid is null
and admin_uid = ''
</when>
<when test="isDrivi == 2">
and admin_uid is not null
and admin_uid != ''
</when>
</choose>
</if>
</where>
</select>
<select id="selectGoblinNftCodeCount" parameterType="com.liquidnet.service.goblin.entity.GoblinNftExCode"
resultType="java.lang.Integer">
select count(0) from goblin_nft_ex_code
<where>
<if test="code != null and code != ''">
and code = #{code,jdbcType=VARCHAR}
</if>
<if test="activityId != null and activityId != ''">
and activity_id = #{activityId,jdbcType=VARCHAR}
</if>
<if test="state != null">
and state = #{state,jdbcType=INTEGER}
</if>
<if test="redeemUid != null and redeemUid != ''">
and redeem_uid = #{redeemUid,jdbcType=VARCHAR}
</if>
<if test="skuId != null and skuId != ''">
and sku_id in
<foreach collection="skuId.split(',')" item="sId" open="(" separator="," close=")">
#{sId,jdbcType=VARCHAR}
</foreach>
</if>
<if test="isDrivi != null">
<choose>
<when test="isDrivi == 1">
and admin_uid = ''
</when>
<when test="isDrivi == 2">
and admin_uid != ''
</when>
</choose>
</if>
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0418_jxl_nft_exchange.sql
View file @ 849e9436
......@@ -3,69 +3,63 @@ dev_ln_scene;
-- >>------------------------------------------------------------------------------------
DROP TABLE IF EXISTS goblin_nft_ex_code;
CREATE TABLE goblin_nft_ex_code
DROP TABLE IF EXISTS `goblin_nft_ex_code`;
CREATE TABLE `goblin_nft_ex_code`
(
mid BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
code_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '兑换码id',
activity_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '活动id',
sku_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '款式id',
box_sku_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '盲盒抽取的款式id',
code VARCHAR(64) NOT NULL DEFAULT '' COMMENT '兑换码',
state TINYINT UNSIGNED DEFAULT 1 comment '兑换码状态 1未兑换 2已兑换 3已失效',
redeem_uid VARCHAR(64) NOT NULL DEFAULT '' COMMENT '兑换用户id',
redeem_at DATETIME NULL DEFAULT NULL COMMENT '兑换时间',
admin_uid VARCHAR(64) NOT NULL DEFAULT '' COMMENT '操作用户id',
created_at DATETIME NULL DEFAULT NULL COMMENT '创建时间',
updated_at DATETIME NULL DEFAULT NULL COMMENT '更新时间',
KEY `idx_nft_code_id` (`code_id`),
KEY `idx_nft_activity_id` (`activity_id`),
KEY `idx_nft_sku_id` (`sku_id`),
KEY `idx_nft_code` (`code`),
KEY `idx_nft_redeem_uid` (`redeem_uid`)
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci
ROW_FORMAT = DYNAMIC COMMENT 'NFT兑换码表';
`mid` bigint(0) UNSIGNED NOT NULL AUTO_INCREMENT,
`code_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '兑换码id',
`activity_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '活动id',
`sku_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '款式id',
`box_sku_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '盲盒抽取的款式id',
`code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '兑换码',
`state` tinyint(0) UNSIGNED NULL DEFAULT 1 COMMENT '兑换码状态 1未兑换 2已兑换 3已失效',
`redeem_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '兑换用户id',
`redeem_at` datetime(0) NULL DEFAULT NULL COMMENT '兑换时间',
`admin_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '操作用户id',
`created_at` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`mid`) USING BTREE,
INDEX `idx_nft_code_id`(`code_id`) USING BTREE,
INDEX `idx_nft_activity_id`(`activity_id`) USING BTREE,
INDEX `idx_nft_sku_id`(`sku_id`) USING BTREE,
INDEX `idx_nft_code`(`code`) USING BTREE,
INDEX `idx_nft_redeem_uid`(`redeem_uid`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'NFT兑换码表' ROW_FORMAT = Dynamic;
-- >>------------------------------------------------------------------------------------
DROP TABLE IF EXISTS goblin_nft_ex_activity;
CREATE TABLE goblin_nft_ex_activity
DROP TABLE IF EXISTS `goblin_nft_ex_activity`;
CREATE TABLE `goblin_nft_ex_activity`
(
mid BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
activity_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '活动id',
title VARCHAR(64) NOT NULL DEFAULT '' COMMENT '活动标题',
created_at DATETIME NULL DEFAULT NULL COMMENT '创建时间',
updated_at DATETIME NULL DEFAULT NULL COMMENT '更新时间',
KEY `idx_nft_activity_id` (`activity_id`)
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci
ROW_FORMAT = DYNAMIC COMMENT 'NFT兑换活动表';
`mid` bigint(0) UNSIGNED NOT NULL AUTO_INCREMENT,
`activity_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '活动id',
`title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '活动标题',
`created_at` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`mid`) USING BTREE,
INDEX `idx_nft_activity_id`(`activity_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'NFT兑换活动表' ROW_FORMAT = Dynamic;
DROP TABLE IF EXISTS goblin_nft_ex_sku;
CREATE TABLE goblin_nft_ex_sku
DROP TABLE IF EXISTS `goblin_nft_ex_sku`;
CREATE TABLE `goblin_nft_ex_sku`
(
mid BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
activity_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '活动id',
store_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '店铺id',
spu_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '商品id',
sku_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '款式id',
unbox CHAR NOT NULL DEFAULT '0' comment '是否盲盒[0-否|1-是]',
ex_stock INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '兑换库存',
ex_limit INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '兑换限购',
ex_start_time DATETIME NULL DEFAULT NULL COMMENT '兑换生效开始时间',
ex_stop_time DATETIME NULL DEFAULT NULL COMMENT '兑换生效结束时间',
created_at DATETIME NULL DEFAULT NULL COMMENT '创建时间',
updated_at DATETIME NULL DEFAULT NULL COMMENT '更新时间',
KEY `idx_nft_ex_activity_id` (`activity_id`),
KEY `idx_nft_ex_spu_id` (`spu_id`),
KEY `idx_nft_ex_sku_id` (`sku_id`)
) ENGINE = InnoDB
DEFAULT CHARSET utf8mb4
COLLATE utf8mb4_unicode_ci
ROW_FORMAT = DYNAMIC COMMENT 'NFT兑换活动关联SKU表';
`mid` bigint(0) UNSIGNED NOT NULL AUTO_INCREMENT,
`activity_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '活动id',
`store_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '店铺id',
`spu_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '商品id',
`sku_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '款式id',
`unbox` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0' COMMENT '是否盲盒[0-否|1-是]',
`ex_stock` int(0) UNSIGNED NOT NULL DEFAULT 0 COMMENT '兑换库存',
`ex_limit` int(0) UNSIGNED NOT NULL DEFAULT 0 COMMENT '兑换限购',
`ex_start_time` datetime(0) NULL DEFAULT NULL COMMENT '兑换生效开始时间',
`ex_stop_time` datetime(0) NULL DEFAULT NULL COMMENT '兑换生效结束时间',
`created_at` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`mid`) USING BTREE,
INDEX `idx_nft_ex_activity_id`(`activity_id`) USING BTREE,
INDEX `idx_nft_ex_spu_id`(`spu_id`) USING BTREE,
INDEX `idx_nft_ex_sku_id`(`sku_id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'NFT兑换活动关联SKU表' ROW_FORMAT = Dynamic;
DROP TABLE IF EXISTS `goblin_nft_ex_code_task`;
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/activity/GoblinNftExActivityController.java
View file @ 849e9436
......@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
import com.liquidnet.service.goblin.dto.vo.GoblinNftSkuVo;
import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
import com.liquidnet.service.goblin.param.GoblinNftExActivityParam;
import com.liquidnet.service.goblin.service.IGoblinNftExActivityService;
import io.swagger.annotations.Api;
......@@ -44,7 +45,7 @@ public class GoblinNftExActivityController {
@ApiOperationSupport(order = 2)
@ApiOperation(value = "活动列表")
@PostMapping("pageList")
public ResponseDto<PageInfo<GoblinNftExActivityVo>> pageList(@Valid @RequestBody GoblinNftExActivityParam goblinNftExActivityParam) {
public ResponseDto<PageInfoVo> pageList(@Valid @RequestBody GoblinNftExActivityParam goblinNftExActivityParam) {
return ResponseDto.success(iGoblinNftExActivityService.pageList(goblinNftExActivityParam));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/code/GoblinNftExCodeController.java
View file @ 849e9436
......@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo;
import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
import com.liquidnet.service.goblin.param.GoblinNftExCodeParam;
import com.liquidnet.service.goblin.service.IGoblinNftExCodeService;
import io.swagger.annotations.Api;
......@@ -34,7 +35,7 @@ public class GoblinNftExCodeController {
@ApiOperationSupport(order = 1)
@ApiOperation(value = "根据nft兑换活动获取兑换码")
@PostMapping("selectCodePageList")
public ResponseDto<PageInfo<GoblinNftExCodeVo>> selectCodePageList(@RequestBody GoblinNftExCodeParam goblinNftExCodeParam){
public ResponseDto<PageInfoVo> selectCodePageList(@RequestBody GoblinNftExCodeParam goblinNftExCodeParam){
return ResponseDto.success(iGoblinNftExCodeService.selectCodePageList(goblinNftExCodeParam));
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExActivityServiceImpl.java
View file @ 849e9436
......@@ -9,14 +9,11 @@ import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExSkuVo;
import com.liquidnet.service.goblin.dto.vo.GoblinNftSkuVo;
import com.liquidnet.service.goblin.dto.vo.*;
import com.liquidnet.service.goblin.entity.*;
import com.liquidnet.service.goblin.mapper.*;
import com.liquidnet.service.goblin.param.GoblinNftExActivityParam;
import com.liquidnet.service.goblin.service.IGoblinNftExActivityService;
import com.liquidnet.service.goblin.dto.vo.ActivityExcelVo;
import com.liquidnet.service.platform.utils.ObjectUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
......@@ -59,7 +56,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
// 根据名称查询
String title = goblinNftExActivityParam.getTitle();
GoblinNftExActivity goblinNftExActivityShow = goblinNftExActivityMapper.selectByTitle(title);
if (goblinNftExActivityShow != null){
if (goblinNftExActivityShow != null) {
return ResponseDto.failure("活动名称已存在!");
}
......@@ -76,7 +73,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
}
@Override
public PageInfo<GoblinNftExActivityVo> pageList(GoblinNftExActivityParam goblinNftExActivityParam) {
public PageInfoVo pageList(GoblinNftExActivityParam goblinNftExActivityParam) {
PageHelper.startPage(goblinNftExActivityParam.getPageNum(), 20, true);
......@@ -87,6 +84,10 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
long s = System.currentTimeMillis();
List<GoblinNftExActivity> goblinNftExActivities = goblinNftExActivityMapper.selectPageList(goblinNftExActivityParam.getTitle(), goblinNftExActivityParam.getStartTime(),
goblinNftExActivityParam.getEndTime());
//
int count = goblinNftExActivityMapper.selectActivityCount();
log.debug("#MYS耗时:{}ms", System.currentTimeMillis() - s);
StringBuffer activityIds = new StringBuffer();
......@@ -95,26 +96,24 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
}
ArrayList<GoblinNftExActivityVo> goblinNftExActivityArrayList = ObjectUtil.getGoblinNftExActivityArrayList();
if (StringUtil.isNotBlank(activityIds)) {
activityIds.deleteCharAt(activityIds.length() - 1);
// 根据活动ids查询正在生成的兑换码
List<GoblinNftExCodeTask> goblinNftExCodeTasks = goblinNftExCodeTaskMapper.selectByActivityIds(activityIds.toString());
// List<GoblinNftExCodeTask> goblinNftExCodeTasks = goblinNftExCodeTaskMapper.selectByActivityIds(activityIds.toString());
long k = System.currentTimeMillis();
List<GoblinNftExCode> goblinNftExCodes = goblinNftExCodeMapper.selectByActivityIds(activityIds.toString());
log.debug("#MYS耗时:{}ms", System.currentTimeMillis() - k);
for (GoblinNftExActivity goblinNftExActivity : goblinNftExActivities) {
for (GoblinNftExCodeTask goblinNftExCodeTask: goblinNftExCodeTasks) {
/* for (GoblinNftExCodeTask goblinNftExCodeTask: goblinNftExCodeTasks) {
if (goblinNftExActivity.getActivityId().equals(goblinNftExCodeTask.getActivityId())){
goblinNftExActivity.setIsDisplay(1);
break;
}
}
}*/
Integer countNumber = 0;
Integer useNumber = 0;
......@@ -140,7 +139,7 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
}
}
PageInfo<GoblinNftExActivityVo> pageInfo = new PageInfo<>(goblinNftExActivityArrayList);
PageInfoVo pageInfo = new PageInfoVo(goblinNftExActivityArrayList,count,0);
return pageInfo;
}
......@@ -157,19 +156,18 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
// 获取兑换活动和sku的关联
List<GoblinNftExSku> goblinNftExSkus = goblinNftExSkuMapper.selectGoblinNftExSkuByActivityIds(activityId);
if (goblinNftExSkus.size() <= 0){
if (goblinNftExSkus.size() <= 0) {
return goblinNftSkuVoArrayList;
}
StringBuffer skuIds = new StringBuffer();
Map<String,GoblinNftExSku> goblinNftExSkuMap = new HashMap<>();
Map<String, GoblinNftExSku> goblinNftExSkuMap = new HashMap<>();
for (GoblinNftExSku goblinNftExSku : goblinNftExSkus) {
skuIds.append(goblinNftExSku.getSkuId()).append(",");
goblinNftExSkuMap.put(goblinNftExSku.getSkuId(),goblinNftExSku);
goblinNftExSkuMap.put(goblinNftExSku.getSkuId(), goblinNftExSku);
}
List<GoblinGoodsSku> goblinGoodsSkus = goblinGoodsSkuMapper.selectBySkuIds(skuIds.toString());
......@@ -179,19 +177,19 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
Map<String, List<GoblinNftExCode>> codeMap = new HashMap<>();
for (GoblinNftExCode goblinNftExCode : goblinNftExCodes) {
if (StringUtil.isNotBlank(goblinNftExCode.getSkuId())){
if (codeMap.get(goblinNftExCode.getSkuId()) == null) {
codeMap.put(goblinNftExCode.getSkuId(), new ArrayList<>());
if (StringUtil.isNotBlank(goblinNftExCode.getBoxSkuId())) {
if (codeMap.get(goblinNftExCode.getBoxSkuId()) == null) {
codeMap.put(goblinNftExCode.getBoxSkuId(), new ArrayList<>());
}
codeMap.get(goblinNftExCode.getSkuId()).add(goblinNftExCode);
}else if (StringUtil.isNotBlank(goblinNftExCode.getBoxSkuId())){
codeMap.get(goblinNftExCode.getBoxSkuId()).add(goblinNftExCode);
} else {
if (codeMap.get(goblinNftExCode.getSkuId()) == null) {
codeMap.put(goblinNftExCode.getSkuId(), new ArrayList<>());
}
codeMap.get(goblinNftExCode.getSkuId()).add(goblinNftExCode);
}
}
}
for (GoblinGoodsSku goblinGoodsSku : goblinGoodsSkus) {
......@@ -228,7 +226,6 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
}
return goblinNftSkuVoArrayList;
}
......@@ -283,9 +280,9 @@ public class GoblinNftExActivityServiceImpl implements IGoblinNftExActivityServi
}
}
try{
writeExcel(httpServletResponse,activityExcelVoArrayList,"活动excel","sheet1",ActivityExcelVo.class);
}catch (Exception e){
try {
writeExcel(httpServletResponse, activityExcelVoArrayList, "活动excel", "sheet1", ActivityExcelVo.class);
} catch (Exception e) {
log.error("导出excel失败！");
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExCodeServiceImpl.java
View file @ 849e9436
......@@ -18,6 +18,7 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.CodeExcelVo;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo;
import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
import com.liquidnet.service.goblin.entity.GoblinGoodsSku;
import com.liquidnet.service.goblin.entity.GoblinNftExCode;
import com.liquidnet.service.goblin.entity.GoblinNftExSku;
......@@ -73,7 +74,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
private */
@Override
public PageInfo<GoblinNftExCodeVo> selectCodePageList(GoblinNftExCodeParam goblinNftExCodeParam) {
public PageInfoVo selectCodePageList(GoblinNftExCodeParam goblinNftExCodeParam) {
// 入参
GoblinNftExCode goblinNftExCode = GoblinNftExCode.getNew();
......@@ -87,7 +88,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
String skuName = goblinNftExCodeParam.getSkuName();
List<GoblinGoodsSku> goblinGoodsSkus = goblinGoodsSkuMapper.selectSkuLikeName(skuName);
if (goblinGoodsSkus.size() <= 0) {
return new PageInfo<>();
return new PageInfoVo();
}
StringBuffer skuIds = new StringBuffer();
for (GoblinGoodsSku goblinGoodsSku : goblinGoodsSkus) {
......@@ -99,6 +100,9 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
PageHelper.startPage(goblinNftExCodeParam.getPageNum(), 20, true);
List<GoblinNftExCode> goblinNftExCodes = goblinNftExCodeMapper.selectGoblinNftCode(goblinNftExCode);
int count = goblinNftExCodeMapper.selectGoblinNftCodeCount(goblinNftExCode);
StringBuffer skuIds = new StringBuffer();
StringBuffer acticityIds = new StringBuffer();
for (GoblinNftExCode gnc : goblinNftExCodes) {
......@@ -171,7 +175,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
}
PageInfo<GoblinNftExCodeVo> pageInfo = new PageInfo<>(goblinNftExCodeArrayList);
PageInfoVo pageInfo = new PageInfoVo(goblinNftExCodeArrayList,count);
return pageInfo;
}
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExSkuServiceImpl.java
View file @ 849e9436
......@@ -18,6 +18,7 @@ import com.liquidnet.service.goblin.mapper.GoblinNftExSkuMapper;
import com.liquidnet.service.goblin.param.GoblinNftExSkuParam;
import com.liquidnet.service.goblin.service.IGoblinNftExSkuService;
import com.liquidnet.service.platform.utils.GoblinRedisUtils;
import com.liquidnet.service.platform.utils.ObjectUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -58,19 +59,24 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
LocalDateTime now = LocalDateTime.now();
/* ArrayList<GoblinNftExSkuVo> goblinNftExSkuArrayList = ObjectUtil.getGoblinNftExSkuArrayList();
ArrayList<GoblinNftExCodeVo> goblinNftExCodeArrayList = ObjectUtil.getGoblinNftExCodeArrayList();*/
//ArrayList<GoblinNftExSkuVo> goblinNftExSkuArrayList = ObjectUtil.getGoblinNftExSkuArrayList();
//FArrayList<GoblinNftExCodeVo> goblinNftExCodeArrayList = ObjectUtil.getGoblinNftExCodeArrayList();
/*
Boolean bol = false;
String spuId = "";
Integer stockNumber = 0;
for (GoblinNftExSkuParam goblinNftExSkuParam : goblinNftExSkuParams) {
if (goblinNftExSkuParam.getUnbox().equals("1")) {
bol = true;
spuId = goblinNftExSkuParam.getSpuId();
break;
}
stockNumber += goblinNftExSkuParam.getExStock();
}
if (stockNumber <= 0) {
return false;
}
......@@ -88,13 +94,14 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
}
}
}
*/
List<GoblinNftExSku> goblinNftExSkus = new ArrayList<>();
List<GoblinNftExCodeTask> goblinNftExCodeTasks = new ArrayList<>();
// List<GoblinNftExCode> goblinNftExCodes = new ArrayList<>();
// List<GoblinNftExCodeTask> goblinNftExCodeTasks = new ArrayList<>();
List<GoblinNftExCode> goblinNftExCodes = new ArrayList<>();
// sku ---> 兑换码关联
Map<String, GoblinNftExSkuParam> goblinNftExSkuParamMap = new HashMap<>();
// 构建对象
for (GoblinNftExSkuParam goblinNftExSkuParam : goblinNftExSkuParams) {
......@@ -105,7 +112,7 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
goblinNftExSkus.add(goblinNftExSku);
// 定时任务对象构建
GoblinNftExCodeTask goblinNftExCodeTask = GoblinNftExCodeTask.getNew();
/* GoblinNftExCodeTask goblinNftExCodeTask = GoblinNftExCodeTask.getNew();
goblinNftExCodeTask.setTaskId(IDGenerator.nextSnowId());
goblinNftExCodeTask.setActivityId(goblinNftExSkuParam.getActivityId());
goblinNftExCodeTask.setStoreId(goblinNftExSkuParam.getStoreId());
......@@ -118,10 +125,10 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
goblinNftExCodeTask.setExStopTime(goblinNftExSkuParam.getExStopTime());
goblinNftExCodeTask.setTyp(1);
goblinNftExCodeTask.setCreatedAt(now);
goblinNftExCodeTasks.add(goblinNftExCodeTask);
goblinNftExCodeTasks.add(goblinNftExCodeTask);*/
// 盲盒 概率
/*switch (goblinNftExSkuParam.getUnbox()) {
switch (goblinNftExSkuParam.getUnbox()) {
case "1":
// sku ---> 库存
......@@ -134,7 +141,7 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
int stock = goblinRedisUtils.decrSkuStock(null, key, stockNum);
if (stock < 0) {
goblinRedisUtils.incrSkuStock(null, key, stockNum);
}else {
} else {
for (int i = 0; i < stockNum; i++) {
GoblinNftExCode goblinNftExCode = GoblinNftExCode.getNew();
goblinNftExCode.setCodeId(IDGenerator.nextSnowId());
......@@ -181,7 +188,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 {
} else {
// 构建兑换码数量
for (int i = 0; i < goblinNftExSkuParam.getExStock(); i++) {
GoblinNftExCode goblinNftExCode = GoblinNftExCode.getNew();
......@@ -225,12 +232,12 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
// goblinNftExSkuArrayList.add(GoblinNftExSkuVo.getNew().copy(goblinNftExSku));
}*/
}
}
/*
for (String key : goblinNftExSkuParamMap.keySet()) {
GoblinNftExSkuVo goblinNftExSkuVo = goblinRedisUtils.getSkuTime(key);
......@@ -256,18 +263,20 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
}
GoblinNftExSkuVo goblinNftExSku = GoblinNftExSkuVo.getNew();
goblinNftExSku.setExStartTime(exStartTime);
goblinNftExSku.setExStopTime(exStopTime);
goblinNftExSku.setRdStartTime(exStartTime.toString());
goblinNftExSku.setRdStopTime(exStopTime.toString());
goblinRedisUtils.addSkuTime(key,goblinNftExSku);
goblinRedisUtils.addSkuTime(key, goblinNftExSku);
}
*/
// 数据库操作
long startm = System.currentTimeMillis();
goblinNftExSkuMapper.addGoblinNftExSkus(goblinNftExSkus);
goblinNftExCodeTaskMapper.addGoblinNftExCodeTasks(goblinNftExCodeTasks);
// goblinNftExCodeMapper.addGoblinNftExCodes(goblinNftExCodes);
// goblinNftExCodeTaskMapper.addGoblinNftExCodeTasks(goblinNftExCodeTasks);
goblinNftExCodeMapper.addGoblinNftExCodes(goblinNftExCodes);
log.debug("MSQ耗时：ms", System.currentTimeMillis() - startm);
return true;
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/task/code/GoblinCodeTask.java
View file @ 849e9436
......@@ -32,7 +32,7 @@ import java.util.Map;
@Slf4j
@Configuration
@EnableScheduling
// @EnableScheduling
public class GoblinCodeTask {
@Autowired
......@@ -44,7 +44,7 @@ public class GoblinCodeTask {
@Autowired
private GoblinRedisUtils goblinRedisUtils;
@Scheduled(cron = "0/5 * * * * ?") // 当前为同步 每隔5秒触发一次
// @Scheduled(cron = "0/5 * * * * ?") // 当前为同步 每隔5秒触发一次
@Transactional(rollbackFor = Exception.class)
public void scheduleCode() {
/**
......
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