|
|
@@ -4663,16 +4663,16 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
|
|
|
LiveGoodsUploadMqVo vo = LiveGoodsUploadMqVo.builder().goodsId(goods.getGoodsId()).goodsNum(Integer.parseInt(liveOrder.getTotalNum())).build();
|
|
|
deductLiveGoodsStock(vo);
|
|
|
// 使用 deStockIncSale 方法处理库存和销量
|
|
|
-// deStockIncSale(liveOrder.getProductId(), liveOrder.getAttrValueId(), purchaseNum);
|
|
|
- // 更新直播间库存
|
|
|
-// goods.setStock(goods.getStock() - Integer.parseInt(liveOrder.getTotalNum()));
|
|
|
-// goods.setSales(goods.getSales() + Integer.parseInt(liveOrder.getTotalNum()));
|
|
|
-// liveGoodsMapper.updateLiveGoods(goods);
|
|
|
-// LiveGoods liveGoods = new LiveGoods();
|
|
|
-// liveGoods.setGoodsId(goods.getGoodsId());
|
|
|
-// liveGoods.setStock(goods.getStock() - Integer.parseInt(liveOrder.getTotalNum()));
|
|
|
-// liveGoods.setSales(goods.getSales() + Integer.parseInt(liveOrder.getTotalNum()));
|
|
|
-// log.info("商品库存修改添加队列:{}", goods.getGoodsId());
|
|
|
+ deStockIncSale(liveOrder.getProductId(), liveOrder.getAttrValueId(), purchaseNum);
|
|
|
+// 更新直播间库存
|
|
|
+ goods.setStock(goods.getStock() - Integer.parseInt(liveOrder.getTotalNum()));
|
|
|
+ goods.setSales(goods.getSales() + Integer.parseInt(liveOrder.getTotalNum()));
|
|
|
+ liveGoodsMapper.updateLiveGoods(goods);
|
|
|
+ LiveGoods liveGoods = new LiveGoods();
|
|
|
+ liveGoods.setGoodsId(goods.getGoodsId());
|
|
|
+ liveGoods.setStock(goods.getStock() - Integer.parseInt(liveOrder.getTotalNum()));
|
|
|
+ liveGoods.setSales(goods.getSales() + Integer.parseInt(liveOrder.getTotalNum()));
|
|
|
+ log.info("商品库存修改添加队列:{}", goods.getGoodsId());
|
|
|
// try {
|
|
|
// boolean offered = liveGoodsQueue.offer(liveGoods, 5, TimeUnit.SECONDS);
|
|
|
// if (!offered) {
|
|
|
@@ -4756,6 +4756,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
|
|
|
liveOrder.setTotalPrice(payPrice);
|
|
|
liveOrder.setPayMoney(payPrice.subtract(liveOrder.getDiscountMoney()));
|
|
|
liveOrder.setPayPrice(payPrice.subtract(liveOrder.getDiscountMoney()));
|
|
|
+ liveOrder.setCouponPrice(liveOrder.getDiscountMoney());
|
|
|
try {
|
|
|
if (baseMapper.insertLiveOrder(liveOrder) > 0) {
|
|
|
LiveOrderItemDTO dto = new LiveOrderItemDTO();
|