czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-09-30 10:57:11 +08:00
parent 7f072067f3 af8c75157c
commit 87a9d8b976
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
View File

@@ -237,7 +237,7 @@ public class PayServiceImpl implements PayService {
}
payParam.getCheckOrderPay().setUserId(shopUser.getUserId());
OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay());
if (!shopUser.getSourceShopId().equals(orderInfo.getShopId())) {
if (!shopUser.getSourceShopId().equals(orderInfo.getShopId()) && !shopUser.getMainShopId().equals(orderInfo.getShopId())) {
return CzgResult.failure("违规操作，请确认店铺后重试");
}
if (shopUser.getAmount().compareTo(orderInfo.getOrderAmount()) < 0) {