grilling字段长度检测

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

@@ -7,18 +7,14 @@ import cn.freemud.entities.vo.CreateDeliveryVo;
 import cn.freemud.entities.vo.ProductInfo;
 import cn.freemud.enums.DeliveryChannelEnum;
 import cn.freemud.enums.OrderSourceType;
-import cn.freemud.enums.OrderType;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.deliverycenter.dto.CreateDeliveryOrderRequestDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
-import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
-import com.freemud.sdk.api.assortment.order.request.order.CreateOrderProductRequest;
 import com.freemud.sdk.api.assortment.order.request.order.OrderProductAddInfoDto;
 import com.freemud.sdk.api.assortment.order.request.order.OrderSpecialExtraAttrRequest;
-import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
@@ -28,10 +24,9 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import static java.util.stream.Collectors.toList;
-
 @Component
 public class DeliveryAdapter {
 
@@ -183,6 +178,7 @@ 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));
@@ -211,6 +207,9 @@ 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());
@@ -253,6 +252,9 @@ 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());
@@ -291,6 +293,9 @@ 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

@@ -975,14 +975,20 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 return sendPaySuccessNoticeMessage();
             }
             CreateDeliveryVo createDeliveryVo = deliveryAdapter.buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl, downstreamThirdOrderCode);
-            //创建配送单
-            CreateDeliveryOrderResponseDto deliveryResponse = deliveryFeiginClient.deliveryOrderAdd(createDeliveryVo);
+            CreateDeliveryOrderResponseDto deliveryResponse = null;
+            if(null != createDeliveryVo) {
+                //创建配送单
+                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(StringUtils.isNotBlank(deliveryResponse.getMsg())) {
+                if(null == createDeliveryVo) {
+                    abnormalDesc = "grilling过长";
+                }
+                if(null != deliveryResponse && StringUtils.isNotBlank(deliveryResponse.getMsg())) {
                     abnormalDesc = deliveryResponse.getMsg();
                 }
                 updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator, abnormalDesc);