czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev' into test

Browse Source
This commit is contained in:
SongZhang
2024-10-29 14:37:22 +08:00
parent 3b9de3bd56 2ba232f149
commit e79e527bfd
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
View File

@@ -438,8 +438,8 @@ public class TbPayServiceImpl implements TbPayService {
orderInfo.setPayAmount(payMount); orderInfo.setPayAmount(payMount);
orderInfo.setUserId(user.getUserId()); orderInfo.setUserId(user.getId().toString());
orderInfo.setMemberId(user.getId().toString()); orderInfo.setMemberId(memberId);
orderInfo.setPayType("deposit"); orderInfo.setPayType("deposit");
orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo())); orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo()));
return orderInfo; return orderInfo;

3
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -604,7 +604,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
// 会员点单 // 会员点单
TbCashierCart cashierCart = cashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>() TbCashierCart cashierCart = cashierCartMapper.selectOne(new LambdaQueryWrapper<TbCashierCart>()
.eq(TbCashierCart::getShopId, removeCartDTO.getShopId()) .eq(TbCashierCart::getShopId, removeCartDTO.getShopId())
.eq(TbCashierCart::getUseType, removeCartDTO.getUseType())
.eq(TbCashierCart::getId, removeCartDTO.getCartId())); .eq(TbCashierCart::getId, removeCartDTO.getCartId()));
if (cashierCart == null) { if (cashierCart == null) {
throw new BadRequestException("购物车商品不存在"); throw new BadRequestException("购物车商品不存在");
@@ -619,7 +618,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbOrderDetail::getShopId, cashierCart.getShopId()) .eq(TbOrderDetail::getShopId, cashierCart.getShopId())
.eq(TbOrderDetail::getProductId, cashierCart.getProductId()) .eq(TbOrderDetail::getProductId, cashierCart.getProductId())
.eq(TbOrderDetail::getProductSkuId, cashierCart.getSkuId()) .eq(TbOrderDetail::getProductSkuId, cashierCart.getSkuId())
.eq(TbOrderDetail::getUseType, removeCartDTO.getUseType()) .eq(TbOrderDetail::getCartId, cashierCart.getId())
.isNull(TbOrderDetail::getPlaceNum) .isNull(TbOrderDetail::getPlaceNum)
.eq(TbOrderDetail::getOrderId, cashierCart.getOrderId())); .eq(TbOrderDetail::getOrderId, cashierCart.getOrderId()));
} }

5
eladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -143,3 +143,8 @@ file:
cashier: cashier:
server: server:
wx: https://cashier.sxczgkj.cn/ wx: https://cashier.sxczgkj.cn/
thirdPay:
notify:
fstPay: https://cashieradmin.sxczgkj.cn/notify/fstPay
fstReturn: https://cashieradmin.sxczgkj.cn/notify/fstReturn