Merge remote-tracking branch 'origin/dev' into dev

2024-08-01 11:22:21 +08:00
parent 38d8c4c817 e617e08923
commit 6c528e3ac6
2 changed files with 4 additions and 0 deletions
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -459,6 +459,7 @@ public class OrderService {
            orderInfo.setStatus("unpaid");
            orderInfo.setOrderAmount(totalAmount);
 //            orderInfo.setOrderAmount(totalAmount.add(packAMount));
+            orderInfo.setRemark(orderVo.getRemark());
            orderInfo.setFreightAmount(feeAmount);
            orderInfo.setProductAmount(saleAmount);
            orderInfo.setTradeDay(DateUtils.getDay());