From fced36d732e88977c655c64728f3fc5cb9ae6374 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 29 Oct 2024 09:28:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=97=A0=E6=A1=8C=E5=8F=B0=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=8F=9C=E5=93=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java index e59129ac..ef17fb6c 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java @@ -604,7 +604,6 @@ public class TbShopTableServiceImpl implements TbShopTableService { // 会员点单 TbCashierCart cashierCart = cashierCartMapper.selectOne(new LambdaQueryWrapper() .eq(TbCashierCart::getShopId, removeCartDTO.getShopId()) - .eq(TbCashierCart::getUseType, removeCartDTO.getUseType()) .eq(TbCashierCart::getId, removeCartDTO.getCartId())); if (cashierCart == null) { throw new BadRequestException("购物车商品不存在"); @@ -619,7 +618,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { .eq(TbOrderDetail::getShopId, cashierCart.getShopId()) .eq(TbOrderDetail::getProductId, cashierCart.getProductId()) .eq(TbOrderDetail::getProductSkuId, cashierCart.getSkuId()) - .eq(TbOrderDetail::getUseType, removeCartDTO.getUseType()) + .eq(TbOrderDetail::getCartId, cashierCart.getId()) .isNull(TbOrderDetail::getPlaceNum) .eq(TbOrderDetail::getOrderId, cashierCart.getOrderId())); } From 35ccf243f11afcddeae1a49aa38275cde315ce9b Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 29 Oct 2024 09:34:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=82=A8=E5=80=BC=E5=8D=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E4=B8=8D=E8=83=BD=E9=80=80=E6=AC=BE=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java index c4b55781..74cc1d91 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java @@ -438,8 +438,8 @@ public class TbPayServiceImpl implements TbPayService { orderInfo.setPayAmount(payMount); - orderInfo.setUserId(user.getUserId()); - orderInfo.setMemberId(user.getId().toString()); + orderInfo.setUserId(user.getId().toString()); + orderInfo.setMemberId(memberId); orderInfo.setPayType("deposit"); orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo())); return orderInfo; From 365bb5cd5e9950493d9984091aee64826f54d12b Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 29 Oct 2024 09:39:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20=E6=AD=A3=E5=BC=8F=E7=AB=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=89=E6=96=B9=E6=94=AF=E4=BB=98=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application-prod.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index 9ebb64ba..68de8525 100644 --- a/eladmin-system/src/main/resources/config/application-prod.yml +++ b/eladmin-system/src/main/resources/config/application-prod.yml @@ -143,3 +143,8 @@ file: cashier: server: wx: https://cashier.sxczgkj.cn/ + +thirdPay: + notify: + fstPay: https://pre-cashieradmin.sxczgkj.cn/notify/fstPay + fstReturn: https://pre-cashieradmin.sxczgkj.cn/notify/fstReturn From 2ba232f149252aa366494ba2a4527957f1e49e86 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 29 Oct 2024 09:51:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=E6=AD=A3=E5=BC=8F=E7=AB=AF?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eladmin-system/src/main/resources/config/application-prod.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index 68de8525..de47c59f 100644 --- a/eladmin-system/src/main/resources/config/application-prod.yml +++ b/eladmin-system/src/main/resources/config/application-prod.yml @@ -146,5 +146,5 @@ cashier: thirdPay: notify: - fstPay: https://pre-cashieradmin.sxczgkj.cn/notify/fstPay - fstReturn: https://pre-cashieradmin.sxczgkj.cn/notify/fstReturn + fstPay: https://cashieradmin.sxczgkj.cn/notify/fstPay + fstReturn: https://cashieradmin.sxczgkj.cn/notify/fstReturn