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-10-27 10:31:19 +08:00
parent ac002cb1dd f1341b8c7f
commit 57ef7f91a1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-service/market-service/src/main/resources/mapper/MkLimitTimeDiscountMapper.xml
View File

@@ -19,7 +19,7 @@
AND (use_time_type = 'all' OR AND (use_time_type = 'all' OR
(use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time)) (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time))
AND FIND_IN_SET(#{useDay}, use_days) > 0 AND FIND_IN_SET(#{useDay}, use_days) > 0
ORDER BY sort, ORDER BY sort DESC,
update_time DESC, update_time DESC,
create_time DESC create_time DESC
LIMIT 1; LIMIT 1;

3
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -401,7 +401,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
orderInfo.setUserId(userInfo.getId()); orderInfo.setUserId(userInfo.getId());
} }
//会员价校验 //会员价校验
if (param.isVipPrice() && (shopUser == null || shopUser.getIsMemberPrice() == 0 || shopUser.getIsVip().equals(0))) { if (param.isVipPrice() && (shopUser == null || shopUser.getIsMemberPrice() == null
|| shopUser.getIsMemberPrice() == 0 || shopUser.getIsVip().equals(0))) {
throw new ValidateException("生成支付订单失败，仅会员可使用会员价"); throw new ValidateException("生成支付订单失败，仅会员可使用会员价");
} }