11

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderOtcCreateVO.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.trade.controller.admin.order.vo.order;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -64,7 +65,8 @@ public class TradeOrderOtcCreateVO {
     @Schema(description = "门店ID", example = "123")
     private Long storeId;
 
-
+    @Schema(description = "订单总额-前端修改")
+    private BigDecimal realAmount;
     @Schema(description = "国籍数据")
     List<TradeOrderCountryReqVO> countryData;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderTotalVO.java

@@ -83,9 +83,6 @@ public class TradeOrderTotalVO {
     @Schema(description = "订单总额")
     private BigDecimal orderMoney;
 
-    @Schema(description = "订单总额-前端修改")
-    private BigDecimal realAmount;
-
     @Schema(description = "实际总额")
     private BigDecimal realOrderMoney;
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -2051,15 +2051,15 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO = BeanUtils.toBean(createVO, ShipTradeOrderCreateReqVO.class);
         shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
-        if (createVO.getSummary().getOrderMoney() != null && createVO.getSummary().getRealAmount() != null && !createVO.getSummary().getOrderMoney().equals(createVO.getSummary().getRealAmount())){
-            shipTradeOrderCreateReqVO.setAmount(createVO.getSummary().getRealAmount());
-            shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getRealAmount());
+        if (createVO.getSummary().getOrderMoney() != null && createVO.getRealAmount() != null && !createVO.getSummary().getOrderMoney().equals(createVO.getRealAmount())){
+            shipTradeOrderCreateReqVO.setAmount(createVO.getRealAmount());
+            shipTradeOrderCreateReqVO.setPayAmount(createVO.getRealAmount());
             shipTradeOrderCreateReqVO.setConfirmType(1);
             TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
             tradeOrderBindDO.setId(IdWorker.getId());
             tradeOrderBindDO.setType(1);
             tradeOrderBindDO.setCustom("");
-            tradeOrderBindDO.setRemark("create订单金额修改，订单金额："+createVO.getSummary().getOrderMoney()+"，订单修改后金额："+createVO.getSummary().getRealAmount());
+            tradeOrderBindDO.setRemark("create订单金额修改，订单金额："+createVO.getSummary().getOrderMoney()+"，订单修改后金额："+createVO.getRealAmount());
             shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
         }else {
             shipTradeOrderCreateReqVO.setConfirmType(0);
@@ -2281,15 +2281,15 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         shipTradeOrderCreateReqVO.setDistributorId(loginUser.getDistributorId());
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
         shipTradeOrderCreateReqVO.setOrderId(orderId);
-        if (createVO.getSummary().getOrderMoney() != null && createVO.getSummary().getRealAmount() != null && !createVO.getSummary().getOrderMoney().equals(createVO.getSummary().getRealAmount())){
-            shipTradeOrderCreateReqVO.setAmount(createVO.getSummary().getRealAmount());
-            shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getRealAmount());
+        if (createVO.getSummary().getOrderMoney() != null && createVO.getRealAmount() != null && !createVO.getSummary().getOrderMoney().equals(createVO.getRealAmount())){
+            shipTradeOrderCreateReqVO.setAmount(createVO.getRealAmount());
+            shipTradeOrderCreateReqVO.setPayAmount(createVO.getRealAmount());
             shipTradeOrderCreateReqVO.setConfirmType(1);
             TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
             tradeOrderBindDO.setId(IdWorker.getId());
             tradeOrderBindDO.setType(1);
             tradeOrderBindDO.setCustom("");
-            tradeOrderBindDO.setRemark("motify订单金额修改，订单金额："+createVO.getSummary().getOrderMoney()+"，订单修改后金额："+createVO.getSummary().getRealAmount());
+            tradeOrderBindDO.setRemark("motify订单金额修改，订单金额："+createVO.getSummary().getOrderMoney()+"，订单修改后金额："+createVO.getRealAmount());
             shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
         }else {
             shipTradeOrderCreateReqVO.setConfirmType(0);