From 6a822bf673969eb1d34019fb8c27be9b062cbb88 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 15 Dec 2025 13:52:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E5=9F=9F=E5=BC=95=E6=B5=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DrainageConfigController.java | 2 +- .../user/UDrainageConfigController.java | 11 ++++---- .../czg/market/dto/MkDrainageConfigDTO.java | 26 ++++++++++++------- .../czg/market/entity/MkDrainageConfig.java | 18 ++++++++++--- .../com/czg/market/vo/MkDrainageConfigVO.java | 19 ++++++++++---- .../service/impl/ChatCouponServiceImpl.java | 3 +-- .../impl/MkDrainageConfigServiceImpl.java | 21 +++++++++------ 7 files changed, 65 insertions(+), 35 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/DrainageConfigController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/DrainageConfigController.java index dbc1cd28d..29e2a8172 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/DrainageConfigController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/DrainageConfigController.java @@ -11,7 +11,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** - * 私域引流配置 + * 管理端/私域引流配置 * * @author Administrator */ diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UDrainageConfigController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UDrainageConfigController.java index b2b72e281..06aea34bf 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UDrainageConfigController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UDrainageConfigController.java @@ -1,17 +1,16 @@ package com.czg.controller.user; -import com.czg.annotation.SaAdminCheckPermission; -import com.czg.market.dto.MkDrainageConfigDTO; import com.czg.market.service.MkDrainageConfigService; import com.czg.market.vo.MkDrainageConfigVO; import com.czg.resp.CzgResult; -import com.czg.sa.StpKit; import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** - * 私域引流配置 + * 用户端/私域引流配置 * @author Administrator */ @RestController diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDrainageConfigDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDrainageConfigDTO.java index b85e496d4..c304b87af 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDrainageConfigDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDrainageConfigDTO.java @@ -1,17 +1,15 @@ package com.czg.market.dto; -import com.mybatisflex.annotation.Column; -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import jakarta.validation.constraints.Max; import lombok.Data; import org.hibernate.validator.constraints.Length; import java.io.Serial; import java.io.Serializable; -import java.time.LocalDateTime; import java.util.List; +/** + * @author yjjie + */ @Data public class MkDrainageConfigDTO implements Serializable { @@ -19,9 +17,14 @@ public class MkDrainageConfigDTO implements Serializable { private static final long serialVersionUID = 1L; /** - * 堂食 dine-in 外带 take-out 外卖 take-away + * 订单页显示类型： 堂食 dine-in 外带 take-out 外卖 take-away */ - private List useType; + private List orderType; + + /** + * 首页显示类型：only 仅显示 1 次，day 每天显示一次，every 每次进入小程序 + */ + private List homeType; /** * 群二维码 @@ -45,8 +48,13 @@ public class MkDrainageConfigDTO implements Serializable { private String note; /** - * 是否开启 + * 订单页是否开启 */ - private Integer isEnable; + private Integer orderEnable; + + /** + * 首页是否开启 + */ + private Integer homeEnable; } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDrainageConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDrainageConfig.java index f873dabef..45dc5acdf 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDrainageConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkDrainageConfig.java @@ -34,9 +34,14 @@ public class MkDrainageConfig implements Serializable { private Long id; /** - * 堂食 dine-in 外带 take-out 外卖 take-away + * 订单页显示类型： 堂食 dine-in 外带 take-out 外卖 take-away */ - private String useType; + private String orderType; + + /** + * 首页显示类型：only 仅显示 1 次，day 每天显示一次，every 每次进入小程序 + */ + private String homeType; /** * 群二维码 @@ -59,9 +64,14 @@ public class MkDrainageConfig implements Serializable { private String note; /** - * 是否开启 + * 订单页是否开启 */ - private Integer isEnable; + private Integer orderEnable; + + /** + * 首页是否开启 + */ + private Integer homeEnable; /** * 主店id diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkDrainageConfigVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkDrainageConfigVO.java index 68101f68b..444b7348d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkDrainageConfigVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkDrainageConfigVO.java @@ -3,7 +3,6 @@ package com.czg.market.vo; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -33,9 +32,14 @@ public class MkDrainageConfigVO implements Serializable { private Long id; /** - * 堂食 dine-in 外带 take-out 外卖 take-away + * 订单页显示类型： 堂食 dine-in 外带 take-out 外卖 take-away */ - private List useType; + private List orderType; + + /** + * 首页显示类型：only 仅显示 1 次，day 每天显示一次，every 每次进入小程序 + */ + private List homeType; /** * 群二维码 @@ -58,9 +62,14 @@ public class MkDrainageConfigVO implements Serializable { private String note; /** - * 是否开启 + * 订单页是否开启 */ - private Integer isEnable; + private Integer orderEnable; + + /** + * 首页是否开启 + */ + private Integer homeEnable; /** * 主店id diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java index 1c12461d9..7e3b5ca45 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java @@ -79,14 +79,13 @@ public class ChatCouponServiceImpl extends ServiceImpl pageChatCoupon(Long shopId, Integer page, Integer size, Integer status) { - Page pages = pageAs(Page.of(page, size), + return pageAs(Page.of(page, size), QueryWrapper.create() .eq(ChatCoupon::getShopId, shopId) .eq(ChatCoupon::getStatus, status) .orderBy(ChatCoupon::getStatus).asc() .orderBy(ChatCoupon::getId).desc(), ChatCouponVO.class); - return pages; } /** diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDrainageConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDrainageConfigServiceImpl.java index 6ec1d60a9..7d76080df 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDrainageConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDrainageConfigServiceImpl.java @@ -3,15 +3,14 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONArray; -import com.czg.account.entity.ShopInfo; import com.czg.account.service.ShopInfoService; import com.czg.market.dto.MkDrainageConfigDTO; -import com.czg.market.vo.MkDrainageConfigVO; -import com.mybatisflex.core.query.QueryWrapper; -import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.market.entity.MkDrainageConfig; import com.czg.market.service.MkDrainageConfigService; +import com.czg.market.vo.MkDrainageConfigVO; import com.czg.service.market.mapper.MkDrainageConfigMapper; +import com.mybatisflex.core.query.QueryWrapper; +import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; @@ -37,8 +36,11 @@ public class MkDrainageConfigServiceImpl extends ServiceImpl