Merge remote-tracking branch 'origin/test' into test

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

@@ -48,4 +48,7 @@ public class FreeDineConfigEditDTO {
      */
     private List<String> useType;
 
+    private String useShopType;
+    private List<Long> shopIdList;
+
 }

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

@@ -4,6 +4,7 @@ import com.czg.account.entity.FreeDineConfig;
 import com.czg.account.entity.ShopExtend;
 import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopUser;
+import com.czg.account.vo.FreeDineConfigVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -50,6 +51,6 @@ public class ShopUserDetailDTO extends ShopUser {
     /**
      * 霸王餐信息
      */
-    private FreeDineConfig freeDineConfig;
+    private FreeDineConfigVO freeDineConfig;
 
 }

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

@@ -87,7 +87,8 @@ public class FreeDineConfig implements Serializable {
     /**
      * 可用的子门店id
      */
-    private String childShopIdList;
+    private String shopIdList;
+    private String useShopType;
 
     public Integer getMultiple() {
         return rechargeTimes == null ? 2 : rechargeTimes;

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

@@ -1,6 +1,7 @@
 package com.czg.account.service;
 
 import com.czg.account.dto.freeding.FreeDineConfigEditDTO;
+import com.czg.account.vo.FreeDineConfigVO;
 import com.mybatisflex.core.service.IService;
 import com.czg.account.entity.FreeDineConfig;
 
@@ -12,7 +13,7 @@ import com.czg.account.entity.FreeDineConfig;
  */
 public interface FreeDineConfigService extends IService<FreeDineConfig> {
 
-    FreeDineConfig getConfig(long shopId);
+    FreeDineConfigVO getConfig(long shopId);
 
     Boolean edit(long shopId, FreeDineConfigEditDTO freeDineConfigEditDTO);
 

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

@@ -0,0 +1,80 @@
+package com.czg.account.vo;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class FreeDineConfigVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 是否启用
+     */
+    private Boolean enable;
+
+    /**
+     * 充值多少倍免单
+     */
+    private Integer rechargeTimes;
+
+    /**
+     * 订单满多少元可以使用
+     */
+    private BigDecimal rechargeThreshold;
+
+    /**
+     * 是否与优惠券共享
+     */
+    private Boolean withCoupon;
+
+    /**
+     * 是否与积分同享
+     */
+    private Boolean withPoints;
+
+    /**
+     * 充值说明
+     */
+    private String rechargeDesc;
+
+//    /**
+//     * 使用类型 dine-in店内 takeout 自取 post快递，takeaway外卖
+//     */
+//    private String useType;
+
+    /**
+     * 门店id
+     */
+    @Id
+    private Long shopId;
+
+    /**
+     * 创建时间
+     */
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+    /**
+     * 可用的子门店id
+     */
+    private List<Long> shopIdList;
+    private String useShopType;
+
+    public Integer getMultiple() {
+        return rechargeTimes == null ? 2 : rechargeTimes;
+    }
+}