Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of…

Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java

@@ -81,6 +81,8 @@ public class ConfirmOrderRequest extends BaseConfig {
 
     private Integer notAutomaticTwistTime;
 
+    private String userId;
+
     @Data
     public static class OrderSettlement{
         /**

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

 package com.freemud.sdk.api.assortment.shoppingcart.adapter;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ProductAttributeValueType;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductRequest;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateSkuProductType;
-import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
-import com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum;
-import com.freemud.sdk.api.assortment.shoppingcart.constant.ProductStatus;
-import com.freemud.sdk.api.assortment.shoppingcart.constant.ProductType;
+import com.freemud.sdk.api.assortment.shoppingcart.constant.*;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoodsStates;
+import com.freemud.sdk.api.assortment.shoppingcart.exception.ServiceException;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
@@ -275,8 +274,10 @@ public class ShoppingCartAdapter {
             boolean isSkuProduct = ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType());
             // 如果是套餐商品，更新套餐内固定商品&可选商品的详细信息
             boolean isSetMealProduct = ObjectUtils.equals(ProductType.SetMeal.getCode(), spuProduct.getType()) || ObjectUtils.equals(ProductType.IncreasedPackage.getCode(), spuProduct.getType());
-            ProductBeanDTO.SkuProductBean skuProduct = isSkuProduct ? spuProduct.getSkuList().stream().filter(p -> ObjectUtils.equals(cartGoods.getSkuId(), p.getSkuId())).findFirst().get() : null;
-
+            ProductBeanDTO.SkuProductBean skuProduct = isSkuProduct ? spuProduct.getSkuList().stream().filter(p -> ObjectUtils.equals(cartGoods.getSkuId(), p.getSkuId())).findFirst().orElse(null): null;
+            if(isSkuProduct && skuProduct == null){//特殊场景前端传一个skuid非spuid下多规格商品
+                throw new ServiceException(CartResponseConstant.FAIL);
+            }
             Map<String, String> attributes = getAttributesNew(cartGoods.getExtra());
             if(!"早餐啡常搭".equals(cartGoods.getName()) && !"早餐啡常搭".equals(cartGoods.getSkuName()) && !"早餐啡常搭".equals(cartGoods.getSpuName())
                 && !"啡常搭".equals(cartGoods.getName()) && !"啡常搭".equals(cartGoods.getSkuName()) && !"啡常搭".equals(cartGoods.getSpuName())) {
@@ -356,7 +357,7 @@ public class ShoppingCartAdapter {
             this.checkMaterialProduct(cartGoods, spuProduct);
 
         } catch (Exception ex) {
-            ShoppingSdkLogUtil.errorLog( "updateCartGoodsInfoNew_Error cartGoods:{}", ex,cartGoods);
+            ShoppingSdkLogUtil.errorLog( "updateCartGoodsInfoNew_Error cartGoods:{},productBeans:{}", ex, JSONObject.toJSONString(cartGoods),JSONObject.toJSONString(productBeans));
             cartGoods.setCartGoodsUid(null);
         }
     }

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

@@ -89,31 +89,28 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
             request.setPayChannel(confirmOrderRequest.getPayChannel());
             request.setPayChannelName(confirmOrderRequest.getPayChannelName());
         }
-        QueryOrderByIdResponse orderByIdResponse = new QueryOrderByIdResponse();
-        BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = new BaseResponse();
+//        QueryOrderByIdResponse orderByIdResponse = new QueryOrderByIdResponse();
+//        BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = new BaseResponse();
         try {
-            QueryByCodeResponse codeResponse = orderSdkService.getOrderInfo(confirmOrderRequest.getProductOrderCode(),
-                    0, confirmOrderRequest.getTrackingNo());
-            orderByIdResponse = orderSdkAdapter.convent2QueryOrderByIdResponse(codeResponse);
+//            QueryByCodeResponse codeResponse = orderSdkService.getOrderInfo(confirmOrderRequest.getProductOrderCode(),
+//                    0, confirmOrderRequest.getTrackingNo());
+//            orderByIdResponse = orderSdkAdapter.convent2QueryOrderByIdResponse(codeResponse);
 
             GetMemberExtendInfoRequestDto extendInfoRequest = new GetMemberExtendInfoRequestDto();
-            extendInfoRequest.setMemberId(orderByIdResponse.getData().getUserId());
-            extendInfoRequest.setPartnerId(orderByIdResponse.getData().getCompanyId());
+            extendInfoRequest.setMemberId(confirmOrderRequest.getUserId());
+            extendInfoRequest.setPartnerId(confirmOrderRequest.getPartnerId());
             extendInfoRequest.setIsQueryGrade(1);
             extendInfoRequest.setIsQueryLabel(0);
             extendInfoRequest.setIsQueryPaid(1);
-            extendInfo = customerClient.getMemberExtendInfo(extendInfoRequest);
-            OrderExtInfoDto extInfoDTO = JSONObject.parseObject(orderByIdResponse.getData().getExtInfo(),
-                    OrderExtInfoDto.class);
-            extInfoDTO.setMemberLevel(
-                    extendInfo.getData().getMemberGrade() != null ? extendInfo.getData().getMemberGrade().getRuleName()
-                            : "");
+            BaseResponse<GetMemberExtendInfoResponseDto> extendInfo = customerClient.getMemberExtendInfo(extendInfoRequest);
+            OrderExtInfoDto extInfoDTO = JSONObject.parseObject(confirmOrderRequest.getExtInfo(),OrderExtInfoDto.class);
+            extInfoDTO.setMemberLevel(extendInfo.getData().getMemberGrade() != null ? extendInfo.getData().getMemberGrade().getRuleName(): "");
             extInfoDTO.setPaidMember(CollectionUtils.isNotEmpty(extendInfo.getData().getMemberPaids()));
             extInfoDTO.setPayTransId(confirmOrderRequest.getPayTransId());
             extInfoDTO.setPayDate(confirmOrderRequest.getPayDate());
             extInfoDTO.setEndTransId(confirmOrderRequest.getEndTransId());
             request.setExtInfo(JSON.toJSONString(extInfoDTO));
-            if (!StringUtils.isEmpty(confirmOrderRequest.getSpellGroupCode())) {
+            if (StringUtils.isNotEmpty(confirmOrderRequest.getSpellGroupCode())) {
                 request.setSpellGroupCode(confirmOrderRequest.getSpellGroupCode());
             }
         } catch (Exception e) {
@@ -121,10 +118,6 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
         }
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<PaySuccessResp> response = orderSdkService
                 .paySuccess(request, confirmOrderRequest.getTrackingNo());
-        // 获取会员信息直接返回，非空判断
-        if (extendInfo.getData() == null) {
-            return orderSdkAdapter.convent2PayAccessResponse(response);
-        }
         return orderSdkAdapter.convent2PayAccessResponse(response);
     }
 

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

@@ -474,6 +474,7 @@ public class MallOrderServiceImpl implements MallOrderService {
         PayAccessResponse payAccessResponse;
         ConfirmOrderRequest confirmOrderRequest = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, null);
         confirmOrderRequest.setPartnerId(partnerId);
+        confirmOrderRequest.setUserId(userId);
         confirmOrderRequest.setStoreId(storeId);
         confirmOrderRequest.setOrderId(orderBean.getOid());
         confirmOrderRequest.setOrderType(orderBean.getType());

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

@@ -508,6 +508,7 @@ public class OrderServiceImpl implements Orderservice {
         PayAccessResponse payAccessResponse;
         ConfirmOrderRequest var1 = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, orderBeans.get(OrderBeanType.MERMBERORDER.getCode()));
         var1.setPartnerId(partnerId);
+        var1.setUserId(userId);
         var1.setStoreId(storeId);
         var1.setOrderType(orderBean.getType());
         var1.setProductOrderCode(orderBean.getOid());

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

@@ -791,6 +791,7 @@ public class SellCouponOrderServiceImpl {
 
         ConfirmOrderRequest var1 = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, orderBeans.get(OrderBeanType.MERMBERORDER.getCode()));
         var1.setPartnerId(orderBean.getCompanyId());
+        var1.setUserId(orderBean.getUserId());
         var1.setStoreId(orderBean.getShopId());
         var1.setOrderType(orderBean.getType());
         var1.setProductOrderCode(orderBean.getOid());
@@ -805,7 +806,7 @@ public class SellCouponOrderServiceImpl {
             // 订单支付成功
             PayAccessResponse payAccessResponse = orderBusinessService.payAccess(var1);
         }catch (Exception e){
-            AppLogUtil.errorLog("sdkPayAccessError",JSONObject.toJSONString(var1),null,e);
+            AppLogUtil.errorLog("sellCouponPayAccessError",JSONObject.toJSONString(var1),null,e);
         }
         //支付成功直接完成
         OrderChangeStateReq request = new OrderChangeStateReq();