门店 id对应不上的问题
This commit is contained in:
@@ -216,9 +216,18 @@ public class PayServiceImpl implements PayService {
|
|||||||
}
|
}
|
||||||
payParam.getCheckOrderPay().setUserId(shopUser.getUserId());
|
payParam.getCheckOrderPay().setUserId(shopUser.getUserId());
|
||||||
OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay());
|
OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay());
|
||||||
if (!shopUser.getSourceShopId().equals(orderInfo.getShopId()) && !shopUser.getMainShopId().equals(orderInfo.getShopId())) {
|
if (shopInfo.getIsHeadShop().equals(1)) {
|
||||||
|
if (!shopUser.getMainShopId().equals(orderInfo.getShopId())) {
|
||||||
return CzgResult.failure("违规操作,请确认店铺后重试");
|
return CzgResult.failure("违规操作,请确认店铺后重试");
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
boolean exists = shopInfoService.exists(QueryWrapper.create()
|
||||||
|
.eq(ShopInfo::getMainId, shopInfo.getMainId())
|
||||||
|
.eq(ShopInfo::getId, orderInfo.getShopId()));
|
||||||
|
if(!exists){
|
||||||
|
return CzgResult.failure("违规操作,请确认店铺后重试");
|
||||||
|
}
|
||||||
|
}
|
||||||
if (shopUser.getAmount().compareTo(orderInfo.getOrderAmount()) < 0) {
|
if (shopUser.getAmount().compareTo(orderInfo.getOrderAmount()) < 0) {
|
||||||
return CzgResult.failure("会员余额不足");
|
return CzgResult.failure("会员余额不足");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user