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

Skip to content

L
liquidnet-bus-v1
Commit 49968799 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge remote-tracking branch 'origin/dev_yy_dh' into dev_yy_dh

parents 56fe9ea0 e1bf558b
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 27 deletions
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamUserMapper.java
View file @ 49968799
......@@ -5,7 +5,6 @@ import com.liquidnet.service.adam.dto.AdamUserInfoDto;
import com.liquidnet.service.adam.entity.AdamUser;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
......@@ -17,7 +16,6 @@ import java.util.List;
* @author liquidnet
* @since 2021-05-10
*/
@Repository
public interface AdamUserMapper extends BaseMapper<AdamUser> {
int executeForDM(@Param("tn") String tn);
......@@ -47,13 +45,13 @@ public interface AdamUserMapper extends BaseMapper<AdamUser> {
})
List<AdamUserInfoDto> selectMultiForUserInfoDto(@Param("rows") int rows, @Param("offset") int offset);
/**
* 根据手机号获取 用户信息
*
* @param mobile
* @return
*/
AdamUserInfoDto selectByPhone(@Param("mobile") String mobile);
// /**
// * 根据手机号获取 用户信息
// *
// * @param mobile
// * @return
// */
// AdamUserInfoDto selectByPhone(@Param("mobile") String mobile);
/**
* 根据手机号批量获取
......
liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamUserMapper.xml
View file @ 49968799
......@@ -6,11 +6,11 @@
<result column="mobile" property="mobile" jdbcType="VARCHAR"/>
</resultMap>
<select id="selectByPhone" resultMap="BaseResult">
select uid, mobile
from adam_user
where mobile = #{mobile,jdbcType=VARCHAR}
</select>
<!-- <select id="selectByPhone" resultMap="BaseResult">-->
<!-- select uid, mobile-->
<!-- from adam_user-->
<!-- where mobile = #{mobile,jdbcType=VARCHAR}-->
<!-- </select>-->
<select id="selectByPhones" resultMap="BaseResult">
select uid,mobile from adam_user where mobile in
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0418_jxl_nft_exchange.sql
View file @ 49968799
......@@ -96,3 +96,31 @@ CREATE TABLE `goblin_nft_ex_code_task_relation`
PRIMARY KEY (`mid`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '兑换码定时任务生成副表' ROW_FORMAT = Dynamic;
# 预约关联表新增创建时间
ALTER TABLE `goblin_goods_anticipate_user` ADD `created_date` datetime NULL DEFAULT NULL COMMENT '创建时间';
# goblin_goods_anticipate 预约表新增字段
ALTER TABLE `goblin_goods_anticipate` ADD `people` bigint NOT NULL COMMENT '预约人数（达到一定人数可以预约）';
ALTER TABLE `goblin_goods_anticipate` ADD `type` int NOT NULL COMMENT '预约类型（1：预约提醒，2：预约获得购买资格）';
# -- >>------------------------------------------------------------------------------------
DROP TABLE IF EXISTS `goblin_goods_anticipate_help`;
CREATE TABLE `goblin_goods_anticipate_help` (
`id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
`sid` varbinary(255) NOT NULL COMMENT '分享sid',
`help_uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '助力人uid',
`created_date` datetime NOT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '预约他人助力记录表' ROW_FORMAT = Dynamic;
# -- >>------------------------------------------------------------------------------------
DROP TABLE IF EXISTS `goblin_goods_anticipate_share`;
CREATE TABLE `goblin_goods_anticipate_share` (
`sid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
`uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '用户uid',
`sku_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'sku_Id',
`created_date` datetime NOT NULL COMMENT '创建时间',
PRIMARY KEY (`sid`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '预约创建助力表' ROW_FORMAT = Dynamic;
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
View file @ 49968799
......@@ -1840,9 +1840,9 @@ public class GoblinRedisUtils {
public Integer getSkuTotalStock(GoblinGoodsSkuInfoVo info) {
if (
info != null
&& LocalDateTime.now().isAfter(info.getSaleStartTime())
// && LocalDateTime.now().isAfter(info.getSaleStartTime())
&& (null == info.getSoldoutStatus() || info.getSoldoutStatus().equals("0"))
&& (null == info.getHitRatio() || info.getHitRatio().compareTo(BigDecimal.ZERO) > 0)
// && (null == info.getHitRatio() || info.getHitRatio().compareTo(BigDecimal.ZERO) > 0)
) {// 可以返回库存
return info.getSkuStock();
} else {// 不计入库存
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExCodeServiceImpl.java
View file @ 49968799
......@@ -5,15 +5,14 @@ import com.alibaba.excel.read.listener.PageReadListener;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.alibaba.excel.write.metadata.style.WriteCellStyle;
import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference;
import com.github.pagehelper.PageHelper;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.AdamUserInfoDto;
import com.liquidnet.service.adam.mapper.AdamUserMapper;
import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.goblin.dto.vo.CodeExcelVo;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeFetchExcelVo;
import com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo;
......@@ -30,6 +29,7 @@ import com.liquidnet.service.platform.utils.GoblinRedisUtils;
import com.liquidnet.service.platform.utils.ObjectUtil;
import com.liquidnet.service.platform.utils.QueueUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
......@@ -44,7 +44,10 @@ import java.io.OutputStream;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
/**
* @Author: wll
......@@ -54,7 +57,8 @@ import java.util.*;
@Service
@Slf4j
public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
@Autowired
private RedisDataSourceUtil redisDataSourceUtil;
@Autowired
private GoblinGoodsSkuMapper goblinGoodsSkuMapper;
@Autowired
......@@ -201,11 +205,10 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
String code = goblinNftExCodeParam.getCode();
String phone = goblinNftExCodeParam.getPhone();
AdamUserInfoDto adamUserInfoDto = adamUserMapper.selectByPhone(phone);
if (adamUserInfoDto == null) {
return ResponseDto.failure("用户不存在!");
}
// AdamUserInfoDto adamUserInfoDto = adamUserMapper.selectByPhone(phone);
// if (adamUserInfoDto == null) {
// return ResponseDto.failure("用户不存在!");
// }
// 根据兑换code查询兑换码信息
GoblinNftExCode goblinNftExCode = goblinNftExCodeMapper.selectGoblinNftCodeByCode(code);
if (goblinNftExCode == null) {
......@@ -225,12 +228,17 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
return ResponseDto.failure("兑换码已领取!");
}
String uid = (String) redisDataSourceUtil.getRedisAdamUtil().get(AdamRedisConst.IDENTITY_MOBILE.concat(phone));
if (StringUtils.isEmpty(uid)) {
return ResponseDto.failure("用户不存在!");
}
// 验证吗时间校验
try {
MultiValueMap<String, String> params = new LinkedMultiValueMap();
params.add("code", code);
params.add("userId", adamUserInfoDto.getUid());
// params.add("userId", adamUserInfoDto.getUid());
params.add("userId", uid);
MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
headers.add("Accept", "application/json;charset=UTF-8");
headers.add("Authorization", "Bearer " + CurrentUtil.getToken());
......
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