Merge branch 'feature/20200325_oms接单' into develop

order-management/src/main/java/cn/freemud/management/service/impl/OrderVerifyService.java

@@ -5,6 +5,8 @@ import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.enums.OrderStatus;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.util.ResponseUtil;
+import com.freemud.application.sdk.api.ordercenter.enums.OperateClient;
+import com.freemud.application.sdk.api.ordercenter.enums.OperateType;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
@@ -26,26 +28,28 @@ public class OrderVerifyService {
 
     /**
      * 接单校验
+     *
      * @param orderBean
      * @param request
      * @return
      */
-    public BaseResponse orderConfirmTakeVerify(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request){
-        if (orderBean==null){
+    public BaseResponse orderConfirmTakeVerify(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request) {
+        if (orderBean == null) {
             return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
         }
         if (!OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
             return ResponseUtil.error(ResponseResult.ORDER_CANNOT_CONFIRM);
         }
-        return commonVerify(orderBean,request);
+        return commonVerify(orderBean, request);
     }
 
 
-    private BaseResponse commonVerify(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request){
-        if (ObjectUtils.notEqual(orderBean.getCompanyId(),request.getPartnerId())){
+    private BaseResponse commonVerify(QueryOrdersResponse.DataBean.OrderBean orderBean, OrderManagerRequest request) {
+        if (ObjectUtils.notEqual(orderBean.getCompanyId(), request.getPartnerId())) {
             return ResponseUtil.error(ResponseResult.ORDER_PARTNER_ID_NOT_MATCTH);
         }
-        if (ObjectUtils.notEqual(orderBean.getShopId(),request.getStoreId())){
+        //开放平台不传入门店
+        if (ObjectUtils.notEqual(request.getOperator(), OperateClient.OPEN_PLATFORM.getOpName()) && ObjectUtils.notEqual(orderBean.getShopId(), request.getStoreId())) {
             return ResponseUtil.error(ResponseResult.ORDER_STORE_ID_NOT_MATCTH);
         }
         return ResponseUtil.success();