feat(order): 增加支付方式枚举并更新相关逻辑- 在 ClientCustomerOrderService.proto 中添加 OnlinePayEnum 枚举类型

zhuyifan
Commit 3e3c58cde85abdf98330ffae7b89303a42497531 3e3c58cd 1 parent 0afdf477
Showing 4 changed files with 24 additions and 12 deletions
src/main/java/com/infoloop/tianting/model/dto/OrderDbDTO.java
src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
src/main/java/com/infoloop/tianting/service/impl/OrderServiceImpl.java
src/main/proto/ClientCustomerOrderService.proto
--- a/src/main/java/com/infoloop/tianting/model/dto/OrderDbDTO.java
View file @3e3c58c
+++ b/src/main/java/com/infoloop/tianting/model/dto/OrderDbDTO.java
View file @3e3c58c
@@ -2,6 +2,7 @@ package com.infoloop.tianting.model.dto;
 import com.infoloop.tianting.annotation.RequestKeyParam;
 import com.infoloop.tianting.clientcustomerorderservice.CloseTimeType;
+import com.infoloop.tianting.clientcustomerorderservice.OnlinePayEnum;
 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum;
 import com.infoloop.tianting.clientcustomerorderservice.PayStatusEnum;
@@ -222,6 +223,9 @@ public class OrderDbDTO {
     @ApiModelProperty(value = "备注")
     private String remark;
+    @ApiModelProperty(value = "支付方式")
+    private OnlinePayEnum onlinePay;
+
     @ApiModelProperty(value = "订单菜品详情列表")
     private List<OperatorCreateOrderDetailDto> orderDetailDtos;
   }
