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

订单支付修改

Browse Source
This commit is contained in:
张松
2025-09-27 21:01:25 +08:00
parent 7df089f070
commit 2fa2ea6ea3
2 changed files with 4 additions and 4 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/OrderInfoServiceImpl.java
View File

@@ -389,7 +389,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
couponRecordMap.forEach((type, record) -> { couponRecordMap.forEach((type, record) -> {
//1-满减券，2-商品兑换券，3-折扣券，4-第二件半价券， 6-买一送一券， //1-满减券，2-商品兑换券，3-折扣券，4-第二件半价券， 6-买一送一券，
// 7-固定价格券，8-免配送费券 暂时没有 // 7-固定价格券，8-免配送费券 暂时没有
if (type == 2) {//商品券 if (type == 2) {//商品券z
ShopCoupon coupon = checkCoupon(record, param.isVipPrice()); ShopCoupon coupon = checkCoupon(record, param.isVipPrice());
if (coupon.getOtherCouponShare() != 1) { if (coupon.getOtherCouponShare() != 1) {
otherCouponShare.set(false); otherCouponShare.set(false);

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

@@ -259,9 +259,9 @@ public class PayServiceImpl implements PayService {
OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay()); OrderInfo orderInfo = checkPay(payParam.getCheckOrderPay());
ShopInfo shopInfo = shopInfoService.getById(payParam.getShopId()); ShopInfo shopInfo = shopInfoService.getById(payParam.getShopId());
AssertUtil.isNull(shopInfo, "店铺不存在"); AssertUtil.isNull(shopInfo, "店铺不存在");
if (!shopInfo.getIsAccountPay().equals(1)) { // if (!shopInfo.getIsAccountPay().equals(1)) {
return CzgResult.failure("支付失败，店铺暂未开启会员余额支付。"); // return CzgResult.failure("支付失败，店铺暂未开启会员余额支付。");
} // }
AssertUtil.isNull(payParam.getShopUserId(), "请选择付款人后重试"); AssertUtil.isNull(payParam.getShopUserId(), "请选择付款人后重试");
ShopUser shopUser = shopUserService.getById(payParam.getShopUserId()); ShopUser shopUser = shopUserService.getById(payParam.getShopUserId());
AssertUtil.isNull(shopUser, "支付失败 该店铺用户不存在"); AssertUtil.isNull(shopUser, "支付失败 该店铺用户不存在");