提交订单-订单来源判断bugfix

src/main/java/com/caimei365/order/components/ProductService.java

@@ -180,13 +180,13 @@ public class ProductService {
             for (ProductPostageVo postageVo : postageFlagList){
                 if (null != postageVo) {
                     // 是否是仪器 或 设置了运费到付
-                    boolean flag = (null == postageVo.getCommodityType() || 2 == postageVo.getCommodityType() || (null != postageVo.getPostageFlag() && -1==postageVo.getPostageFlag()));
+                    boolean flag = (null == postageVo.getCommodityType() || 2 == postageVo.getCommodityType() || (null != postageVo.getPostageFlag() && 1 == postageVo.getPostageFlag()));
                     if (flag) {
                         // 到付
                         postageMap.put("postageFlag", -1);
                         postageMap.put("postage", 0.00d);
                         return postageMap;
-                    } else if (null != postageVo.getPostageFlag() && 2==postageVo.getPostageFlag()) {
+                    } else if (null != postageVo.getPostageFlag() && 2 == postageVo.getPostageFlag()) {
                         // 若有不包邮商品，则全部不包邮（商品数据库：2默认（遵循运费规则），这里返回前端(按照订单数据库)：1遵循运费规则）
                         postageFlag = 1;
                     }

src/main/java/com/caimei365/order/controller/OrderSubmitApi.java

@@ -86,7 +86,7 @@ public class OrderSubmitApi {
             return ResponseJson.error("订单来源不能为空！", null);
         }
         // 1,www来源    2,crm来源    6,小程序来源
-        if (1 != submitDto.getOrderSource() || 2 != submitDto.getOrderSource() || 6 != submitDto.getOrderSource()) {
+        if (null == submitDto.getOrderSource()  || !(1 == submitDto.getOrderSource() || 2 == submitDto.getOrderSource() || 6 == submitDto.getOrderSource())) {
             return ResponseJson.error("订单来源异常！", null);
         }
         if(null == submitDto.getCartType()){

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -884,7 +884,7 @@ public class SubmitServiceImpl implements SubmitService {
         // 售后条款
         Integer clauseId = orderParamBo.getClauseId();
         String clauseName = null;
-        if (null != clauseId) {
+        if (null != clauseId && clauseId > 0) {
             clauseName = submitMapper.getClauseNameById(clauseId);
         }
         if (StringUtils.isNotEmpty(clauseName)) {