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

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

@@ -5,6 +5,7 @@ import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -17,6 +18,7 @@ import java.io.Serializable;
  */
 @Data
 @Table("tb_shop_config")
+@Accessors(chain = true)
 public class ShopConfig implements Serializable {
 
     @Serial
@@ -84,7 +86,7 @@ public class ShopConfig implements Serializable {
 	*/
 	private Integer isTableFee;
 	/**
-	* 是否启用会员价 1-是 0-否 
+	* 是否启用会员价 1-是 0-否
 	*/
 	private Integer isMemberPrice;
 	/**
@@ -104,4 +106,4 @@ public class ShopConfig implements Serializable {
 	 * '自动清台 支付几分钟后  默认10分钟后'
 	 */
 	private Integer tableClearTime;
-}
+}

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

@@ -153,7 +153,12 @@ public class ShopUser implements Serializable {
     private LocalDateTime deliverTime;
     private LocalDateTime nextDeliverTime;
 
+    @Column(ignore = true)
     private String memberName;
     private String openType;
+    @Column(ignore = true)
+    private Integer discount;
+    @Column(ignore = true)
+    private Integer isMemberPrice;
 
 }

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

@@ -2,6 +2,9 @@ package com.czg.account.service;
 
 import com.czg.account.entity.ShopConfig;
 import com.mybatisflex.core.service.IService;
+import com.mybatisflex.core.util.LambdaGetter;
+
+import java.util.List;
 
 /**
  * 店铺配置扩展
@@ -11,4 +14,5 @@ import com.mybatisflex.core.service.IService;
  */
 public interface ShopConfigService extends IService<ShopConfig> {
 
-}
+    void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, String name, String useShopType, List<Long> shopIdList);
+}