Bladeren bron

订单审核

lishiqiang 6 dagen geleden
bovenliggende
commit
60122a0230

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

@@ -3029,12 +3029,15 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 }
                 if (!orderPolicyDOList.isEmpty()) {
                     //TODO: 判断优惠政策是否需要审核
-
-                    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)){
-                            auditType = 0;
+                    if(orderPolicyList.isEmpty()){
+                        isAudit = true;
+                    }else {
+                        String changedFields11 = com.yc.ship.module.trade.utils.BeanUtils.getChangedFields(orderPolicyList.get(0), orderPolicyDOList.get(0));
+                        if (StringUtils.isEmpty(changedFields11)) {
+                            isAudit = false;
+                            if (auditType == 2 && "政策优惠提交,订单进入二级审核".equals(desc)) {
+                                auditType = 0;
+                            }
                         }
                     }
 //                    orderPolicyMapper.insertBatch(orderPolicyDOList);