czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangw
2025-03-03 16:29:43 +08:00
parent 8b1731ce5b dbff74efd4
commit cf7801ff3f
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java
View File

@@ -33,6 +33,7 @@ public class OrderMqListener {
try { try {
orderInfoRpcService.paySuccessCallback(Long.valueOf(orderId)); orderInfoRpcService.paySuccessCallback(Long.valueOf(orderId));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
log.error("订单支付成功扣减库存失败", e); log.error("订单支付成功扣减库存失败", e);
String errorInfo = ExceptionUtil.stacktraceToString(e); String errorInfo = ExceptionUtil.stacktraceToString(e);
mqLog.setErrInfo(errorInfo); mqLog.setErrInfo(errorInfo);

5
cash-api/system-server/src/main/resources/application-test.yml
View File

@@ -39,11 +39,6 @@ dubbo:
port: 9401 port: 9401
threads: 20 threads: 20
threadpool: fixed threadpool: fixed
host: 101.37.12.135
provider:
cehck: false
consumer:
check: false
seata: seata:

19
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoRpcServiceImpl.java
View File

@@ -112,6 +112,7 @@ public class OrderInfoRpcServiceImpl implements OrderInfoRpcService {
} }
@Override @Override
//@GlobalTransactional
public void paySuccessCallback(Long orderId) { public void paySuccessCallback(Long orderId) {
// 下单后商品库存扣减，耗材扣减，流水记录 // 下单后商品库存扣减，耗材扣减，流水记录
OrderInfo orderInfo = orderInfoMapper.selectOneById(orderId); OrderInfo orderInfo = orderInfoMapper.selectOneById(orderId);
@@ -136,8 +137,13 @@ public class OrderInfoRpcServiceImpl implements OrderInfoRpcService {
data.put("num", NumberUtil.sub(num, refundNum)); data.put("num", NumberUtil.sub(num, refundNum));
dataList.add(data); dataList.add(data);
} }
// 调用商品服务扣减库存 try {
productRpcService.paySuccessSubtractStock(shopId, orderId, dataList); // 调用商品服务扣减库存
productRpcService.paySuccessSubtractStock(shopId, orderId, dataList);
} catch (Exception e) {
log.error("调用商品服务扣减库存失败", e);
throw e;
}
} }
@Override @Override
@@ -167,8 +173,13 @@ public class OrderInfoRpcServiceImpl implements OrderInfoRpcService {
data.put("num", NumberUtil.sub(num, refundNum)); data.put("num", NumberUtil.sub(num, refundNum));
dataList.add(data); dataList.add(data);
} }
// 调用商品服务恢复库存 try {
productRpcService.orderCancelRecoverStock(shopId, orderId, dataList); // 调用商品服务扣减库存
productRpcService.orderCancelRecoverStock(shopId, orderId, dataList);
} catch (Exception e) {
log.error("调用商品服务恢复库存", e);
throw e;
}
} }
@Override @Override

1
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductRpcServiceImpl.java
View File

@@ -56,6 +56,7 @@ public class ProductRpcServiceImpl implements ProductRpcService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
//@GlobalTransactional
@CacheEvict(value = {CacheConstant.USER_CLIENT_HOTS_PRODUCT, CacheConstant.USER_CLIENT_GROUPS_PRODUCT}, key = "#shopId", allEntries = true, beforeInvocation = true) @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<Map<String, Object>> dataList) { public void paySuccessSubtractStock(Long shopId, Long orderId, List<Map<String, Object>> dataList) {
List<ProductStockSubtractDTO> list = BeanUtil.copyToList(dataList, ProductStockSubtractDTO.class); List<ProductStockSubtractDTO> list = BeanUtil.copyToList(dataList, ProductStockSubtractDTO.class);