Merge branch 'master' into master-spock

order-application-service/src/main/java/cn/freemud/controller/ExposureOrderController.java

@@ -3,14 +3,17 @@ package cn.freemud.controller;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.OrderTackCodeFactory;
+import cn.freemud.enums.TakeCodeOrderType;
 import cn.freemud.manager.OrderTackCodeManager;
 import cn.freemud.service.business.OrderBusinessService;
 import cn.freemud.service.business.impl.OrderBusinessServiceImpl;
+import cn.freemud.service.impl.OrderQueueService;
 import cn.freemud.service.impl.OrderServiceImpl;
 import cn.freemud.service.impl.PayServiceImpl;
 import cn.freemud.utils.ResponseUtil;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
+import com.freemud.sdk.api.assortment.message.enums.OrderType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -33,6 +36,9 @@ public class ExposureOrderController {
     @Autowired
     private OrderServiceImpl orderService;
 
+    @Autowired
+    private OrderQueueService orderQueueService;
+
     /**
      * 创建支付单,查询支付配置
      */
@@ -80,7 +86,8 @@ public class ExposureOrderController {
     @ApiAnnotation(logMessage = "生成取餐码")
     @PostMapping("/generateTackCode")
     public BaseResponse<String> generateTackCode(@Validated @LogParams @RequestBody GenerateTackCodeVo generateTackCodeVo) {
-        String tackCode = orderTackCodeManager.generateTackCode(generateTackCodeVo.getOrderType(),
+        Integer orderTye = TakeCodeOrderType.getTakeCodeOrderType(generateTackCodeVo.getOrderType());
+        String tackCode = orderTackCodeManager.generateTackCode(orderTye,
                 generateTackCodeVo.getPartnerId(),
                 generateTackCodeVo.getStoreId(),
                 null,
@@ -130,4 +137,14 @@ public class ExposureOrderController {
         return ResponseUtil.success();
     }
 
+    /**
+     * 回滚订单状态改动
+     */
+    @ApiAnnotation(logMessage = "回滚订单状态改动")
+    @PostMapping("/backOrdersStatusChange")
+    public BaseResponse backOrdersStatusChange(@Validated @LogParams @RequestBody BackOrdersStatusChangeVo backOrdersStatusChangeVo) {
+        orderQueueService.backOrdersStatusChange(backOrdersStatusChangeVo.getOrderCode(), backOrdersStatusChangeVo.getOrderState());
+        return ResponseUtil.success();
+    }
+
 }

order-application-service/src/main/java/cn/freemud/entities/vo/BackOrdersStatusChangeVo.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+@Data
+public class BackOrdersStatusChangeVo {
+
+    private String orderCode;
+
+    private Integer orderState;
+
+
+}

order-application-service/src/main/java/cn/freemud/enums/TakeCodeOrderType.java

+package cn.freemud.enums;
+
+import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
+
+public enum TakeCodeOrderType {
+
+    TAKE_OUT(1, "外卖"),
+
+    PRE_ORDER(2, "预订单"),
+
+    MALL(3, "商城"),
+
+    COLLECT_GOODS(4, "打包带走"),
+
+    EAT_IN(5, "店内就餐");
+
+    private Integer code;
+    private String desc;
+
+    TakeCodeOrderType(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public static Integer getTakeCodeOrderType(Integer orderType) {
+        if (orderType == null) {
+            return null;
+        }
+        boolean delivery = orderType.equals(OrderType.GENERAL_EXPRESS.getIndex()) || orderType.equals(OrderType.RESERVED_EXPRESS.getIndex());
+        if (delivery) {
+            return TakeCodeOrderType.TAKE_OUT.getCode();
+        }
+
+        boolean pickUp = orderType.equals(OrderType.GENERAL_SELF_PICKUP.getIndex()) || orderType.equals(OrderType.RESERVED_SELF_PICKUP.getIndex());
+        if (pickUp) {
+            return TakeCodeOrderType.COLLECT_GOODS.getCode();
+        }
+
+        boolean eatIn = orderType.equals(OrderType.GENERAL_DINE_IN.getIndex()) || orderType.equals(OrderType.RESERVED_DINE_IN.getIndex());
+        if (eatIn) {
+            return TakeCodeOrderType.EAT_IN.getCode();
+        }
+        return null;
+    }
+}