后台bug修改

44323

2023-11-15 f8c9479d2f33515376e5c0d87734edec2e15ad6f

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -351,7 +351,7 @@
            if(reservationSite.getIsHalf()==2){
                payMoney = new BigDecimal(site.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() ;
            }else {
                payMoney = new BigDecimal(site.getPlayPaiCoinOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() /2;
                payMoney = new BigDecimal(site.getPlayPaiCoinOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
            }
            if(appUser.getPlayPaiCoins().compareTo(payMoney.intValue()) < 0){

@@ -361,7 +361,7 @@
            if(reservationSite.getIsHalf()==2){
            payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() ;
            }else {
                payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue() / 2;
                payMoney = new BigDecimal(site.getCashPriceOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();

            }
        }
@@ -387,7 +387,7 @@
                JSONObject jsonObject = JSON.parseObject(coupon.getContent());
                Double num1 = jsonObject.getDouble("conditionalAmount");
                Double num2 = jsonObject.getDouble("deductionAmount");
                if(payMoney.compareTo(num1) <= 0){
                if(payMoney.compareTo(num1) < 0){
                    return ResultUtil.error("该优惠券无法使用");
                }

@@ -530,6 +530,7 @@
        String code = siteBooking.getOrderNo();
        Integer id = siteBooking.getId();
        ResultUtil alipay = payMoneyUtil.alipay("预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
        System.out.println("预约场地----"+alipay.getCode());
        if(alipay.getCode() == 200){
            new Thread(new Runnable() {
                @Override
@@ -557,6 +558,7 @@
//                                String s = data1.get("tradeStatus");
                                String tradeNo = resultUtil.getTradeNo();
                                String s = resultUtil.getTradeStatus();
                                System.out.println("ssssss"+s);
                                if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
                                    break;
                                }
@@ -621,7 +623,6 @@
            Site site = this.getById(siteBooking.getSiteId());
            String[] split = siteBooking.getTimes().split(";");
            if(site!=null){

                queryMySiteVo.setPlayPaiCoin(site.getPlayPaiCoin() * split.length);
            }
        }