Merge branch 'ka-购物车加车数量限制' into qa

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

@@ -923,6 +923,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setOperator(baseQueryOrderRequest.getOperator());
         request.setDispatchType(baseQueryOrderRequest.getDispatchType());
         request.setDispatchTimeout(baseQueryOrderRequest.getDispatchTimeout());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         // 引入门店基础服务 查询自动制作完成配置时间
         setTimeout(baseQueryOrderRequest,request);
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.acceptOrder(request, baseQueryOrderRequest.getTrackingNo());
@@ -934,6 +935,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         // 引入门店基础服务 查询自动制作完成配置时间
         setTimeout(baseQueryOrderRequest,request);
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.acceptOrderMCCafe(request, baseQueryOrderRequest.getTrackingNo());
@@ -1025,6 +1027,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         Boolean isTakeOut = false;
         Integer timeOut   = 0;
         Integer takeOutTimeOut = (null==baseQueryOrderRequest.getTimeout() || baseQueryOrderRequest.getTimeout()==0) ? 180 : baseQueryOrderRequest.getTimeout();
@@ -1069,6 +1072,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         request.setRemark("已完成");
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.updateOrderState(request, baseQueryOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
@@ -1146,6 +1150,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
         request.setOrderCode(baseQueryOrderRequest.getOrderId());
         request.setOperator(baseQueryOrderRequest.getOperator());
+        request.setPartnerId(baseQueryOrderRequest.getPartnerId());
         // 调用门店服务查询自动完成配置信息
         StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
         if (configuration != null) {

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

@@ -62,12 +62,10 @@ import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressR
 import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
 import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
 import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
-import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
+import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
-import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
-import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
@@ -594,6 +592,9 @@ public class CheckOrder {
      * @param expectTimeInTodayBusinessTime 是否在当日营业时间内
      */
     private void checkTakeOutTime(StoreResponseDto storeResponseDto, Date now, Date takeMealDateTime, boolean expectTimeInTodayBusinessTime) {
+        //todo 这里紧急先处理太古坊宴会甜品定制2807商户无法下隔日预约单问题，先不校验能下单，后续修复后再去除
+        if ("2807".equals(storeResponseDto.getPartnerId())) return;
+
         String deliveryStr = storeResponseDto.getDeliveryHoursDay().replace("-", ",")
                 .replace("_", ",");
         String[] deliverys = deliveryStr.split(",");

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderChangeStateReq.java

@@ -19,6 +19,8 @@ import java.util.List;
  */
 @Data
 public class OrderChangeStateReq {
+
+    private  String partnerId;
     private String orderCode;
     private Integer orderState;
     private String remark;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/POSOrderOperationBaseReq.java

@@ -19,6 +19,8 @@ public class POSOrderOperationBaseReq {
 
     private  String orderCode;
 
+    private  String partnerId;
+
     private String operator;
 
     //从接单、制作完成、送出开始计时，超时的时间（单位：分钟）

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

@@ -452,6 +452,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (StringUtils.isEmpty(updateShoppingCartGoodsQtyRequestVo.getShopId())) {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_SHOP_ID_NOT_EMPTY);
         }
+        // fisherman 购物车加车数量限制
+        if (updateShoppingCartGoodsQtyRequestVo.getQty().compareTo(500) > 0 || updateShoppingCartGoodsQtyRequestVo.getQty().compareTo(0) <= 0 ) {
+            return ResponseUtil.error(ResponseResult.SHOPPING_CART_LIMIT_ADD);
+        }
         ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
         CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(updateShoppingCartGoodsQtyRequestVo.getSessionId());
         UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(assortmentCustomerInfoVo);

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

@@ -21,7 +21,6 @@ import cn.freemud.service.active.ActiveService;
 import cn.freemud.service.impl.AssortmentSdkService;
 import cn.freemud.service.thirdparty.ActivityClient;
 import cn.freemud.utils.PropertyConvertUtil;
-import cn.freemud.entities.dto.activity.DiscountSharingDto;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
@@ -267,8 +266,8 @@ public class CalculationSharingDiscountService {
             throw new BizServiceException(ResponseResult.COCO_COUPON_VALIDATOR_FAIL, sharingDiscountResponseDto.getMsg());
         }
         // 80000 促销校验业务错误,直接抛给前端
-        if (sharingDiscountResponseDto != null && StringUtils.equals(sharingDiscountResponseDto.getStatusCode(), "80000")) {
-            throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR,sharingDiscountResponseDto.getMsg());
+        if (StringUtils.equals(sharingDiscountResponseDto.getStatusCode(), "80000")) {
+            throw new ServiceException(ResponseResult.SYSTEM_BUSINESS_ERROR, sharingDiscountResponseDto.getMsg());
         }
 
         // 支付宝华莱士紧急修改代码，当促销返回103错误码时，需要报券不适用于该门店，且清空购物车