feat(clientcustomerorderservice): 将在线支付字段改为枚举类型- 在 ClientCustomerOrderService.pr…

…oto 中定义 OnlinePayEnum 枚举类型

feat(clientcustomerorderservice): 将在线支付字段改为枚举类型- 在 ClientCustomerOrderService.pr…
…oto 中定义 OnlinePayEnum 枚举类型
zhuyifan
Commit 618faf8444a2c8d87e087d379a0f1f5ced70d14f 618faf84 1 parent 1f63ca48
Showing 4 changed files with 26 additions and 18 deletions
src/main/java/com/tianting/infoloop/model/db/OrderDb.java
src/main/java/com/tianting/infoloop/service/impl/OrderDbServiceImpl.java
src/main/java/com/tianting/infoloop/utils/DbToProtoUtil.java
src/main/proto/ClientCustomerOrderService.proto
--- a/src/main/java/com/tianting/infoloop/model/db/OrderDb.java
View file @618faf8
+++ b/src/main/java/com/tianting/infoloop/model/db/OrderDb.java
View file @618faf8
@@ -7,15 +7,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.ibatis.type.JdbcType;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import org.apache.ibatis.type.JdbcType;
 /**
  * order DB
@@ -100,9 +99,9 @@ public class OrderDb extends Model<OrderDb> implements Serializable {
      */
     private Integer payPrice;
     /**
-     * 是否在线付费；0=未付费，1=付费
+     * 支付方式
      */
-    private Boolean onlinePay;
+    private Integer onlinePay;
     /**
      * 支付时间
      */
--- a/src/main/java/com/tianting/infoloop/service/impl/OrderDbServiceImpl.java
View file @618faf8
+++ b/src/main/java/com/tianting/infoloop/service/impl/OrderDbServiceImpl.java
View file @618faf8
@@ -10,6 +10,7 @@ import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustome
 import com.infoloop.tianting.clientcustomerorderservice.BatchUpdateClientCustomerOrdersRpcRequest;
 import com.infoloop.tianting.clientcustomerorderservice.ClientCustomerOrderCreation;
 import com.infoloop.tianting.clientcustomerorderservice.CreateClientCustomerOrderRpcRequest;
+import com.infoloop.tianting.clientcustomerorderservice.OnlinePayEnum;
 import com.infoloop.tianting.clientcustomerorderservice.PayStatusEnum;
 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum;
 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest;
@@ -73,7 +74,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
           .toLocalDateTime());
     }
     if (createOrderRpcRequest.getCreation().getShouldCreateOnlinePay()) {
-      orderDb.setOnlinePay(createOrderRpcRequest.getCreation().getOnlinePay());
+      orderDb.setOnlinePay(createOrderRpcRequest.getCreation().getOnlinePayValue());
     }
     if (createOrderRpcRequest.getCreation().getShouldCreatePayStatus()) {
       orderDb.setPayStatus(createOrderRpcRequest.getCreation().getPayStatusValue());
@@ -115,7 +116,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
         .atOffset(ZoneOffset.UTC)
         .toLocalDateTime();
     orderDb.setMealTime(mealTime);
-    orderDb.setPayStatus(createOrderRpcRequest.getCreation().getOnlinePay() ? PayStatusEnum.TO_PAY_VALUE : PayStatusEnum.SUCCEED_VALUE);
+    orderDb.setPayStatus(createOrderRpcRequest.getCreation().getOnlinePay() == OnlinePayEnum.ONLINE ? PayStatusEnum.TO_PAY_VALUE : PayStatusEnum.SUCCEED_VALUE);
     orderDb.setCreatedBy(createOrderRpcRequest.getCreatedBy());
     orderDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue());
     orderDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy());
@@ -298,7 +299,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
             .toLocalDateTime());
       }
       if (creation.getShouldCreateOnlinePay()) {
-        orderDb.setOnlinePay(creation.getOnlinePay());
+        orderDb.setOnlinePay(creation.getOnlinePayValue());
       }
       if (creation.getShouldCreatePayStatus()) {
         orderDb.setPayStatus(creation.getPayStatusValue());
@@ -454,9 +455,8 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
     if (updateOrderRequest.getModification().getShouldUpdatePayPrice()) {
       orderDb.setPayPrice(updateOrderRequest.getModification().getPayPrice());
     }
-    if (updateOrderRequest.getModification().
+    if (updateOrderRequest.getModification().getShouldUpdateOnlinePay()) {
-        getShouldUpdateOnlinePay()) {
+      orderDb.setOnlinePay(updateOrderRequest.getModification().getOnlinePayValue());
-      orderDb.setOnlinePay(updateOrderRequest.getModification().getOnlinePay());
     }
     if (updateOrderRequest.getModification().getShouldUpdatePayTime()) {
       orderDb.setPayTime(Instant.ofEpochMilli(updateOrderRequest.getModification().getPayTime())
@@ -555,7 +555,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
         orderDb.setPayPrice(modification.getPayPrice());
       }
       if (modification.getShouldUpdateOnlinePay()) {
-        orderDb.setOnlinePay(modification.getOnlinePay());
+        orderDb.setOnlinePay(modification.getOnlinePayValue());
       }
       if (modification.getShouldUpdatePayTime()) {
         orderDb.setPayTime(Instant.ofEpochMilli(modification.getPayTime())
--- a/src/main/java/com/tianting/infoloop/utils/DbToProtoUtil.java
View file @618faf8
+++ b/src/main/java/com/tianting/infoloop/utils/DbToProtoUtil.java
View file @618faf8
@@ -2,10 +2,10 @@ package com.tianting.infoloop.utils;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.protobuf.GeneratedMessageV3;
 import com.infoloop.tianting.clientcustomerorderservice.CloseTimeType;
 import com.infoloop.tianting.clientcustomerorderservice.CustomerNotice;
 import com.infoloop.tianting.clientcustomerorderservice.MealDetail;
+import com.infoloop.tianting.clientcustomerorderservice.OnlinePayEnum;
 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum;
 import com.infoloop.tianting.clientcustomerorderservice.OrderTypeEnum;
@@ -15,7 +15,7 @@ import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrde
 import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse;
 import com.tianting.infoloop.model.db.OrderDb;
 import com.tianting.infoloop.model.db.OrderDetailDb;
-import java.lang.reflect.Constructor;
+
 import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
@@ -56,7 +56,7 @@ public class DbToProtoUtil {
     }
     if (orderDb.getOnlinePay()!= null) {
-      protoBuilder.setOnlinePay(orderDb.getOnlinePay());
+      protoBuilder.setOnlinePay(OnlinePayEnum.forNumber(orderDb.getOnlinePay()));
     }
     if (orderDb.getPayStatus()!= null) {
--- a/src/main/proto/ClientCustomerOrderService.proto
View file @618faf8
+++ b/src/main/proto/ClientCustomerOrderService.proto
View file @618faf8
@@ -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;