From 837aca3fd083ea9fb2e4f993d488c5c0b82d3a46 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 29 Oct 2024 16:43:55 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8F=B0=E6=A1=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/mpservice/impl/MpShopTableServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/impl/MpShopTableServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/impl/MpShopTableServiceImpl.java index db06283..c2f5875 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/impl/MpShopTableServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/mpservice/impl/MpShopTableServiceImpl.java @@ -37,7 +37,7 @@ public class MpShopTableServiceImpl extends ServiceImpl Date: Wed, 30 Oct 2024 16:09:02 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/PayService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 1322c00..4f4f363 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -7,7 +7,6 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.chaozhanggui.system.cashierservice.constant.TableConstant; import com.chaozhanggui.system.cashierservice.dao.*; import com.chaozhanggui.system.cashierservice.entity.Enum.OrderUseTypeEnum; import com.chaozhanggui.system.cashierservice.entity.*; @@ -549,6 +548,9 @@ public class PayService { if (ObjectUtil.isEmpty(userInfo)) { return Result.fail("未获取到用户信息"); } + if (StrUtil.isEmpty(userInfo.getPwd())) { + return Result.fail("未设置支付密码"); + } if (!userInfo.getPwd().equals(MD5Utils.md5(pwd))) { return Result.fail("支付密码错误"); } From 7a3abc6cb4c019c5e3b04368584cdda4a6213e3a Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Fri, 8 Nov 2024 17:58:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98=20deta?= =?UTF-8?q?il=20=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/service/PayService.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 4f4f363..a13d7e9 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -470,13 +470,14 @@ public class PayService { //更新购物车状态 int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper() .eq(TbCashierCart::getOrderId, orderId) - .eq(TbCashierCart::getUseType, orderInfo.getUseType()) - .in(TbCashierCart::getStatus, "create", "closed") +// .eq(TbCashierCart::getUseType, orderInfo.getUseType()) +// .in(TbCashierCart::getStatus, "create", "closed") .set(TbCashierCart::getStatus, "final")); - mpOrderDetailMapper.update(null, new LambdaUpdateWrapper().eq(TbOrderDetail::getId, orderId) - .eq(TbOrderDetail::getUseType, orderInfo.getUseType()) - .eq(TbOrderDetail::getStatus, "unpaid") + mpOrderDetailMapper.update(null, new LambdaUpdateWrapper() + .eq(TbOrderDetail::getId, orderId) +// .eq(TbOrderDetail::getUseType, orderInfo.getUseType()) +// .eq(TbOrderDetail::getStatus, "unpaid") .set(TbOrderDetail::getStatus, "closed")); outRecordMapper.updateByOrderIdAndStatus(orderInfo.getId(), "closed"); @@ -1086,16 +1087,17 @@ public class PayService { int cartCount = mpCashierCartMapper.update(null, new LambdaUpdateWrapper() .eq(TbCashierCart::getOrderId, orderInfo.getId()) - .eq(TbCashierCart::getUseType, orderInfo.getUseType()) - .in(TbCashierCart::getStatus, "create", "closed") +// .eq(TbCashierCart::getUseType, orderInfo.getUseType()) +// .in(TbCashierCart::getStatus, "create", "closed") .set(TbCashierCart::getStatus, "final")); log.info("更新购物车:{}", cartCount); //更新子单状态 - mpOrderDetailMapper.update(null, new LambdaUpdateWrapper().eq(TbOrderDetail::getOrderId, orderInfo.getId()) - .eq(TbOrderDetail::getUseType, orderInfo.getUseType()) - .in(TbOrderDetail::getStatus, "unpaid") + mpOrderDetailMapper.update(null, new LambdaUpdateWrapper() + .eq(TbOrderDetail::getOrderId, orderInfo.getId()) +// .eq(TbOrderDetail::getUseType, orderInfo.getUseType()) +// .in(TbOrderDetail::getStatus, "unpaid") .set(TbOrderDetail::getStatus, "closed")); //修改主单状态 From 5908ce1afcd1c58a482ada04cb70caac61b78e23 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Fri, 8 Nov 2024 18:06:36 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98=20deta?= =?UTF-8?q?il=20=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chaozhanggui/system/cashierservice/service/PayService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index a13d7e9..d27603a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -475,7 +475,7 @@ public class PayService { .set(TbCashierCart::getStatus, "final")); mpOrderDetailMapper.update(null, new LambdaUpdateWrapper() - .eq(TbOrderDetail::getId, orderId) + .eq(TbOrderDetail::getOrderId, orderId) // .eq(TbOrderDetail::getUseType, orderInfo.getUseType()) // .eq(TbOrderDetail::getStatus, "unpaid") .set(TbOrderDetail::getStatus, "closed")); From 5f76f1da2cb0cc8628e70e08bb81d162b6c33f9b Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 11 Nov 2024 14:34:09 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8B=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/TbProductMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml index 615d6fd..9f5ccfd 100644 --- a/src/main/resources/mapper/TbProductMapper.xml +++ b/src/main/resources/mapper/TbProductMapper.xml @@ -931,7 +931,7 @@ select min( sku.suit ) as suit,tb.* from tb_product tb LEFT JOIN tb_product_sku sku ON tb.id = sku.product_id - where tb.id in (${ids}) and is_show_mall =1 and sku.is_del = 0 and sku.is_grounding=1 and tb.type_enum!='group' and tb.status = 1 + where tb.id in (${ids}) and sku.is_del = 0 and tb.is_grounding=1 and tb.type_enum!='group' and tb.status = 1 group by tb.id order by tb.sort asc From f0c81ca2d2a6e007d1597c52373c5cd99b02abb9 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 11 Nov 2024 14:40:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8B=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/TbProductMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/TbProductMapper.xml b/src/main/resources/mapper/TbProductMapper.xml index 9f5ccfd..e262ffb 100644 --- a/src/main/resources/mapper/TbProductMapper.xml +++ b/src/main/resources/mapper/TbProductMapper.xml @@ -949,7 +949,7 @@ and tb.status = 1 and tb.type_enum != 'group' and sku.is_del = 0 - and sku.is_grounding = 1 + and tb.is_grounding = 1 group by tb.id order by tb.sort asc @@ -964,7 +964,7 @@ and tb.shop_id = #{shopId} and tb.status = 1 and sku.is_del = 0 - and sku.is_grounding = 1 + and tb.is_grounding = 1 and tb.type_enum != 'group' group by tb.id order by tb.sort asc