Merge branch 'ka-商品技术需求购物车不校验商品库存' into develop

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

@@ -199,7 +199,7 @@ public class EvaluationServiceImpl implements EvaluationService {
         getEvaluationsByOrderIdReq.setPartnerId(request.getPartnerId());
         OrderBaseResp<GetEvaluationsByOrderIdResultDto> evaluationsByOrderId = orderSdkService.getEvaluationsByOrderId(getEvaluationsByOrderIdReq, LogThreadLocal.getTrackingNo());
         CheckAndJoinResponse checkAndJoinMsg;
-        if (evaluationsByOrderId != null && evaluationsByOrderId.getResult() != null && evaluationsByOrderId.getResult().getOrderEvaluations().size() > 0) {
+        if (evaluationsByOrderId != null && evaluationsByOrderId.getResult() != null && CollectionUtils.isNotEmpty(evaluationsByOrderId.getResult().getOrderEvaluations())) {
             // 获取 评价有礼活动
             GetOrderEvaluationDto assortmentOrderEvaluation = evaluationsByOrderId.getResult().getOrderEvaluations().get(0);
             checkAndJoinMsg = getCheckAndJoinMsg(orderDetailResponse.getResult(), request.getSessionId(), assortmentOrderEvaluation.getOrderId(), assortmentOrderEvaluation.getActivityId());

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

@@ -1309,8 +1309,8 @@ public class PayServiceImpl {
             return plugInParameter;
         }
 
-        String applyMchid = assortmentOpenPlatformPartnerPaymentAuth.getSp_mchid();
-        String signMchid = openPlatformPartnerPaymentConfigs.get(0).getSubMchid();
+        String applyMchid = openPlatformPartnerPaymentConfigs.get(0).getSubMchid();
+        String signMchid = assortmentOpenPlatformPartnerPaymentAuth.getSp_mchid();
         String thirdStoreId = assortmentOpenPlatformPaymentStore.getThirdStoreId();
         plugInParameter.setApplyMchid(applyMchid);
         plugInParameter.setSignMchid(signMchid);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -2372,11 +2372,14 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         requestDto.setStoreId(addShoppingCartGoodsRequestVo.getShopId());
         requestDto.setProductIds(productIds);
         GetProductStockResponseDto availableStocks = stockClient.getAvailableStocks(requestDto);
-        if (availableStocks == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode())) {
+        // 商品服务  返回null 或者 qty=null 表示不限制库存
+        if (Objects.isNull(availableStocks) || Objects.isNull(availableStocks.getResult().get(0).getQty())) {
+            return;
+        }
+        if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(availableStocks.getCode())) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
         }
-        int stock = CollectionUtils.isEmpty(availableStocks.getResult()) || availableStocks.getResult().get(0).getQty() == null ? 0 :
-                availableStocks.getResult().get(0).getQty();
+        int stock = availableStocks.getResult().get(0).getQty();
         if (stock <= 0) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_STOCK_NOT_HAVE);
         } else if (stock < qty) {