Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponDTO.java

@@ -10,7 +10,6 @@ import lombok.NoArgsConstructor;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.sql.Time;
 import java.time.LocalDateTime;
 
 /**
@@ -100,14 +99,12 @@ public class ShopCouponDTO implements Serializable {
     /**
      * 可用开始时间
      */
-    @JSONField(format = "HH:mm:ss")
-    private Time useStartTime;
+    private String useStartTime;
 
     /**
      * 可用结束时间
      */
-    @JSONField(format = "HH:mm:ss")
-    private Time useEndTime;
+    private String useEndTime;
 
     /**
      * 1-满减  2-商品

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java

@@ -27,7 +27,7 @@ public class ShopUserMoneyEditDTO {
     private Integer type;
     /**
      * 关联id，
-     * 霸王餐时 订单id
+     * 订单支付/订单退款/霸王餐时 订单id
      * 支付/退款 tb_order_payment.id
      */
     private Long relationId;

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopCoupon.java

@@ -12,7 +12,6 @@ import lombok.NoArgsConstructor;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.sql.Time;
 import java.time.LocalDateTime;
 
 /**
@@ -100,14 +99,14 @@ public class ShopCoupon implements Serializable {
     private String useTimeType;
 
     /**
-     * 可用开始时间
+     * 可用开始时间 00:00
      */
-    private Time useStartTime;
+    private String useStartTime;
 
     /**
-     * 可用结束时间
+     * 可用结束时间 23:59
      */
-    private Time useEndTime;
+    private String useEndTime;
 
     /**
      * 1-满减  2-商品

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUserFlow.java

@@ -56,7 +56,7 @@ public class ShopUserFlow implements Serializable {
 
     /**
      * 关联id，
-     * 霸王餐时 订单id
+     * 订单支付/订单退款/霸王餐时 订单id
      * 支付/退款 tb_order_payment.id
      */
     private Long relationId;

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java

@@ -2,6 +2,7 @@ package com.czg.account.service;
 
 import com.czg.account.dto.shopuser.*;
 import com.czg.account.entity.ShopUser;
+import com.czg.resp.CzgResult;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 
@@ -33,5 +34,5 @@ public interface ShopUserService extends IService<ShopUser> {
      */
     Page<ShopUserVipCardDTO> vipCard(long userInfoId);
 
-    String getCode(long userInfoId, long shopId);
+    CzgResult<String> getCode(long userInfoId, long shopId);
 }

cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java

@@ -183,8 +183,10 @@ public class OrderInfoDTO implements Serializable {
 
     /**
      * 支付订单号
+     * tb_order_payment.id
+     * tb_shop_user_flow.id
      */
-    private String payOrderNo;
+    private Long payOrderId;
 
     /**
      * 交易日期

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java

@@ -186,7 +186,11 @@ public class OrderInfo implements Serializable {
 
     /**
      * 支付订单号
+     * tb_order_payment.id
+     * tb_shop_user_flow.id
      */
+    private Long payOrderId;
+
     private String payOrderNo;
 
     /**