修改订单政策金额计算优化

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

@@ -2876,7 +2876,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
 
             }
-            if (!CollUtil.isEmpty(createVO.getPolicyList()) &&isAudit) {
+            if (!CollUtil.isEmpty(createVO.getPolicyList())) {
                 auditType = 2;
                 desc = "政策优惠提交，订单进入二级审核";
                 TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
@@ -3019,7 +3019,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 }
                 if (!orderPolicyDOList.isEmpty()) {
                     //TODO: 判断优惠政策是否需要审核
-                    String changedFields11 = com.yc.ship.module.trade.utils.BeanUtils.getChangedFields(orderPolicyList, orderPolicyDOList);
+
+                    String changedFields11 = com.yc.ship.module.trade.utils.BeanUtils.getChangedFields(orderPolicyList==null?null:orderPolicyList.get(0), orderPolicyDOList.get(0));
                     if(StringUtils.isEmpty(changedFields11)){
                         isAudit = false;
                         if(auditType==2 && "政策优惠提交，订单进入二级审核".equals(desc)){
@@ -3030,7 +3031,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 }
             }
             int oldSize = orderPolicyList==null?0:orderPolicyList.size();
-            int newSize = orderPolicyDOList==null?0:orderPolicyDOList.size();
+            int newSize = orderPolicyDOList.size();
             if ((!CollUtil.isEmpty(createVO.getPolicyList()) &&isAudit)||oldSize!=newSize) {
                 auditType = 2;
                 desc = "政策优惠提交，订单进入二级审核";