Merge pull request '修改bug' (#14) from main-cx into main

Reviewed-on: #14
This commit is contained in:
2025-02-21 11:26:34 +08:00

View File

@@ -1408,7 +1408,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
accountTransaction.setRevenuePoints(totalPointsAmount.intValue()); accountTransaction.setRevenuePoints(totalPointsAmount.intValue());
PmsProduct pmsProduct = orderMapper.selectAll(order.getOrderSn()); PmsProduct pmsProduct = orderMapper.selectAll(order.getOrderSn());
accountTransaction.setRemarks( "商品名称" + pmsProduct.getName()); accountTransaction.setRemarks( "商品名称" + pmsProduct.getName());
umsMemberAccountTransactionMapper.updateByPrimaryKey(accountTransaction); umsMemberAccountTransactionMapper.insert(accountTransaction);
Date date = new Date(); Date date = new Date();
@@ -1529,7 +1529,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
accountTransaction.setRevenueAmount(payAmount.negate()); accountTransaction.setRevenueAmount(payAmount.negate());
PmsProduct pmsProduct = orderMapper.selectAll(orderResult.getOrderSn()); PmsProduct pmsProduct = orderMapper.selectAll(orderResult.getOrderSn());
accountTransaction.setRemarks( "商品名称" + pmsProduct.getName()); accountTransaction.setRemarks( "商品名称" + pmsProduct.getName());
umsMemberAccountTransactionMapper.updateByPrimaryKey(accountTransaction); umsMemberAccountTransactionMapper.insert(accountTransaction);
// 更新订单状态为已支付 // 更新订单状态为已支付
OmsOrder order = orderMapper.selectByPrimaryKey(orderId); OmsOrder order = orderMapper.selectByPrimaryKey(orderId);