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; 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())); } diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index 9ebb64ba..de47c59f 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://cashieradmin.sxczgkj.cn/notify/fstPay + fstReturn: https://cashieradmin.sxczgkj.cn/notify/fstReturn