Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa

order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java

@@ -178,7 +178,6 @@ public class DeliveryAdapter {
 
         List<ProductInfo> productInfos = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(order.getProductList())) {
-            AtomicBoolean flag = new AtomicBoolean(false);
             order.getProductList().forEach(productList -> {
                 ProductInfo deliveryProductInfo = new ProductInfo();
                 deliveryProductInfo.setProductCode(productList.getProductId().substring(4));
@@ -207,9 +206,6 @@ public class DeliveryAdapter {
                 if(grilling.length() > 0) {
                     grilling = grilling.substring(0, grilling.length()-1);
                 }
-                if(grilling.length() > 50) {
-                    flag.set(true);
-                }
                 deliveryProductInfo.setGrilling(grilling);
                 deliveryProductInfo.setProductName(productName);
                 deliveryProductInfo.setProductNumber(productList.getNumber());
@@ -252,9 +248,6 @@ public class DeliveryAdapter {
                         if(grillingCombo.length() > 0) {
                             grillingCombo = grillingCombo.substring(0, grillingCombo.length()-1);
                         }
-                        if(grillingCombo.length() > 50) {
-                            flag.set(true);
-                        }
                         deliveryComboProductInfo.setGrilling(grillingCombo);
                         deliveryComboProductInfo.setProductName(productNameCombo);
                         deliveryComboProductInfo.setProductNumber(comboProduct.getNumber()/productList.getNumber());
@@ -293,9 +286,6 @@ public class DeliveryAdapter {
                 }
             });
             deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()).sum());
-            if(flag.get()) {
-                return null;
-            }
         }
 
 

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -977,19 +977,13 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 return sendPaySuccessNoticeMessage();
             }
             CreateDeliveryVo createDeliveryVo = deliveryAdapter.buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl, downstreamThirdOrderCode);
-            CreateDeliveryOrderResponseDto deliveryResponse = null;
-            if(null != createDeliveryVo) {
             //创建配送单
-                deliveryResponse = deliveryFeiginClient.deliveryOrderAdd(createDeliveryVo);
-            }
+            CreateDeliveryOrderResponseDto deliveryResponse = deliveryFeiginClient.deliveryOrderAdd(createDeliveryVo);
             //创建配送单失败，更新订单为异常单
             if (deliveryResponse == null || RESPONSE_SUCCESS_CODE != deliveryResponse.getCode() || deliveryResponse.getData() == null) {
                 String deliveryId = deliveryResponse != null && deliveryResponse.getData() != null ? deliveryResponse.getData().getDeliveryId() : "";
                 String operator =  "系统" ;
                 String abnormalDesc = "配送异常";
-                if(null == createDeliveryVo) {
-                    abnormalDesc = "grilling过长";
-                }
                 if(null != deliveryResponse && StringUtils.isNotBlank(deliveryResponse.getMsg())) {
                     abnormalDesc = deliveryResponse.getMsg();
                 }