Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/20230922_mp_price_zero' into mp-server-test

Chris-zy 1 gadu atpakaļ
vecāks
revīzija
5020ac1202

+ 1 - 1
mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketOrderController.java

@@ -229,7 +229,7 @@ public class UserTicketOrderController extends BaseApiController {
             return AjaxResult.error("盲票已停售!");
         }
         //免费的盲票每个用户只能领取一次
-        if (orderSettleVO.getPayAmt() == 0){
+        if (orderSettleVO.getPayAmt() == 0 && orderSettleVO.getDiscountAmt() == 0){
             int orderCount = userTicketOrderService.count(
                     new LambdaQueryWrapper<UserTicketOrder>().eq(UserTicketOrder::getUserId, userId).eq(UserTicketOrder::getBoxId, orderSettleVO.getBoxId()));
             if (orderCount > 0) {