From bbc1eadd713f0d6608703c9229e690c2a2a16357 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 31 Oct 2025 16:18:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=A8=E5=BA=97=20id=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E4=B8=8D=E4=B8=8A=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/PayServiceImpl.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index a17c266ad..e86ac7012 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -203,7 +203,7 @@ public class PayServiceImpl implements PayService { AssertUtil.isNull(shopUser, "会员不存在"); UserInfo userInfo = userInfoService.getById(shopUser.getUserId()); AssertUtil.isNull(userInfo, "用户信息不存在"); - if (userInfo.getUsePayPwd() == 1 ) { + if (userInfo.getUsePayPwd() == 1) { AssertUtil.isBlank(payParam.getPwd(), "支付密码不能为空"); if (userInfo.getPayPwd() == null || !userInfo.getPayPwd().equals(MD5Util.md5AsHex(payParam.getPwd()))) { return CzgResult.failure("支付密码错误"); @@ -216,8 +216,17 @@ public class PayServiceImpl implements PayService { } payParam.getCheckOrderPay().setUserId(shopUser.getUserId()); OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); - if (!shopUser.getSourceShopId().equals(orderInfo.getShopId()) && !shopUser.getMainShopId().equals(orderInfo.getShopId())) { - return CzgResult.failure("违规操作，请确认店铺后重试"); + if (shopInfo.getIsHeadShop().equals(1)) { + if (!shopUser.getMainShopId().equals(orderInfo.getShopId())) { + return CzgResult.failure("违规操作，请确认店铺后重试"); + } + } else { + boolean exists = shopInfoService.exists(QueryWrapper.create() + .eq(ShopInfo::getMainId, shopInfo.getMainId()) + .eq(ShopInfo::getId, orderInfo.getShopId())); + if(!exists){ + return CzgResult.failure("违规操作，请确认店铺后重试"); + } } if (shopUser.getAmount().compareTo(orderInfo.getOrderAmount()) < 0) { return CzgResult.failure("会员余额不足"); @@ -501,7 +510,7 @@ public class PayServiceImpl implements PayService { boolean isFree = checkPayVip(rechargeDTO); Long mainShopId = shopInfoService.getMainIdByShopId(rechargeDTO.getShopId()); - ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getMainShopId,mainShopId) + ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getMainShopId, mainShopId) .eq(ShopUser::getId, shopUserId)); AssertUtil.isNull(shopUser, "充值失败 该店铺用户不存在"); MkShopRechargeVO rechargeVO = shopRechargeService.detail(rechargeDTO.getShopId()); From 5bb1e28310230ec9bf04b030f2c74ab4003c7176 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 31 Oct 2025 16:30:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=86=E5=BA=97=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=9A=84=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MkLimitTimeDiscountServiceImpl.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java index eeeedb92d..b440b9d9c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java @@ -92,7 +92,22 @@ public class MkLimitTimeDiscountServiceImpl extends ServiceImpl foodIds = Arrays.stream(limitTimeDiscount.getFoods().split(",")) + .map(String::trim) + .filter(StrUtil::isNotBlank) + .distinct() + .toList(); + List ids = productService.listAs(QueryWrapper.create().select(Product::getId) + .eq(Product::getShopId, shopId).in(Product::getSyncId, foodIds), String.class); + if (CollUtil.isEmpty(ids)) { + limitTimeDiscount.setFoods(""); + } else { + limitTimeDiscount.setFoods(String.join(",", ids)); + } + } + return limitTimeDiscount; } @Override From 2ef59654ef8cdfdd12e347cde1e52a9dc84ca524 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 31 Oct 2025 16:41:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE=20=E4=BC=98=E5=85=88=20?= =?UTF-8?q?=E5=9C=A8=E6=9C=AC=E5=BA=97=E4=B8=8B=E5=8D=95=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MkDistributionUserServiceImpl.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index 14bcab51e..53ab2da36 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -124,16 +124,10 @@ public class MkDistributionUserServiceImpl extends ServiceImpl unActivates = mapper.selectUnDistributionShops(userId); for (DistributionCenterShopVO unActivate : unActivates) { - - //'pay购买开通 auto自动开通 manual手动开通' - if ("pay".equals(unActivate.getOpenType())) { - if (unActivate.getShopUser() == 1) { - unActivate.setLabelContent("曾进入过店铺"); - } - } else if ("auto".equals(unActivate.getOpenType())) { - if (unActivate.getOrderCount() == 1) { - unActivate.setLabelContent("在本店下单过"); - } + if (unActivate.getOrderCount() == 1) { + unActivate.setLabelContent("在本店下单过"); + }else if (unActivate.getShopUser() == 1) { + unActivate.setLabelContent("曾进入过店铺"); } // else if("manual".equals(unActivate.getOpenType())){ // unActivate.setLabelContent("manual手动开通");，