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
literal 0
HcmV?d00001
diff --git a/mall_auth/target/classes/com/mall/auth/domain/IdCardValidateVo$DataBean.class b/mall_auth/target/classes/com/mall/auth/domain/IdCardValidateVo$DataBean.class
new file mode 100644
index 0000000000000000000000000000000000000000..80c88ec0f7c792e3e6dd7fa3c178f102668fc990
GIT binary patch
literal 3153
zcmb7FTXR!Y6#jN{Zb?r|DZLOtC|I;tf_OnvD$)W{Z2>7%!5gQ^p$Vi(Nl#IH@zwFc
z@!1D`ab$+!L1(1Q=#1zK&iI=|{MJ4vNt+&K>P)isy6?T#xAs1N|NHCj0A4|m#%^3r
z!N$Ch_k_GJn
z4$2OeL|3sf)JLnN7_pU0nCzP+WNy9p%h7d^DkjfYjh-IAUw`Mb2n$8
zk=Y5V;TS5U=c=o2w4~7A|4j*B_T(I%wSBRul3?gu9nILL1X`>v)1QzFuZ{iE^eVFL}qBT
zUx1t7tc>=vHDuaG`|Hi2lpgJm+CxDNxwwcdr?I(xI1UO2w^SPZfG~n
zaa0%Y+8$nnXPVh|n{N_eA|Z&7O9&`>B`$g;GDPF&;f%Op`-*R(v88tAaTDXxHmSK@Wuoue`*Qtiw)*P!~`3y!8>DvIY}|W
zW@~UJHkcC_6Ku5x?}`n6nV+A8Zdi_Mf~8u+yB{FY+U{;0-5YvD?G`8mSA|y@XL20)
zWl?wyM>nM$d4S|rQ_6@mQts6$Uyn~|Y&E4!TO(z^PI)XorMcCVGPsSD`*q4(d`fGp
zDdi3{QXbGL`PhWLR9|szW1An14F3qzxIgkI>~CQv?~nWedvEhzvwiHl5mYPR14|
zCvvhg&N`=#oNV2ZOJ`Ezl#ZNInRMOBkeir9^BRY9wH%h#n5##az#HsE5ANXvuXciO
z?bmpdx+Hu2B~Fqva0xdtNzTMo_?RMR;SSE=6geAT(El_!2jB4}IzujnANU@yxwo0-23M
zO_nExMi=OW2Ay9Ms`!YhZ(Cw@3jeytB6F^=^VKWdu$EcwBF4b
zV#pYg#SyGSQ+v+TCc>u8o~{KlB{JG=gArD`4L>#H4(P57CciTa(u9CuA{{)f4yc?KIFU{_=tS9;F8U0hqxylCxT7P-?E4
zcgo97tt4`w)V*Sfxes<%v(&TZdQ!QDBbm|eqPBJ#WB9x@yPMG++Krd$i($j;hb_wk
z{gx=R?>Ob9pmnnz7IQT7e`}FhCFfnQSS?(3YRpuiLN^@{IN>JT5cZwbZTMbF9KoOd=90(fT#Y@#~vRL)7AWQ$I{=yzjWzLJ|i
z$D!2RdZX;IqTs>$h<`J(ZH!^u#`Ac=#(s?0
zIDi*z97M*(C`L3K=;{X9xPo&wUdAgnUd3@6FX4!dv!XkSV>V6*S;TP-d)kq9rco*v
zWVD0r^<`wtGd4cOXF@(_^Ap2tc7}~j3nm-L@z9cMK+4I|Li;!O4!ngms7DSbN#K
zItFJk&8^75vOFU^V`Jm@5NRKGLPZby9>KU}6|z?iCmCmG6p|EXaH>R>rL2UY;V?}OK&!oHpD0P0I5y%rj2xLi&J0Lq*GtkN}J+j1x{w#3Y`@0
zqj-E>ef+HWEwu2niSu}aJrCdxF7OIRIKdKf)J6H;&f`sTIvjdkBxhiaIG7_B!`B4c
zJUJ8JU>_F9S-8aUOrp=U{wBd?+kS{a6L0ZnX%Dg2XX9Jh5V+?#Y+b${0VGbaCbfgDFQ+_!?
z{ZVXSNg>)m1#gp!@P84@>?w-Ve5<}gPR9!N;9YWt8ulGnkGQ)ihpq8dtvzD1fe;bt
z8R*Ky$t!Dgi>w?5V1y2#kG@?MxW%@(J@#zZ(wPQc$PqY4)K2haF9N}
literal 0
HcmV?d00001
diff --git a/mall_auth/target/classes/com/mall/auth/domain/request/IdCardRequest.class b/mall_auth/target/classes/com/mall/auth/domain/request/IdCardRequest.class
new file mode 100644
index 0000000000000000000000000000000000000000..0d651082d60a6c88feae72e6db0e17667c919261
GIT binary patch
literal 3232
zcma)7TW?fV6#n+~+-BxXI}{3x7N}CSS4I&sxE@b=hbB{P(9{0UW_v
z3XkAI5;iW1cvHk%A})!zY~$?|*LOs`E7bP{y)WX52w%jq7z#FuDP(cMK_Kf@2P+Or
z4$2O$Ik+ymij7r;HUEa6ulUuK{8FP{uC7dxuX)nedho$Uu-?ee>cbYp9WUmt1dW;2<#&yY
z#$8`nr&<{}+(yaRgbO;4v?!aYxa%Ep2Sy$aD=B8@gGQ-VJm=RLqY>1ZfOxi_#qHKv
zgwa`|Y@TH?8^1!=j#JJqUkeJ2snN>{inVQTOJq_oYmHJ+SLl`64YxJ1PaE1bA*HR2
z5v5I&(ov%Bro#x)E~!mn!&9Lp++;$ZW-h&vTT_u)YOwJ0{+ezxhgT1rQ}C;2Bx}x3
z$zLyplfto?Wm4xBXXno_YhtS&tZ!5r3aR#7Qp0VxwuYlSn#19hlEbZubQ-mAh8bb0
zwoxwxGi5!29dmR@Cf>zkc-+OK7<92u#C{P6L=0h2VQl+z>EabU?_va_E}j!KCTLv5
zgosHIuY&pQ>3(acHp-Qvv~+LB4M&>2opwe
zaHn|aB1Sp1twX~}Vx9f9wV+y5n2a0rhh{&zh<9vVMAH3H8b<
za_xhXLQ@{(F3(kQHOFp4eWz)|l$KUHc!Jms33w7uai^rJl%38$An|RNb0*fAjfipX
z>2}@`>&ynmI2+y01F_C*e2lZ%?VO8s=D@@_Tiwq4Vx14M$_ZUCk8488J2w6!67l8U
z9WtVFODm+W3QyC|RNQ2_c_uz&&vrw~h%`g)(;*MXhcvbuQl_mLa=#AwYzwg=5`C|4n3aX3lCOxt>ju>p3}F
zNKQnub50v6<0VPTc&S`cNU4aF%%$2$y?h2%ygqAikfi>dXX`+0v9rreyj
zdpL?0Sfc^_j$?fC33_}FkGdXyM!&%nk-_il=QvJeVjiDjn#e*0*KvZ#MjZiOBy#Wt
zX7CbG5?^vXNtD7Szdxsl()fkre45C`%e>o3^xMuq=(Ta?K6cxf;m=X`u{VUt|A$+T
zdQ9sT{A*eQ+Y(!VRjX~6>_=DXY3
hzdOVk!Fxj7D|j!(CUV{XAMJm*b5Y9_mh`}${|^X?52XMA
literal 0
HcmV?d00001
diff --git a/mall_modules/mall_server/src/main/java/com/mall/server/monitor/SpikesMonitor.java b/mall_modules/mall_server/src/main/java/com/mall/server/monitor/SpikesMonitor.java
index 2c1c8ed..49cec22 100644
--- a/mall_modules/mall_server/src/main/java/com/mall/server/monitor/SpikesMonitor.java
+++ b/mall_modules/mall_server/src/main/java/com/mall/server/monitor/SpikesMonitor.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mall.common.domain.OrderItemEntity;
import com.mall.server.config.DelayConfig;
+import com.mall.server.config.MqConfig;
import com.mall.server.constant.SpikesConstant;
import com.mall.server.service.OrderItemService;
import com.rabbitmq.client.Channel;
@@ -48,7 +49,39 @@ public class SpikesMonitor {
try {
channel.basicAck(deliveryTag,false);
} catch (IOException e) {
- throw new RuntimeException(e);
+ try {
+ if(deliveryTag<3){
+ Thread.sleep(3000);
+ channel.basicNack(deliveryTag,false,true);
+ }else {
+ channel.basicNack(deliveryTag,false,false);
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+ }
+
+ @RabbitListener(queues = MqConfig.DXQUEUE)
+ public void orderConsumer(String meg, Message message, Channel channel){
+ log.info("下订单"+meg);
+ long deliveryTag = message.getMessageProperties().getDeliveryTag();
+
+ orderItemService.save(JSON.parseObject(meg,OrderItemEntity.class));
+
+ try {
+ channel.basicAck(deliveryTag,false);
+ } catch (IOException e) {
+ try {
+ if(deliveryTag<3){
+ Thread.sleep(3000);
+ channel.basicNack(deliveryTag,false,true);
+ }else {
+ channel.basicNack(deliveryTag,false,false);
+ }
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
}
}
diff --git a/mall_modules/mall_server/src/main/java/com/mall/server/service/impl/SpikesServiceImpl.java b/mall_modules/mall_server/src/main/java/com/mall/server/service/impl/SpikesServiceImpl.java
index dd30bc9..84d8da0 100644
--- a/mall_modules/mall_server/src/main/java/com/mall/server/service/impl/SpikesServiceImpl.java
+++ b/mall_modules/mall_server/src/main/java/com/mall/server/service/impl/SpikesServiceImpl.java
@@ -1,6 +1,5 @@
package com.mall.server.service.impl;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mall.common.constant.TokenConstants;
@@ -14,6 +13,7 @@ import com.mall.common.result.Result;
import com.mall.common.utils.IdUtils;
import com.mall.common.utils.StringUtils;
import com.mall.server.config.DelayConfig;
+import com.mall.server.config.MqConfig;
import com.mall.server.constant.SpikesConstant;
import com.mall.server.domain.SkuEntity;
import com.mall.server.domain.SpikesEntity;
@@ -21,12 +21,10 @@ import com.mall.server.mapper.SpikesMapper;
import com.mall.server.service.OrderItemService;
import com.mall.server.service.SkuService;
import com.mall.server.service.SpikesService;
-import com.mall.server.service.SpuService;
import org.redisson.api.RSemaphore;
import org.redisson.api.RedissonClient;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -39,7 +37,7 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
- *秒杀serviceImpl
+ * 秒杀serviceImpl
*/
@Service
public class SpikesServiceImpl extends ServiceImpl
@@ -69,14 +67,15 @@ public class SpikesServiceImpl extends ServiceImpl
/**
* 添加秒杀信息
+ *
* @param spikesRequest
* @return
*/
@Transactional
@Override
public Result add(SpikesRequest spikesRequest) {
- if(spikesRequest.getCreateTime().getMinutes()%60!=0){
- throw new BizException(500,"不是整点");
+ if (spikesRequest.getCreateTime().getMinutes() % 60 != 0) {
+ throw new BizException(500, "不是整点");
}
//一天后的0点
Date date = Date.from(
@@ -84,8 +83,8 @@ public class SpikesServiceImpl extends ServiceImpl
.withSecond(0).withNano(0)
.plusDays(1).atZone(ZoneId.systemDefault()).toInstant()
);
- if(spikesRequest.getCreateTime().compareTo(date)<0){
- throw new BizException(500,"时间必须是第二天0点");
+ if (spikesRequest.getCreateTime().compareTo(date) < 0) {
+ throw new BizException(500, "时间必须是第二天0点");
}
//秒杀表信息
int spikesId = spikesMapper.insert(
@@ -103,13 +102,13 @@ public class SpikesServiceImpl extends ServiceImpl
);
//修改sku商品信息
skuService.updateBatchById(
- spikesRequest.getSkuList().stream().map(c->
- SkuEntity.builder()
- .id(c.getSkuId())
- .inventoryRestrict(c.getInventoryRestrict())
- .activityPrice(c.getActivityPrice())
- .spikesId(spikesId).build()
- ).collect(Collectors.toList())
+ spikesRequest.getSkuList().stream().map(c ->
+ SkuEntity.builder()
+ .id(c.getSkuId())
+ .inventoryRestrict(c.getInventoryRestrict())
+ .activityPrice(c.getActivityPrice())
+ .spikesId(spikesId).build()
+ ).collect(Collectors.toList())
);
//遍历修改后的sku商品信息作转换
List activitySkuVoList = skuService.list(
@@ -135,28 +134,29 @@ public class SpikesServiceImpl extends ServiceImpl
.groupId(c.getGroupId())
.startTime(spikesRequest.getCreateTime())
.endTime(spikesRequest.getEndTime()).build()
- ).collect(Collectors.toList());
+ ).collect(Collectors.toList());
//后期存入redis放入查询列表中
- activitySkuVoList.forEach(c->{
+ activitySkuVoList.forEach(c -> {
//redis秒杀信息存在时间
long expire = (c.getEndTime().getTime() - System.currentTimeMillis()) / 60000;
- redisCache.setCacheObject(SpikesConstant.SPIKES_SKUID +c.getId(),c,expire, TimeUnit.MINUTES);
+ redisCache.setCacheObject(SpikesConstant.SPIKES_SKUID + c.getId(), c, expire, TimeUnit.MINUTES);
});
- return Result.success(true,"添加秒杀成功");
+ return Result.success(true, "添加秒杀成功");
}
/**
* 秒杀
+ *
* @param skuId
* @return
*/
@Override
public Result spike(Long skuId) {
UserInfo login = getLogin();
- if(redisCache.hasKey("spike_"+login.getId()+skuId)){
- throw new BizException(500,"禁止重复抢购欧");
+ if (redisCache.hasKey("spike_" + login.getId() + skuId)) {
+ throw new BizException(500, "禁止重复抢购欧");
}
- redisCache.setCacheObject("spike_"+login.getId()+skuId,IdUtils.genId().toString(),1L,TimeUnit.MINUTES);
+ redisCache.setCacheObject("spike_" + login.getId() + skuId, IdUtils.genId().toString(), 1L, TimeUnit.MINUTES);
SkuEntity skuEntity = skuService.getOne(
new LambdaQueryWrapper()
.eq(skuId != null, SkuEntity::getId, skuId)
@@ -165,42 +165,47 @@ public class SpikesServiceImpl extends ServiceImpl
new LambdaQueryWrapper()
.eq(skuEntity.getSpikesId() != null, SpikesEntity::getSpikesId, skuEntity.getSpikesId())
);
- if(spikesEntity.getCreateTime().compareTo(new Date())>0 || spikesEntity.getEndTime().compareTo(new Date())<0){
- throw new BizException(500,skuEntity.getName()+"该商品不在抢购时间内");
+ if (spikesEntity.getCreateTime().compareTo(new Date()) > 0 || spikesEntity.getEndTime().compareTo(new Date()) < 0) {
+ throw new BizException(500, skuEntity.getName() + "该商品不在抢购时间内");
}
RSemaphore semaphore = redissonClient.getSemaphore(SpikesConstant.SPIKES_INVENTORY + skuId);
- if(!semaphore.tryAcquire(1)){
- throw new BizException(500,"系统繁忙,商品已抢购完");
+ if (!semaphore.tryAcquire(1)) {
+ throw new BizException(500, "系统繁忙,商品已抢购完");
}
String orderSn = IdUtils.genId();
- orderItemService.save(
- OrderItemEntity.builder()
- .userId(login.getId())
- .orderSn(orderSn)
- .skuId(skuId)
- .skuName(skuEntity.getName())
- .skuPic(skuEntity.getDefaultImage())
- .skuPrice(skuEntity.getPrice())
+ OrderItemEntity orderItem = OrderItemEntity.builder()
+ .userId(login.getId())
+ .orderSn(orderSn)
+ .skuId(skuId)
+ .skuName(skuEntity.getName())
+ .skuPic(skuEntity.getDefaultImage())
+ .skuPrice(skuEntity.getPrice())
// .promotionAmount()
// .couponAmount()
// .integrationAmount()
- .realAmount(skuEntity.getActivityPrice())
- .status(0).build()
- );
+ .realAmount(skuEntity.getActivityPrice())
+ .status(0).build();
+ //异步下订单
+ rabbitTemplate.convertAndSend(MqConfig.DXEXCHANGE, MqConfig.ROUTINGKEY, orderItem.toString(),
+ message -> {
+ message.getMessageProperties().setMessageId(IdUtils.genId());
+ return message;
+ });
+
rabbitTemplate.convertAndSend(
- DelayConfig.EXCHANGE, DelayConfig.ROUKEYCZK, skuId + "," +orderSn ,
+ DelayConfig.EXCHANGE, DelayConfig.ROUKEYCZK, skuId + "," + orderSn,
message -> {
message.getMessageProperties().setMessageId(IdUtils.genId());
return message;
}
);
- return Result.success(skuId,"下单成功");
+ return Result.success(skuId, "下单成功");
}
- public UserInfo getLogin(){
+ public UserInfo getLogin() {
String token = request.getHeader(TokenConstants.TOKEN);
- if (StringUtils.isBlank(token)){
- throw new BizException(401,"未登录");
+ if (StringUtils.isBlank(token)) {
+ throw new BizException(401, "未登录");
}
UserInfo userInfo = redisCache.getCacheObject(TokenConstants.TOKEN + token);
return userInfo;