订单修改优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -103,7 +103,7 @@ public class TradeOrderDO extends TenantBaseDO {
     /**
      * 支付金额
      */
-    @ForUpdate(fieldName = "支付金额")
+    @ForUpdate(fieldName = "实际金额")
     private BigDecimal payAmount;
     /**
      * 订单状态

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderTotalDO.java

@@ -106,7 +106,7 @@ public class TradeOrderTotalDO extends TenantBaseDO {
     @ForUpdate(fieldName = "订单总额")
     private BigDecimal orderMoney;
 
-    @ForUpdate(fieldName = "实际金额")
+//    @ForUpdate(fieldName = "实际金额")
     private BigDecimal realMoney;
 
     @ForUpdate(fieldName = "其它费用")

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

@@ -2113,6 +2113,11 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             TradeOrderTotalDO oldTradeOrderTotal = tradeOrderTotalMapper.selectOne(new LambdaQueryWrapper<TradeOrderTotalDO>().eq(TradeOrderTotalDO::getOldOrderId, orderId));
             shipTradeOrderCreateReqVO.setOldtradeOrderTotalDO(oldTradeOrderTotal);
             TradeOrderTotalDO tradeOrderTotalDO = BeanUtils.toBean(summary, TradeOrderTotalDO.class);
+            if(tradeOrderTotalDO.getUpFloorTotalMoney()==null){
+                tradeOrderTotalDO.setUpFloorTotalMoney(BigDecimal.ZERO);
+            }
+            tradeOrderTotalDO.setUpFloorTotalNum(tradeOrderTotalDO.getUpFloorTotalNum()==null?0:tradeOrderTotalDO.getUpFloorTotalNum());
+            tradeOrderTotalDO.setUseRoomTotalNum(tradeOrderTotalDO.getUseRoomTotalNum()==null?0:tradeOrderTotalDO.getUseRoomTotalNum());
             List<TradeVisitorDO> oldvisitorDOList = tradeVisitorMapper.selectList(new LambdaQueryWrapper<TradeVisitorDO>().eq(TradeVisitorDO::getOrderId, tradeOrderDO.getId()));
             String changedFields0 = "";
             AtomicReference<String> oldCardNo = new AtomicReference<>("");
@@ -2245,7 +2250,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 auditType = 3;
                 desc = "平台修改定金金额，订单进入三级审核";
             }
-            if (realAmount.compareTo(tradeOrderDO.getPayAmount())!=0 && loginUser.getDistributorId() != null) {
+            if (realAmount.compareTo(tradeOrderDO.getPayAmount())!=0 && loginUser.getDistributorId() == null) {
                 auditType = 3;
                 desc = "平台修改实际金额，订单进入三级审核";
             }