Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into qa

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -134,10 +134,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             return getCreateOrderResponse(createOrderResponse.getErrcode().toString(), createOrderResponse.getErrmsg(), null);
         }
         BaseOrderResponse baseOrderResponse = updateStockAndScore(createOrderResponse.getData(), config.getBaseCreateOrderRequest().getProducts(), config.getBaseCreateOrderRequest().getActivityUpdateStockRequest(),
-                config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest());
-        if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
-            return getCreateOrderResponse(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
-        }
+                config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest(),config.getBaseCreateOrderRequest().getMenuType());
+//        if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
+//            return getCreateOrderResponse(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
+//        }
         return createOrderResponse;
     }
 
@@ -154,11 +154,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             return CreateFatherSonOrderResponse.error("500", "");
         }
         CreateFatherSonOrderRequest.OrderInfo productOrderRequest = createFatherSonOrderRequest.getOrderInfoList().stream().filter(orderBeanTemp -> 1 == orderBeanTemp.getBizType()).collect(Collectors.toList()).get(0);
-        BaseOrderResponse baseOrderResponse = updateStockAndScore(productOrderInfo.get(0), productOrderRequest.getProducts(), productOrderRequest.getActivityUpdateStockRequest(), productOrderRequest.getAccounts(),
-                createFatherSonOrderRequest.getMqMessageRequest());
-        if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
-            return CreateFatherSonOrderResponse.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg());
-        }
+        updateStockAndScore(productOrderInfo.get(0), productOrderRequest.getProducts(), productOrderRequest.getActivityUpdateStockRequest(), productOrderRequest.getAccounts(),
+                createFatherSonOrderRequest.getMqMessageRequest(),createFatherSonOrderRequest.getMenuType());
         return createFatherSonOrderResponse;
     }
 
@@ -217,24 +214,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
+                userScoreRequest = orderSdkAdapter.convent2UserScoreRequest(orderBean, accounts, false);
+                memberScoreService.useScore(userScoreRequest, "");
                 return BaseOrderResponse.getErrorBaseOrderResponse(userScoreResponse.getCode(), "积分不足");
             }
         }
-        // 核销优惠券，核销失败提示下单失败并冲正库存积分等
-        CouponRequest couponVerificationRequest = orderSdkAdapter.convert2CouponVerificationRequest(orderBean, accounts);
-        if (couponVerificationRequest!=null){
-            BaseResponse<CouponRedeemResponse> couponRedeemResponseBaseResponse = offlineCouponSdkService.couponRedeem(couponVerificationRequest, "");
-            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponRedeemResponseBaseResponse.getCode())) {
-                //TODO 失败取消订单,异步冲正库存
-                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
-                        AfterSalesType.SYSTEM_CANCEL, "异常订单取消", "", null);
-                orderCancel(cancelOrderRequest);
-                //失败异步冲正库存，取消订单
-                backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
-                return BaseOrderResponse.getErrorBaseOrderResponse(couponRedeemResponseBaseResponse.getCode(), "核销券码失败");
-            }
-        }
-
         return BaseOrderResponse.getErrorBaseOrderResponse(RESPONSE_SUCCESS_STR, "");
     }