Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa

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

@@ -405,16 +405,12 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         for (CreateOrderProductRequest productDto : createOrderDto.getProducts()) {
             String skuId = productDto.getSpecification();
             if (products.get(skuId) != null) {
-                productDto.setCustomerCode(products.get(skuId).getCustomerCode());
-                productDto.setProductCode(products.get(skuId).getProductCode());
                 productDto.setThirdProductSpecId(products.get(productDto.getSpecification()).getThirdProductSpecId());
                 productDto.setThirdProductPropertyId(getThirdPropertyId(products.get(productDto.getSpecification()).getProductAttributeGroupList(),productDto.getAddInfo()));
 
                 // todo 商品组信息
                 setProductGroupInfo(products.get(skuId).getProductGroupList(), productDto);
             } else {
-                productDto.setCustomerCode("");
-                productDto.setProductCode("");
                 LogUtil.error("getProducts_exception", JSONObject.toJSONString(skuId), JSONObject.toJSONString(products), null);
             }
             //套餐子商品
@@ -423,16 +419,12 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                     String comboSkuId = comboProduct.getSpecification();
                     System.out.println(comboSkuId);
                     if (products.get(comboSkuId) != null) {
-                        comboProduct.setCustomerCode(products.get(comboSkuId).getCustomerCode());
-                        comboProduct.setProductCode(products.get(comboSkuId).getProductCode());
                         comboProduct.setThirdProductSpecId(products.get(comboSkuId).getThirdProductSpecId());
                         comboProduct.setThirdProductPropertyId(getThirdPropertyId(products.get(comboSkuId).getProductAttributeGroupList(),comboProduct.getAddInfo()));
                         comboProduct.setStapleFood(products.get(comboSkuId).getStapleFood());
                         // todo 套餐商品的商品组信息
                         setProductGroupInfo(products.get(comboSkuId).getProductGroupList(), comboProduct);
                     } else {
-                        comboProduct.setCustomerCode("");
-                        comboProduct.setProductCode("");
                         LogUtil.error("getProducts_exception", JSONObject.toJSONString(skuId), JSONObject.toJSONString(products), null);
                     }
                 }
@@ -849,8 +841,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         }
 
         //若该订单使用了优惠券，则移除卡包,移除失败也不退款
-//        couponActivityService.callbackNotify(orderBean);
-        BaseResponse couponBaseResponse = couponClientService.callbackNotify(orderBean);
+//        BaseResponse couponBaseResponse = couponClientService.callbackNotify(orderBean);
         // 订单失败后 发消息重试 待实现
         String takeCode;
         String daySeq;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

 package com.freemud.application.sdk.api.ordercenter.service;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.freemud.application.sdk.api.base.BaseRequest;
 import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties;
 import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant;
@@ -29,9 +30,10 @@ import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 import static com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant.*;
 
@@ -618,8 +620,8 @@ public class OrderSdkService {
             resp = null;
         } else {
             List<OrderInfoReqs> result;
-            if (Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, responseDTO.getCode())) {
-                result = JSON.parseArray(Objects.toString(responseDTO.getResult(), "[]"), OrderInfoReqs.class);
+            if (Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, responseDTO.getCode()) && responseDTO.getResult() instanceof List) {
+                result = JSONArray.parseArray(JSON.toJSONString(responseDTO.getResult()), OrderInfoReqs.class);
             } else {
                 result = Collections.emptyList();
             }