From b9cd922bbb4eb5a11f76bc5cbcfbf0a109f8b032 Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Mon, 3 Mar 2025 17:28:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E5=9D=97=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/mq/OrderMqListener.java | 1 - .../order/service/impl/OrderInfoRpcServiceImpl.java | 2 +- .../com/czg/service/product/mapper/ProductMapper.java | 2 +- .../product/service/impl/ProductRpcServiceImpl.java | 10 ---------- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java b/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java index d431fa994..03c90c842 100644 --- a/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java +++ b/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java @@ -33,7 +33,6 @@ public class OrderMqListener { try { orderInfoRpcService.paySuccessCallback(Long.valueOf(orderId)); } catch (Exception e) { - e.printStackTrace(); log.error("订单支付成功扣减库存失败", e); String errorInfo = ExceptionUtil.stacktraceToString(e); mqLog.setErrInfo(errorInfo); diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java index 408da23b9..7f189067e 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java @@ -112,7 +112,7 @@ public class OrderInfoRpcServiceImpl implements OrderInfoRpcService { } @Override - //@GlobalTransactional + @GlobalTransactional public void paySuccessCallback(Long orderId) { // 下单后商品库存扣减，耗材扣减，流水记录 OrderInfo orderInfo = orderInfoMapper.selectOneById(orderId); diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java b/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java index 07b51a74e..8b12d16f3 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java @@ -36,5 +36,5 @@ public interface ProductMapper extends BaseMapper { List selectCouponProBySaleNum(); - void updateProductStockNum(@Param("id") Long id, @Param("shopId") Long shopId, @Param("num") String type, @Param("num") BigDecimal num); + void updateProductStockNum(@Param("id") Long id, @Param("shopId") Long shopId, @Param("type") String type, @Param("num") BigDecimal num); } \ No newline at end of file diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java index c1300ef2e..282a7b0cf 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java @@ -13,7 +13,6 @@ import com.czg.product.entity.ProdConsRelation; import com.czg.product.enums.InOutItemEnum; import com.czg.product.enums.InOutTypeEnum; import com.czg.product.service.ProductRpcService; -import com.czg.sa.StpKit; import com.czg.service.product.mapper.ConsInfoMapper; import com.czg.service.product.mapper.ConsStockFlowMapper; import com.czg.service.product.mapper.ProdConsRelationMapper; @@ -56,7 +55,6 @@ public class ProductRpcServiceImpl implements ProductRpcService { @Override @Transactional(rollbackFor = Exception.class) - //@GlobalTransactional @CacheEvict(value = {CacheConstant.USER_CLIENT_HOTS_PRODUCT, CacheConstant.USER_CLIENT_GROUPS_PRODUCT}, key = "#shopId", allEntries = true, beforeInvocation = true) public void paySuccessSubtractStock(Long shopId, Long orderId, List> dataList) { List list = BeanUtil.copyToList(dataList, ProductStockSubtractDTO.class); @@ -105,10 +103,6 @@ public class ProductRpcServiceImpl implements ProductRpcService { consStockFlow.setProductId(dto.getProductId()); //consStockFlow.setSkuId(0L); consStockFlow.setOrderId(orderId); - Long createUserId = StpKit.USER.getLoginIdAsLong(); - String createUserName = StpKit.USER.getAccount(); - consStockFlow.setCreateUserId(createUserId); - consStockFlow.setCreateUserName(createUserName); consStockFlowMapper.insert(consStockFlow); } } @@ -164,10 +158,6 @@ public class ProductRpcServiceImpl implements ProductRpcService { consStockFlow.setProductId(dto.getProductId()); //consStockFlow.setSkuId(0L); consStockFlow.setOrderId(orderId); - Long createUserId = StpKit.USER.getLoginIdAsLong(); - String createUserName = StpKit.USER.getAccount(); - consStockFlow.setCreateUserId(createUserId); - consStockFlow.setCreateUserName(createUserName); consStockFlowMapper.insert(consStockFlow); } }