1.耗材预警调整
This commit is contained in:
@@ -116,7 +116,8 @@ public class ConsMsgConsumer {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
log.info("conwarning:{},stockNumber:{}",tbConsInfo.getConWarning(),tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs());
|
log.info("耗材名称: {}, conwarning:{},stockNumber:{}",tbConsInfo.getConName(),
|
||||||
|
tbConsInfo.getConWarning(),tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs());
|
||||||
if (N.egt(tbConsInfo.getConWarning(), tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs())) {
|
if (N.egt(tbConsInfo.getConWarning(), tbConsInfo.getStockNumber().subtract(tbConsInfo.getStockConsume()).abs())) {
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -386,9 +386,9 @@ public class DutyService {
|
|||||||
redisUtil.seckill(RedisCst.PRODUCT + shopId.toString() + ":" + skuId.toString(), num.toString());
|
redisUtil.seckill(RedisCst.PRODUCT + shopId.toString() + ":" + skuId.toString(), num.toString());
|
||||||
if (ObjectUtil.isNotEmpty(tbProductSku)) {
|
if (ObjectUtil.isNotEmpty(tbProductSku)) {
|
||||||
if (num > tbProductSku.getStockNumber()) {
|
if (num > tbProductSku.getStockNumber()) {
|
||||||
productSkuMapper.updateStockNum(skuId,num);
|
// productSkuMapper.updateStockNum(skuId,num);
|
||||||
} else {
|
} else {
|
||||||
productSkuMapper.updateByskuIdSub(skuId, num);
|
// productSkuMapper.updateByskuIdSub(skuId, num);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.chaozhanggui.system.cashierservice.service;
|
|||||||
|
|
||||||
import cn.hutool.core.date.DateTime;
|
import cn.hutool.core.date.DateTime;
|
||||||
import cn.hutool.core.date.DateUtil;
|
import cn.hutool.core.date.DateUtil;
|
||||||
|
import cn.hutool.core.thread.ThreadUtil;
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import cn.hutool.http.HttpRequest;
|
import cn.hutool.http.HttpRequest;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
@@ -28,6 +29,7 @@ import java.sql.Timestamp;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import static com.chaozhanggui.system.cashierservice.sign.CodeEnum.CARTEXIST;
|
import static com.chaozhanggui.system.cashierservice.sign.CodeEnum.CARTEXIST;
|
||||||
|
|
||||||
@@ -569,12 +571,17 @@ public class OrderService {
|
|||||||
jsonObject.put("type","create");
|
jsonObject.put("type","create");
|
||||||
producer.cons(jsonObject.toString());
|
producer.cons(jsonObject.toString());
|
||||||
|
|
||||||
for (TbCashierCart cashierCart : list) {
|
List<TbCashierCart> finalList = list;
|
||||||
JSONObject objectMsg = new JSONObject();
|
ThreadUtil.execAsync(() -> {
|
||||||
objectMsg.put("skuId", Integer.valueOf(cashierCart.getSkuId()));
|
ThreadUtil.sleep(5, TimeUnit.SECONDS);
|
||||||
objectMsg.put("shopId", Integer.valueOf(cashierCart.getShopId()));
|
for (TbCashierCart cashierCart : finalList) {
|
||||||
producer.con_msg(objectMsg.toString());
|
JSONObject objectMsg = new JSONObject();
|
||||||
}
|
objectMsg.put("skuId", Integer.valueOf(cashierCart.getSkuId()));
|
||||||
|
objectMsg.put("shopId", Integer.valueOf(cashierCart.getShopId()));
|
||||||
|
producer.con_msg(objectMsg.toString());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
return Result.success(CodeEnum.SUCCESS, orderInfo);
|
return Result.success(CodeEnum.SUCCESS, orderInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ public class WxAccountUtil {
|
|||||||
try {
|
try {
|
||||||
return sendTemplateMsg(msgTmpId, toUserOpenId, data);
|
return sendTemplateMsg(msgTmpId, toUserOpenId, data);
|
||||||
}catch (Exception e) {
|
}catch (Exception e) {
|
||||||
log.error("发送失败: {}", e.getMessage());
|
log.error("发送失败, openId:{}, msg: {}", toUserOpenId, e.getMessage());
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user