订单修改优化

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

@@ -1985,7 +1985,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             shipTradeOrderCreateReqVO.setOrderSort(tradeOrderDO.getOrderSort());
             shipTradeOrderCreateReqVO.setIsRead(0);
             TradeOrderTotalVO summary = createVO.getSummary();
-            BigDecimal realAmount = summary.getRealMoney();
+            BigDecimal realAmount = summary.getRealMoney()==null?BigDecimal.ZERO:summary.getRealMoney()  ;
             BigDecimal orderMoney = summary.getOrderMoney();
             Long discountId = summary.getDiscountId();
             shipTradeOrderCreateReqVO.setAmount(orderMoney);
@@ -2245,7 +2245,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 auditType = 3;
                 desc = "平台修改定金金额，订单进入三级审核";
             }
-            if (shipTradeOrderCreateReqVO.getRealOrderMoney().compareTo(tradeOrderDO.getPayAmount())!=0 && loginUser.getDistributorId() != null) {
+            if (realAmount.compareTo(tradeOrderDO.getPayAmount())!=0 && loginUser.getDistributorId() != null) {
                 auditType = 3;
                 desc = "平台修改实际金额，订单进入三级审核";
             }
@@ -2257,7 +2257,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 auditType = 4;
                 desc = "分销商修改订单金额，订单进入四级审核";
             }
-            if (shipTradeOrderCreateReqVO.getRealOrderMoney().compareTo(tradeOrderDO.getPayAmount())!=0 && loginUser.getDistributorId() != null) {
+            if (realAmount.compareTo(tradeOrderDO.getPayAmount())!=0 && loginUser.getDistributorId() != null) {
                 auditType = 4;
                 desc = "分销商修改实际金额，订单进入四级审核";
             }