From 95f3e1125030864fec911fc93a063628f56ab1e3 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 15 Oct 2025 15:48:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/ShopUserController.java | 3 ++- .../czg/market/entity/SmsPushEventUser.java | 24 ++++++++++++++----- .../service/impl/AShopUserServiceImpl.java | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java index 64579d01..50ca4bd0 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java @@ -10,6 +10,7 @@ import com.czg.enums.ShopUserFlowBizEnum; import com.czg.market.entity.SmsPushEventUser; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; +import com.czg.utils.AssertUtil; import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -165,7 +166,7 @@ public class ShopUserController { */ @PostMapping("/getPushEventUser") public CzgResult> getPushEventUser(@RequestBody @Validated SmsPushEventUser smsPushEventUser) { - smsPushEventUser.setShopId(StpKit.USER.getShopId()); + AssertUtil.isNull(smsPushEventUser.getShopId(), "店铺id不能为空"); return CzgResult.success(shopUserService.getPushEventUser(smsPushEventUser)); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java index d371fdd4..dee3ba74 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java @@ -4,6 +4,7 @@ import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; + import java.io.Serializable; import java.time.LocalDateTime; @@ -48,7 +49,7 @@ public class SmsPushEventUser implements Serializable { private Integer sexWoman; private Integer sexUnknown; - /** + /** * 是否会员 0否 1是 null全查 */ private Integer isVip; @@ -62,11 +63,11 @@ public class SmsPushEventUser implements Serializable { * 下单时间 从未下单 1查询 其余不查 */ private Integer noOrder; - /** + /** * 下单时间 下过一单 1查询 其余不查 */ private Integer oneOrder; - /** + /** * 下单时间 下过五单及以上 1查询 其余不查 */ private Integer fiveOrder; @@ -76,15 +77,15 @@ public class SmsPushEventUser implements Serializable { * 下单时间 今天 1查询 其余不查 */ private Integer orderTimeToday; - /** + /** * 下单时间 昨天 1查询 其余不查 */ private Integer orderTimeYesterday; - /** + /** * 下单时间 两周内 1查询 其余不查 */ private Integer orderTimeTwoWeeks; - /** + /** * 下单时间 两周前 1查询 其余不查 */ private Integer orderTimeMoreThanTwoWeeks; @@ -102,5 +103,16 @@ public class SmsPushEventUser implements Serializable { @Column(onInsertValue = "now()") private LocalDateTime createTime; + @Column(ignore = true) + private Integer page; + @Column(ignore = true) + private Integer size; + public Integer getPage() { + return page == null ? 1 : page; + } + + public Integer getSize() { + return size == null ? 10 : size; + } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java index 4b83e7fb..14834035 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AShopUserServiceImpl.java @@ -95,7 +95,7 @@ public class AShopUserServiceImpl implements AShopUserService { @Override public Page getPushEventUser(SmsPushEventUser smsPushEventUser) { - PageHelper.startPage(PageUtil.buildPage()); + PageHelper.startPage(new Page<>(smsPushEventUser.getPage(), smsPushEventUser.getSize())); Long mainShopId = shopInfoService.getMainIdByShopId(smsPushEventUser.getShopId()); // 调用Mapper层查询 return shopUserMapper.selectPushEventUser( From 59a16d15b7bf9327b1e94b7fbca861c3e205c3c0 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 15 Oct 2025 16:10:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=B8=20=E4=B8=8D?= =?UTF-8?q?=E6=8A=B5=E6=89=A3=E4=B8=B4=E6=97=B6=E8=8F=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index e399a127..592eb3fd 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -536,10 +536,10 @@ public class OrderInfoServiceImpl extends ServiceImpl 0) { + if (detail.getIsTemporary() != 1 && (isAllFoods || couponFoodIds.contains(detail.getProductId())) && detail.getUnitPrice().compareTo(BigDecimal.ZERO) > 0) { if (remaining.compareTo(BigDecimal.ZERO) > 0) { if (remaining.compareTo(detail.getNum().subtract(detail.getReturnNum())) >= 0) { detail.setCouponNum(detail.getNum().subtract(detail.getReturnNum()).setScale(2, RoundingMode.CEILING)); From 57dd228b91efff3c6af5cab99cdbab33386581a9 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 15 Oct 2025 16:14:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=8F=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/order/service/impl/OrderInfoServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 592eb3fd..238aa7f4 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -472,12 +472,12 @@ public class OrderInfoServiceImpl extends ServiceImpl Date: Wed, 15 Oct 2025 16:16:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=8F=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 238aa7f4..94acd6f4 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -477,7 +477,7 @@ public class OrderInfoServiceImpl extends ServiceImpl Date: Wed, 15 Oct 2025 16:19:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E4=B8=8D?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopUserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml index 1229cca3..7156453b 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml @@ -148,7 +148,7 @@ noOrder == 1 or oneOrder == 1 or fiveOrder == 1"> LEFT JOIN `order` o ON u.user_id = o.user_id and o.user_id is not null AND o.shop_id = #{shopId} AND o.status = 'done' - WHERE u.main_shop_id = #{mainShopId} + WHERE u.main_shop_id = #{mainShopId} and u.phone is not null AND