zjh20240911

zjh

2024-09-11 3844954e02e67611fd57dafa236ee2c20e258b78

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -893,7 +893,7 @@
            return AjaxResult.error("不可重复登记");
        }


        TjFlowingWater tjFlowingWater = new TjFlowingWater();
        LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
        wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
        wq1.eq(TjReservation::getIsExpire, 2);
@@ -958,6 +958,9 @@
            tjOrder.setFinishTime(new Date());
            tjOrder.setCheckStatus(1);
            tjOrder.setStatus(TjConstants.TJ_WAIT);
            tjFlowingWater.setPayStasus(1L);
        }else {
            tjFlowingWater.setPayStasus(0L);
        }
        if (tjOrderService.save(tjOrder)) {

@@ -973,8 +976,7 @@
            cusNumber += 1;
            tjCustomer.setCusNumber(cusNumber);
            BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
            TjFlowingWater tjFlowingWater = new TjFlowingWater();
            tjFlowingWater.setPayStasus(0L);

            if ("1".equals(tjOrder.getTjType())) {
                if (null != tjReservation && tjReservation.getPayType() == 1) {
                    tjFlowingWater.setPayStasus(3L);