@@ -260,8 +264,8 @@ public class OrderDbDTO {
     @ApiModelProperty(value = "实际支付金额，单位为分")
     private Integer payPrice;
-    @ApiModelProperty(value = "是否在线付费；0=未付费，1=付费")
+    @ApiModelProperty(value = "支付方式")
-    private Boolean onlinePay;
+    private OnlinePayEnum onlinePay;
     @ApiModelProperty(value = "支付时间")
     private LocalDateTime payTime;
@@ -364,8 +368,8 @@ public class OrderDbDTO {
     @ApiModelProperty(value = "实际支付金额，单位为分")
     private Integer payPrice;
-    @ApiModelProperty(value = "是否在线付费；0=未付费，1=付费")
+    @ApiModelProperty(value = "支付方式")
-    private Boolean onlinePay;
+    private OnlinePayEnum onlinePay;
     @ApiModelProperty(value = "支付时间")
     private String payTime;
--- a/src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
View file @3e3c58c
+++ b/src/main/java/com/infoloop/tianting/service/client/OrderServiceRpcClient.java
View file @3e3c58c
@@ -558,7 +558,7 @@ public class OrderServiceRpcClient {
                 .setTableCode(createOrderDto.getTableCode() == null ? "" : createOrderDto.getTableCode())
                 .setShouldCreateOnlinePay(true)
                 .setOnlinePay(createOrderDto.getOnlinePay())
-                .setShouldCreatePayStatus(createOrderDto.getOnlinePay())
+                .setShouldCreatePayStatus(true)
                 .setPayStatus(PayStatusEnum.TO_PAY)
                 .setMenuId(createOrderDto.getMenuId())
                 .setTotalNum(createOrderDto.getTotalNum())
--- a/src/main/java/com/infoloop/tianting/service/impl/OrderServiceImpl.java
View file @3e3c58c
+++ b/src/main/java/com/infoloop/tianting/service/impl/OrderServiceImpl.java
View file @3e3c58c
@@ -16,7 +16,6 @@ import com.infoloop.tianting.deliveryruleservice.SingleClientLabelRpcResponse;
 import com.infoloop.tianting.exception.ClientEndExceptions;
 import com.infoloop.tianting.exception.ErrorCodeEnum;
 import com.infoloop.tianting.menuservice.CloseTimeTypeEnum;
-import com.infoloop.tianting.menuservice.ModeOfPaymentEnum;
 import com.infoloop.tianting.menuservice.SingleMenuDetailRpcResponse;
 import com.infoloop.tianting.model.common.OrderPageResult;
 import com.infoloop.tianting.model.dto.ClientLabelDTO.HisAllergy;
@@ -102,6 +101,7 @@ public class OrderServiceImpl implements OrderService {
         createOrderDto.setCreatedBy(operatorLoginInfo.getId());
         createOrderDto.setClientId(operator.getClientId());
         createOrderDto.setAddress(record.getDepartmentName() + record.getRoomNo());
+        createOrderDto.setOnlinePay(createOrderDto.getOnlinePay());
         createOrderDto.setPayPrice(0);
         final var menu = menuServiceRpcClient.getMenuById(operator.getEnterpriseId(),
                 createOrderDto.getMenuId()).getResponse();
@@ -113,8 +113,7 @@ public class OrderServiceImpl implements OrderService {
         createOrderDto.setRoomNo(record.getRoomNo());
         createOrderDto.setCreationSource(OrderSourceEnum.STALL.getNumber());
         createOrderDto.setEnterpriseId(operatorLoginInfo.getEnterpriseId());
-        var onlinePay = menu.getOrderRuleJson().getModeOfPayment() == ModeOfPaymentEnum.ONLINE;
+        createOrderDto.setOnlinePay(createOrderDto.getOnlinePay());
-        createOrderDto.setOnlinePay(onlinePay);
         OrderTypeEnum orderType;
         if (menu.getOrderRuleJson().getCloseTimeType() == CloseTimeTypeEnum.RESERVATION) {
             orderType = OrderTypeEnum.DELIVERY;
--- a/src/main/proto/ClientCustomerOrderService.proto
View file @3e3c58c
+++ b/src/main/proto/ClientCustomerOrderService.proto
View file @3e3c58c
@@ -81,6 +81,15 @@ enum CloseTimeType {
   RESERVATION = 1;
 }
+enum OnlinePayEnum {
+  UNKNOWN = 0;
+  ONLINE = 1; //在线
+  OFFLINE = 2; //线下
+  LEAVE_HOSPITAL = 3;//出院
+  EMPLOYEE_CARD = 4; //员工卡
+  PAPER_VERIFICATION = 5; //纸质核销
+}
+
 enum ServeStatusEnum {
   UNKNOWN_SERVE_STATUS = 0;
   SERVE_NOT_START = 1;
@@ -106,7 +115,7 @@ message SingleClientCustomerOrderRpcResponse {
   CloseTimeType closeTimeType = 10;
   int32 totalNum = 11;
   int32 payPrice = 12;
-  bool onlinePay = 13;
+  OnlinePayEnum onlinePay = 13;
   int64 payTime = 14;
   PayStatusEnum payStatus = 15;
   string errorMsg = 16;
@@ -205,7 +214,7 @@ message QueryClientCustomerOrdersByConditionRpcRequest {
   bool shouldFilterCloseTimeType = 16;
   CloseTimeType closeTimeType = 17;
   bool shouldFilterOnlinePay = 18;
-  bool onlinePay = 19;
+  OnlinePayEnum onlinePay = 19;
   bool shouldFilterPayTimeStart = 20;
   int64 payTimeStart = 21;
   bool shouldFilterPayTimeEnd = 22;
@@ -254,7 +263,7 @@ message ClientCustomerOrderCreation{
   bool shouldCreatePayPrice = 12;
   int32 payPrice = 13;
   bool shouldCreateOnlinePay = 14;
-  bool onlinePay = 15;
+  OnlinePayEnum onlinePay = 15;
   bool shouldCreatePayTime = 16;
   int64 payTime = 17;
   bool shouldCreatePayStatus = 18;
@@ -330,7 +339,7 @@ message ClientCustomerOrderModification {
   bool shouldUpdatePayPrice = 20;
   int32 payPrice = 21;
   bool shouldUpdateOnlinePay = 22;
-  bool onlinePay = 23;
+  OnlinePayEnum onlinePay = 23;
   bool shouldUpdatePayTime = 24;
   int64 payTime = 25;
   bool shouldUpdatePayStatus = 26;