Merge branch 'feature/20201223_posConfirmTakeKoubeiwaimai_miaohui' into develop

# Conflicts:
#	order-management/src/main/java/cn/freemud/management/enums/OrderSource.java
#	order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java

order-application-service/pom.xml

@@ -82,7 +82,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>takeawaycenter-sdk</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.3.2.RELEASE</version>
         </dependency>
         <!--  商户门店sdk  -->
         <dependency>

order-management/pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>takeawaycenter-sdk</artifactId>
-            <version>1.2.3-SNAPSHOT</version>
+            <version>1.3.2.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/adapter/WaimaiSdkAdapter.java

@@ -110,5 +110,20 @@ public class WaimaiSdkAdapter {
         return agreeOrderRequest;
     }
 
-
+    /**
+     * 备餐完成request
+     * @param request
+     * @param orderBean
+     * @return
+     */
+    public PartnerPrepareRequest getPartnerPrepareRequest (OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean){
+        PartnerPrepareRequest partnerPrepareRequest = new PartnerPrepareRequest();
+        partnerPrepareRequest.setPlatformOrderId(orderBean.getCustomerOrder());
+        partnerPrepareRequest.setChannel(orderBean.getSource());
+        partnerPrepareRequest.setCompanyId(orderBean.getCompanyId());
+        partnerPrepareRequest.setOrderId(orderBean.getOid());
+        partnerPrepareRequest.setShopId(orderBean.getShopId());
+        partnerPrepareRequest.setOperator(request.getOperator());
+        return partnerPrepareRequest;
+    }
 }

order-management/src/main/java/cn/freemud/management/enums/OrderSource.java

@@ -11,8 +11,8 @@ public enum OrderSource {
     SAAS("saas", "saas点餐"),
     ALIPAY("alipay", "支付宝"),
     EBAI("ebwm", "饿百外卖"),
-    DPZHCT("dpzhct", "美团点评智慧餐厅"),
-    KOUBEI("koubeiwaimai", "口碑外卖");
+    KOUBEI("koubeiwaimai", "口碑外卖"),
+    DPZHCT("dpzhct", "美团点评智慧餐厅");
     private String source;
     private String sourceName;
 

order-management/src/main/java/cn/freemud/management/enums/ResponseResult.java

@@ -152,7 +152,7 @@ public enum ResponseResult {
     AFFIRM_FAIL_APPLY_REFUND("45068","订单已经申请退款，不能完成"),
     DONE_FAIL_NOT_ACCEPT("45069","订单不是接单状态，不能制作"),
     DONE_FAIL_REPETITION("45070","重复操作，订单已送出"),
-    DONE_ORDER_FAIL("45071", "制作完成更改作态失败"),
+    DONE_ORDER_FAIL("45071", "制作完成更改状态失败"),
     REJECT_FAIL_REPETITION("45072", "重复操作，订单已拒单"),
     REJECT_FAIL_ORDER_IS_DELIVERY("45072", "配送中，不能拒单"),
     REJECT_FAIL_ORDER_IS_COMPLETE("45073", "订单已完成，不能拒单"),

order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java

@@ -30,8 +30,9 @@ public class OrderBeanFactory {
             return  applicationContext.getBean(McCafeMangerServiceImpl.class);
         }
         if (OrderSource.BDWM.getSource().equals(source) || OrderSource.JDWM.getSource().equals(source)
-                || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source) || OrderSource.FMWD.getSource().equals(source) || OrderSource.EBAI.getSource().equals(source)
-                || OrderSource.DPZHCT.getSource().equals(source) || OrderSource.KOUBEI.getSource().equals(source)){
+                || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source)
+                || OrderSource.FMWD.getSource().equals(source) || OrderSource.EBAI.getSource().equals(source)
+                || OrderSource.KOUBEI.getSource().equals(source) || OrderSource.DPZHCT.getSource().equals(source)){
             return applicationContext.getBean(WaimaiOrderMangerServiceImpl.class);
         }
         return applicationContext.getBean(SaasOrderMangerServiceImpl.class);

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

@@ -9,10 +9,7 @@ import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.util.ResponseUtil;
-import com.freemud.application.sdk.api.takeaway.request.order.AgreeOrderRequest;
-import com.freemud.application.sdk.api.takeaway.request.order.OrderSendOutRequest;
-import com.freemud.application.sdk.api.takeaway.request.order.PartnerCancelRequest;
-import com.freemud.application.sdk.api.takeaway.request.order.PlatformOrderRequest;
+import com.freemud.application.sdk.api.takeaway.request.order.*;
 import com.freemud.application.sdk.api.takeaway.service.WaimaiOrderService;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.lang.ObjectUtils;
@@ -56,6 +53,22 @@ public class WaimaiOrderMangerServiceImpl implements OrderManagerService {
     }
 
     /**
+     * 制作完成
+     * @param request
+     * @param orderBean
+     * @return
+     */
+    @Override
+    public BaseResponse<OrderManagerResponse> orderDone(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean){
+        PartnerPrepareRequest partnerPrepareRequest = waimaiSdkAdapter.getPartnerPrepareRequest(request, orderBean);
+        com.freemud.application.sdk.api.base.BaseResponse waimaiBaseResponse = waimaiOrderService.prepare(partnerPrepareRequest, LogTreadLocal.getTrackingNo());
+        if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), waimaiBaseResponse.getCode())) {
+            throw new OrderServiceException(ResponseResult.DONE_ORDER_FAIL);
+        }
+        return ResponseUtil.success();
+    }
+
+    /**
      * 订单配送
      *
      * @param request