Merge remote-tracking branch 'origin/qa' into qa

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java

@@ -34,6 +34,8 @@ public enum OrderSourceType {
 
     MEAL("meal", "i围餐"),
 
+    ALIPAY("alipay", "支付宝"),
+
     SAASMALL("saasmall", "微商城"),
 
     APP("app", "APP"),

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
+            <version>1.5.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1315,7 +1315,7 @@ public class OrderAdapter {
                     orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
                 }
                 if (refundBean == null || RefundStatus.REFUSE_REFUND.getCode().equals(refundBean.getStatus())) {
-                    orderViewStatusDto.setOrderStatus(OrderStatus.TAKE_ORDER.getCode());
+                    orderViewStatusDto.setOrderStatus(OrderStatus.COMPLETE_MAKE.getCode());
                     orderViewStatusDto.setOrderStatusDesc("待取餐");
                     orderViewStatusDto.setOrderStatusDescText("目前有" + orderBean.getQueueIndex() + "人在排队，凭此页到店领取哦~");
                     if (StringUtils.isBlank(orderBean.getQueueIndex()) || "0".equals(orderBean.getQueueIndex())) {

order-management/pom.xml

@@ -46,7 +46,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.5.1-SNAPSHOT</version>
+            <version>1.5.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -49,6 +49,7 @@ public class OrderManagerAdapter {
 
     /**
      * 制作完成
+     *
      * @param request
      * @return
      */
@@ -58,14 +59,15 @@ public class OrderManagerAdapter {
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyService.orderDoneVerify(orderBean, request);
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return handleResponse(request,orderBean,verifyResponse);
+            return handleResponse(request, orderBean, verifyResponse);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderDone(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
      * 送出
+     *
      * @param request
      * @return
      */
@@ -73,64 +75,65 @@ public class OrderManagerAdapter {
         //查询订单
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         /*****兼容爱马哥，送出即完成start******/
-        if (orderBean.getType().equals(OldOrderType.TAKE_OUT.getCode())){
-            orderAffirm(request,orderBean);
+        if (!OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
+            return orderAffirm(request, orderBean);
         }
         /*****容爱马哥，送出即完成end******/
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyService.orderDeliveryVerify(orderBean, request);
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return StringUtils.equals(verifyResponse.getCode(), ResponseResult.ORDER_IS_COMPLETE_CAN_NOT_DELIVERY.getCode()) ? handleResponse(request,orderBean,ResponseUtil.success()) : handleResponse(request,orderBean,verifyResponse);
+            return StringUtils.equals(verifyResponse.getCode(), ResponseResult.ORDER_IS_COMPLETE_CAN_NOT_DELIVERY.getCode()) ? handleResponse(request, orderBean, ResponseUtil.success()) : handleResponse(request, orderBean, verifyResponse);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderDelivery(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
      * 完成
+     *
      * @param request
      * @return
      */
-    public BaseResponse<OrderManagerResponse> orderAffirm(OrderManagerRequest request,QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        if (orderBean==null){
+    public BaseResponse<OrderManagerResponse> orderAffirm(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        if (orderBean == null) {
             //查询订单
             orderBean = orderBaseService.getByOrderCode(request.getOrderId());
         }
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyService.orderAffirmVerify(orderBean, request);
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return handleResponse(request,orderBean,verifyResponse);
+            return handleResponse(request, orderBean, verifyResponse);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderAffirm(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
-    private BaseResponse<OrderManagerResponse> handleResponse(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean,BaseResponse result) {
-        if (orderBean==null){
+    private BaseResponse<OrderManagerResponse> handleResponse(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean, BaseResponse result) {
+        if (orderBean == null) {
             return result;
         }
         RefundStatus refundStatus = CollectionUtils.isNotEmpty(orderBean.getRefundList()) ? RefundStatus.getByCode(orderBean.getRefundList().get(0).getStatus()) : null;
         OrderStatus orderStatus = OrderStatus.getByCode(orderBean.getStatus());
-        if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(),result.getCode())){
+        if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(), result.getCode())) {
             OperateType byOpType = OperateType.getByOpType(request.getOperateType());
             switch (byOpType) {
                 case ORDER_CONFIRM:
-                    orderStatus=OrderStatus.RECEIPT;
+                    orderStatus = OrderStatus.RECEIPT;
                     break;
                 case ORDER_DONE:
-                    orderStatus=OrderStatus.COMPLETE_MAKE;
+                    orderStatus = OrderStatus.COMPLETE_MAKE;
                     break;
                 case ORDER_SEND:
-                    orderStatus=OrderStatus.DISTRIBUTION;
+                    orderStatus = OrderStatus.DISTRIBUTION;
                     break;
                 case ORDER_AFFIRM:
-                    orderStatus=OrderStatus.COMPLETE;
+                    orderStatus = OrderStatus.COMPLETE;
                     break;
                 default:
             }
-            return ResponseUtil.success(new OrderManagerResponse(orderStatus,refundStatus));
+            return ResponseUtil.success(new OrderManagerResponse(orderStatus, refundStatus));
         }
-        result.setResult(new OrderManagerResponse(orderStatus,refundStatus));
+        result.setResult(new OrderManagerResponse(orderStatus, refundStatus));
         return result;
     }
 

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

@@ -108,7 +108,8 @@ public class OrderDeliveryService {
         if (1 != orderBean.getType()) {
             return new Pair<>(false, "该订单不是外卖类型订单");
         }
-        if (!orderBean.getSource().equalsIgnoreCase(OrderSourceType.SAAS.getCode())) {
+        //非支付宝、微信渠道不创建配送单
+        if (!(orderBean.getSource().equalsIgnoreCase(OrderSourceType.SAAS.getCode()) || orderBean.getSource().equalsIgnoreCase(OrderSourceType.ALIPAY.getCode()))) {
             return new Pair<>(false, "订单来源异常");
         }
         //配送信息为空，则不创建配送单