订单修改优化

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

@@ -8,7 +8,6 @@ import com.yc.ship.module.trade.enums.SellMethodEnum;
 import com.yc.ship.module.trade.enums.TradeOrderStatusEnum;
 import com.yc.ship.module.trade.enums.invoice.InvoiceStatusEnum;
 import com.yc.ship.module.trade.framework.annotation.ForUpdate;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -342,13 +341,13 @@ public class TradeOrderDO extends TenantBaseDO {
     @ForUpdate(fieldName = "政策优惠金额")
     private BigDecimal freeAmount;
 
-    @ForUpdate(fieldName = "是否需要补缴费 1是 0 否 2已补差价")
+//    @ForUpdate(fieldName = "是否需要补缴费 1是 0 否 2已补差价")
     private Integer isSupplementary;
 
     @ForUpdate(fieldName = "受损金额")
     private BigDecimal damaged;
 
-    @ForUpdate(fieldName = "补缴费金额")
+//    @ForUpdate(fieldName = "补缴费金额")
     private BigDecimal  supplementAmount;
     /**
      * 取消状态 0：初始 1：已提交取消 2：取消成功 3取消审核不通过

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

@@ -1990,7 +1990,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             Long discountId = summary.getDiscountId();
             shipTradeOrderCreateReqVO.setAmount(orderMoney);
             shipTradeOrderCreateReqVO.setPayAmount(realAmount);
-            if ((orderMoney != null && realAmount != null && realAmount.compareTo(orderMoney) != 0) || shipTradeOrderCreateReqVO.getAmount().compareTo(tradeOrderDO.getAmount())!=0) {
+            if ((orderMoney != null && realAmount != null && (realAmount.compareTo(orderMoney) != 0) || shipTradeOrderCreateReqVO.getAmount().compareTo(tradeOrderDO.getAmount())!=0)) {
                 shipTradeOrderCreateReqVO.setConfirmType(1);
                 TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
                 tradeOrderBindDO.setId(IdWorker.getId());
@@ -2134,10 +2134,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     }
                 }
             }
-            List<TradeDetailRespVO> orderDetailByOrderId = tradeDetailMapper.getOrderDetailByOrderId(orderId);
-            if(orderDetailByOrderId!=null){
-
-            }
+//            List<TradeDetailRespVO> orderDetailByOrderId = tradeDetailMapper.getOrderDetailByOrderId(orderId);
+//            if(orderDetailByOrderId!=null){
+//
+//            }
 
             if(tradeOrderDO.getPayStatus()==1 && tradeOrderDO.getPayAmount().subtract(shipTradeOrderCreateReqVO.getPayAmount()).compareTo(BigDecimal.ZERO)!=0){
                 return CommonResult.error(500, "已支付订单金额发生变化"+tradeOrderDO.getPayAmount()+"->"+shipTradeOrderCreateReqVO.getPayAmount());
@@ -2245,13 +2245,21 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 auditType = 3;
                 desc = "平台修改定金金额，订单进入三级审核";
             }
+            if (shipTradeOrderCreateReqVO.getRealOrderMoney().compareTo(tradeOrderDO.getPayAmount())!=0 && loginUser.getDistributorId() != null) {
+                auditType = 3;
+                desc = "平台修改实际金额，订单进入三级审核";
+            }
             if (oldleaderAmount.compareTo(leaderAmount)!=0 || oldwithAmount.compareTo(withAmount)!=0 || oldotherMoney.compareTo(otherMoney)!=0) {
                 auditType = 4;
                 desc = "领队陪同修改，订单进入四级审核";
             }
             if (shipTradeOrderCreateReqVO.getAmount().compareTo(tradeOrderDO.getAmount())!=0 && loginUser.getDistributorId() != null) {
                 auditType = 4;
-                desc = "分销商修改订单金额发生变化，订单进入四级审核";
+                desc = "分销商修改订单金额，订单进入四级审核";
+            }
+            if (shipTradeOrderCreateReqVO.getRealOrderMoney().compareTo(tradeOrderDO.getPayAmount())!=0 && loginUser.getDistributorId() != null) {
+                auditType = 4;
+                desc = "分销商修改实际金额，订单进入四级审核";
             }
             //1.取消订单，四级审核，销售-计调-运营主管-营销经理
             //2.重要信息修改（修改游客信息，价格变动），四级审核，销售-计调-运营主管-营销经理

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/utils/BeanUtils.java

@@ -38,13 +38,15 @@ public class BeanUtils {
                             continue;
                         }
                     }
+                    newValue = newValue == null ? "" : newValue;
+                    oldValue = oldValue == null ? "" : oldValue;
                     if (!Objects.equals(newValue, oldValue)) {
                         //获取字段名称
                         builder.append(field.getAnnotation(ForUpdate.class).fieldName());
                         builder.append(": 【更改前：");
-                        builder.append(newValue==null?"空":newValue);
+                        builder.append(newValue);
                         builder.append(", 更改后：");
-                        builder.append(oldValue==null?"空":oldValue);
+                        builder.append(oldValue);
                         builder.append("】\n");
                     }
                 } catch (Exception e) {