错误提示信息优化

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

@@ -89,7 +89,11 @@ public class AppOrderServiceImpl implements AppOrderService {
         //List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
         OrderExtInfoDTO extInfo = orderservice.getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
         //创建订单
-        CreateOrderOperateDto createOrderOperateDto = orderservice.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
+        BaseResponse createOrderOperateDtoResponse = orderservice.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
+        if(createOrderOperateDtoResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderOperateDtoResponse.getCode()) || createOrderOperateDtoResponse.getResult() == null ) {
+            return createOrderOperateDtoResponse;
+        }
+        CreateOrderOperateDto createOrderOperateDto = (CreateOrderOperateDto)createOrderOperateDtoResponse.getResult();
         BaseResponse baseResponse = this.updateOrderExtInfo(createOrderOperateDto.getProductOrderBean(), extInfo, trackingNo);
         if(baseResponse != null) {
             return baseResponse;
@@ -145,7 +149,11 @@ public class AppOrderServiceImpl implements AppOrderService {
         //List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
         OrderExtInfoDTO extInfo = orderservice.getExtInfo(customerInfo, storeResponse.getBizVO(), pushOrderTime, createOrderVo);
         //创建订单
-        CreateOrderOperateDto createOrderOperateDto = orderservice.sdkCreateOrder(createOrderVo, storeResponse.getBizVO(), shoppingCartGoodsDto, customerInfo);
+        BaseResponse createOrderOperateDtoResponse = orderservice.sdkCreateOrder(createOrderVo, storeResponse.getBizVO(), shoppingCartGoodsDto, customerInfo);
+        if(createOrderOperateDtoResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderOperateDtoResponse.getCode()) || createOrderOperateDtoResponse.getResult() == null ) {
+            return createOrderOperateDtoResponse;
+        }
+        CreateOrderOperateDto createOrderOperateDto = (CreateOrderOperateDto)createOrderOperateDtoResponse.getResult();
         BaseResponse baseResponse = this.updateOrderExtInfo(createOrderOperateDto.getProductOrderBean(), extInfo, trackingNo);
         if(baseResponse != null) {
             return baseResponse;

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

@@ -117,6 +117,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.coyote.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -281,7 +282,11 @@ public class OrderServiceImpl implements Orderservice {
         OrderExtInfoDTO extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
 
         //1.9.2套餐需求同步优化创建订单代码
-        CreateOrderOperateDto createOrderOperateDto = this.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
+        BaseResponse createOrderOperateDtoResponse = this.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
+        if(createOrderOperateDtoResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderOperateDtoResponse.getCode()) || createOrderOperateDtoResponse.getResult() == null ) {
+            return createOrderOperateDtoResponse;
+        }
+        CreateOrderOperateDto createOrderOperateDto = (CreateOrderOperateDto)createOrderOperateDtoResponse.getResult();
         //创建支付
         CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(userLoginInfoDto, createOrderVo, createOrderOperateDto, extInfo);
         return this.createPrepayOrder(createPrepayRequestDto);
@@ -1753,7 +1758,7 @@ public class OrderServiceImpl implements Orderservice {
      *
      * @return
      */
-    public CreateOrderOperateDto sdkCreateOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto,
+    public BaseResponse sdkCreateOrder(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, ShoppingCartGoodsDto shoppingCartGoodsDto,
                                                               AssortmentCustomerInfoVo userLoginInfoDto) {
         CreateOrderOperateDto response = new CreateOrderOperateDto();
         OrderExtendedReq orderExtendedReq = orderAdapter.saveStoreInfo(storeResponseDto);
@@ -1776,7 +1781,7 @@ public class OrderServiceImpl implements Orderservice {
             cardAmount = cardOriginalAmount - cardDiscountAmount;
             CreateFatherSonOrderResponse createFatherSonOrderResponse = createFatherSonOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, orderExtendedReq);
             if (ObjectUtils.notEqual(Integer.valueOf(ResponseResult.SUCCESS.getCode()), createFatherSonOrderResponse.getErrcode())) {
-                throw new ServiceException(ResponseResult.ORDER_CREATE_ERROR);
+                return ResponseUtil.error(createFatherSonOrderResponse.getErrcode().toString(), createFatherSonOrderResponse.getErrmsg());
             }
             List<QueryOrdersResponse.DataBean.OrderBean> orderBeanList = createFatherSonOrderResponse.getOrderBeanList();
             List<QueryOrdersResponse.DataBean.OrderBean> fatherBeanList = orderBeanList.stream().filter(orderBeanTemp -> orderBeanTemp.getIsParent()).collect(Collectors.toList());
@@ -1791,7 +1796,7 @@ public class OrderServiceImpl implements Orderservice {
             //普通订单
             CreateOrderResponse createOrderFlowResponse = createOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, orderExtendedReq, orderClient);
             if (ObjectUtils.notEqual(Integer.valueOf(ResponseResult.SUCCESS.getCode()), createOrderFlowResponse.getErrcode())) {
-                throw new ServiceException(ResponseResult.ORDER_CREATE_ERROR);
+                return ResponseUtil.error(createOrderFlowResponse.getErrcode().toString(), createOrderFlowResponse.getErrmsg());
             }
             fatherBeanListOne = createOrderFlowResponse.getData();
             productBeanListOne = createOrderFlowResponse.getData();
@@ -1801,7 +1806,7 @@ public class OrderServiceImpl implements Orderservice {
         response.setCardAmount(cardAmount);
         response.setFatherOrderBean(fatherBeanListOne);
         response.setProductOrderBean(productBeanListOne);
-        return response;
+        return ResponseUtil.success(response);
     }
 
     /**