From 6c6b51308626d1531ffefa84ede41d8c6a619441 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 19 Dec 2025 10:39:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=20=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/constants/ShopSwitchTypeEnum.java | 2 +- .../service/impl/MkPointsGoodsServiceImpl.java | 18 ++++++++++++------ .../service/impl/UserHomeServiceImpl.java | 6 ++++-- .../order/service/impl/GbOrderServiceImpl.java | 4 ++-- .../main/resources/mapper/GbOrderMapper.xml | 14 +++++++++++--- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/constants/ShopSwitchTypeEnum.java b/cash-common/cash-common-service/src/main/java/com/czg/constants/ShopSwitchTypeEnum.java index edeb9d344..4b3d53afe 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/constants/ShopSwitchTypeEnum.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/constants/ShopSwitchTypeEnum.java @@ -3,7 +3,7 @@ package com.czg.constants; import com.czg.account.entity.ShopInfo; /** - * 店铺开关枚举 + * 店铺 开关枚举 * * @author ww */ diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java index a569840c2..8eff3ee04 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java @@ -2,11 +2,11 @@ package com.czg.service.market.service.impl; import cn.hutool.core.util.StrUtil; import com.czg.BaseQueryParam; -import com.czg.account.entity.ShopInfo; -import com.czg.account.service.ShopInfoService; +import com.czg.market.entity.MkPointsConfig; import com.czg.market.entity.MkPointsGoods; import com.czg.market.entity.MkPointsUser; import com.czg.market.entity.ShopCoupon; +import com.czg.market.service.MkPointsConfigService; import com.czg.market.service.MkPointsGoodsService; import com.czg.market.service.MkPointsUserService; import com.czg.market.service.ShopCouponService; @@ -17,7 +17,6 @@ import com.github.pagehelper.PageInfo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; -import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -32,15 +31,19 @@ import java.util.Map; */ @Service public class MkPointsGoodsServiceImpl extends ServiceImpl implements MkPointsGoodsService { + @Resource + private MkPointsConfigService mkPointsConfigService; @Resource private MkPointsUserService pointsUserService; @Resource private ShopCouponService shopCouponService; - @DubboReference - private ShopInfoService shopInfoService; @Override public Page getPointsGoodsPage(BaseQueryParam param, Long shopId) { + boolean exists = mkPointsConfigService.exists(query().eq(MkPointsConfig::getShopId, shopId).eq(MkPointsConfig::getEnablePointsMall, 1)); + if (!exists) { + return new Page<>(); + } Page page = page(Page.of(param.getPage(), param.getSize()), query() .eq(MkPointsGoods::getShopId, shopId) @@ -62,8 +65,11 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId) { -// shopInfoService.checkSwitch(shopId, ) Map result = new HashMap<>(2); + boolean exists = mkPointsConfigService.exists(query().eq(MkPointsConfig::getShopId, shopId).eq(MkPointsConfig::getEnablePointsMall, 1)); + if (!exists) { + return result; + } MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId); PageHelper.startPage(page, size); List list = mapper.getPointsGoodsPageByUser(shopId, userId, StrUtil.trim(goodsCategory)); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/UserHomeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/UserHomeServiceImpl.java index c64d5a316..ee84bf100 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/UserHomeServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/UserHomeServiceImpl.java @@ -48,7 +48,8 @@ public class UserHomeServiceImpl implements UserHomeService { ShopInfo shopInfo = shopInfoService.getById(shopId); if (shopInfo != null) { - userHomeDataVo.setGroup(shopInfo.getIsGroupBuy()); +// userHomeDataVo.setGroup(shopInfo.getIsGroupBuy()); + userHomeDataVo.setGroup(1); } // 用户信息 @@ -62,7 +63,8 @@ public class UserHomeServiceImpl implements UserHomeService { // 积分商城 MkPointsConfig pointsConfig = mkPointsConfigService.getById(shopId); if (pointsConfig != null) { - userHomeDataVo.setPointsMall(pointsConfig.getEnablePointsMall()); +// userHomeDataVo.setPointsMall(pointsConfig.getEnablePointsMall()); + userHomeDataVo.setPointsMall(1); } // 分销 diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java index 61ee79d6d..fa5fbc126 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java @@ -114,9 +114,9 @@ public class GbOrderServiceImpl extends ServiceImpl impl AssertUtil.isNull(gbOrderDetail, "记录不存在"); } else { gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong()); - gbOrderDetail.setGroupOrderNo(groupOrderNo); - gbOrderDetail.setShopId(shopId); } + gbOrderDetail.setGroupOrderNo(groupOrderNo); + gbOrderDetail.setShopId(shopId); List users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo()); gbOrderDetail.setUsers(users); return gbOrderDetail; diff --git a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml index 7887e6de6..db5ae4327 100644 --- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml @@ -72,13 +72,21 @@ and detail.verify_time BETWEEN #{param.verifyStartTime} and #{param.verifyEndTime} - order by detail.create_time desc + order by + + + `status` desc, + + + detail.create_time desc