v1.0.14 change

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

@@ -3,20 +3,20 @@ package cn.freemud.controller;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.order.PayConfigVo;
-import cn.freemud.enums.OrderTackCodeFactory;
-import cn.freemud.enums.TakeCodeOrderType;
-import cn.freemud.manager.OrderTackCodeManager;
-import cn.freemud.service.business.impl.OrderBusinessServiceImpl;
+import cn.freemud.entities.vo.order.PaySuccessDataVo;
+import cn.freemud.service.ExposureOrderService;
 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.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 暴露订单相关的业务接口,提供给applet项目
@@ -28,10 +28,7 @@ public class ExposureOrderController {
     @Autowired
     private PayServiceImpl payService;
     @Autowired
-    private OrderTackCodeManager orderTackCodeManager;
-
-    @Autowired
-    private OrderBusinessServiceImpl orderBusinessService;
+    private ExposureOrderService exposureOrderService;
 
     @Autowired
     private OrderServiceImpl orderService;
@@ -39,20 +36,13 @@ public class ExposureOrderController {
     @Autowired
     private OrderQueueService orderQueueService;
 
-    @Autowired
-    private OrderCenterSdkAdapter orderCenterSdkAdapter;
-
     /**
      * 创建支付单,查询支付配置
      */
     @ApiAnnotation(logMessage = "创建支付单,查询支付配置")
     @PostMapping("/getPayConfig")
     public BaseResponse<PayConfigVo> getPayConfig(@Validated @LogParams @RequestBody GetPayConfigVo req) {
-        PayConfigVo vo = new PayConfigVo();
-        vo.setPrincipalName(payService.getPaymentPrincipalName(req.getPartnerId(), req.getAppId()));
-        vo.setPayTimeOut(payService.getPartnerPayOvertime(req.getPartnerId()));
-        vo.setPayCode(payService.getPayCodeByCondition(req.getAppId(), req.getStoreId(), req.getChannel()));
-        return ResponseUtil.success(vo);
+        return ResponseUtil.success(exposureOrderService.getPayConfig(req));
     }
 
     /**
@@ -65,34 +55,14 @@ public class ExposureOrderController {
         return ResponseUtil.success();
     }
 
-    /**
-     * 生成取餐码
-     */
-    @ApiAnnotation(logMessage = "生成取餐码")
-    @PostMapping("/generateTackCode")
-    public BaseResponse<String> generateTackCode(@Validated @LogParams @RequestBody GenerateTackCodeVo generateTackCodeVo) {
-        Integer orderTye = TakeCodeOrderType.getTakeCodeOrderType(generateTackCodeVo.getOrderType());
-        String tackCode = orderTackCodeManager.generateTackCode(orderTye,
-                generateTackCodeVo.getPartnerId(),
-                generateTackCodeVo.getStoreId(),
-                null,
-                OrderTackCodeFactory.getByOrderClient(generateTackCodeVo.getOrderClient()).getGenerateTackCodeFunc());
-        return ResponseUtil.success(tackCode);
-    }
 
-    /**
-     * 从支付成功开始计时，超时未接单的时间（单位：分钟）
-     */
-    @ApiAnnotation(logMessage = "获取超时时间")
-    @PostMapping("/paySuccessTimeout")
-    public BaseResponse<Integer> generateTackCode(@Validated @LogParams @RequestBody GetPaySuccessTimeoutVo getPaySuccessTimeoutVo) {
-        Integer orderTye = orderCenterSdkAdapter.getOldOrderType(getPaySuccessTimeoutVo.getOrderType());
-        Integer tackCode = orderBusinessService.getPaySuccessTimeout(getPaySuccessTimeoutVo.getPartnerId(),
-                getPaySuccessTimeoutVo.getStoreId(),
-                orderTye);
-        return ResponseUtil.success(tackCode);
+    @ApiAnnotation(logMessage = "获取超时时间, 生成取餐码")
+    @PostMapping("/getPaySuccessData")
+    public BaseResponse<PaySuccessDataVo> generateTackCode(@Validated @LogParams @RequestBody GetPaySuccessDataRequest request) {
+        return ResponseUtil.success(exposureOrderService.getPaySuccessData(request));
     }
 
+
     /**
      * 发送支付成功模板消息
      */
@@ -103,15 +73,6 @@ public class ExposureOrderController {
         return ResponseUtil.success();
     }
 
-    /**
-     * 生成0元支付fmId
-     */
-    @ApiAnnotation(logMessage = "生成0元支付fmId")
-    @GetMapping("/generateZeroPayFmId")
-    public BaseResponse generateZeroPayFmId() {
-        String fmId = payService.generateZeroPayFmId();
-        return ResponseUtil.success(fmId);
-    }
 
     /**
      * 现金支付,设置轮循队列

order-application-service/src/main/java/cn/freemud/entities/vo/GenerateTackCodeVo.java → order-application-service/src/main/java/cn/freemud/entities/vo/GetPaySuccessDataRequest.java

@@ -3,7 +3,7 @@ package cn.freemud.entities.vo;
 import lombok.Data;
 
 @Data
-public class GenerateTackCodeVo {
+public class GetPaySuccessDataRequest {
 
     private Integer orderType;
 

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

-package cn.freemud.entities.vo;
-
-import lombok.Data;
-
-@Data
-public class GetPaySuccessTimeoutVo {
-
-    private Integer orderType;
-
-    private String partnerId;
-
-    private String storeId;
-
-}

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

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+/**
+ * @author Clover.z
+ * @version 1.0.0
+ * @since 1.0.0
+ */
+@Data
+public class PaySuccessDataVo {
+
+    /**
+     * 取餐码
+     */
+    private String takeCode;
+
+    /**
+     * 从支付成功开始计时，超时未接单的时间（单位：分钟）
+     */
+    private Integer timeout;
+
+}

order-application-service/src/main/java/cn/freemud/service/ExposureOrderService.java

+package cn.freemud.service;
+
+import cn.freemud.entities.vo.GetPayConfigVo;
+import cn.freemud.entities.vo.GetPaySuccessDataRequest;
+import cn.freemud.entities.vo.order.PayConfigVo;
+import cn.freemud.entities.vo.order.PaySuccessDataVo;
+import cn.freemud.enums.OrderTackCodeFactory;
+import cn.freemud.enums.TakeCodeOrderType;
+import cn.freemud.manager.OrderTackCodeManager;
+import cn.freemud.service.business.impl.OrderBusinessServiceImpl;
+import cn.freemud.service.impl.PayServiceImpl;
+import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Clover.z
+ * @version 1.0.0
+ * @since 1.0.0
+ */
+@Service
+@RequiredArgsConstructor
+public class ExposureOrderService {
+
+    private final PayServiceImpl payService;
+    private final OrderTackCodeManager orderTackCodeManager;
+    private final OrderBusinessServiceImpl orderBusinessService;
+    private final OrderCenterSdkAdapter orderCenterSdkAdapter;
+
+    public PayConfigVo getPayConfig(GetPayConfigVo req) {
+        PayConfigVo vo = new PayConfigVo();
+        vo.setPrincipalName(payService.getPaymentPrincipalName(req.getPartnerId(), req.getAppId()));
+        vo.setPayTimeOut(payService.getPartnerPayOvertime(req.getPartnerId()));
+        vo.setPayCode(payService.getPayCodeByCondition(req.getAppId(), req.getStoreId(), req.getChannel()));
+        return vo;
+    }
+
+    public PaySuccessDataVo getPaySuccessData(GetPaySuccessDataRequest reqVo) {
+        Integer type = TakeCodeOrderType.getTakeCodeOrderType(reqVo.getOrderType());
+        String takeCode = orderTackCodeManager.generateTackCode(type,
+                reqVo.getPartnerId(),
+                reqVo.getStoreId(),
+                null,
+                OrderTackCodeFactory.getByOrderClient(reqVo.getOrderClient()).getGenerateTackCodeFunc());
+
+        Integer v1Type = orderCenterSdkAdapter.getOldOrderType(reqVo.getOrderType());
+        Integer timeout = orderBusinessService.getPaySuccessTimeout(reqVo.getPartnerId(),
+                reqVo.getStoreId(),
+                v1Type);
+        PaySuccessDataVo vo = new PaySuccessDataVo();
+        vo.setTakeCode(takeCode);
+        vo.setTimeout(timeout);
+        return vo;
+    }
+}

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

@@ -97,9 +97,6 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.RefundBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
-import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderSourceV1;
-import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
 import com.freemud.application.sdk.api.ordercenter.request.*;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
@@ -3779,4 +3776,6 @@ public class OrderServiceImpl implements Orderservice {
         this.sendPaySuccessMessage(orderBean);
     }
 
+
+
 }

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

@@ -1502,10 +1502,6 @@ public class PayServiceImpl {
         return checkSvcAmountResponse;
     }
 
-    public String generateZeroPayFmId() {
-        String fmId = "SPAY" + ValidationCode.getRandomUuid();
-        return fmId;
-    }
 
     public void putRoundRobin(PutRoundRobinVo putRoundRobinVo) {
         //加入轮训队列