From 9477bec387de4da9afd6600f0322eb95ea9a4193 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 28 十月 2025 09:41:19 +0800
Subject: [PATCH] 查询预约场地可选时间段、价格、玩湃币价格

---
 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java |  329 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 214 insertions(+), 115 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index f0ca39a..91c4c53 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -37,8 +37,11 @@
 import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author zhibing.pu
@@ -79,6 +82,8 @@
 
     @Autowired
     private ISiteBookingService iSiteBookingService;
+    @Autowired
+    private ITSitePriceService sitePriceService;
 
     @Autowired
     private ISiteService siteService;
@@ -168,8 +173,6 @@
     }
 
 
-
-
     /**
      * 获取场地预约日期数据
      *
@@ -179,7 +182,7 @@
      * @throws Exception
      */
     @Override
-    public List<QuerySiteTimes> querySiteTimes(Integer id, String day, String halfName, String siteName) throws Exception {
+    public List<QuerySiteTimes> querySiteTimes(Integer id, String day, String halfName, String siteName, Integer targetAudience) throws Exception {
 
         System.out.println("=======date======" + day);
         List<String> strings = new ArrayList<>();
@@ -191,7 +194,7 @@
         }
 
 
-        System.out.println("=======siteBookings======" + siteBookings);
+        System.out.println("=======已预约列表======" + siteBookings);
         for (SiteBooking siteBooking : siteBookings) {
 
 
@@ -200,94 +203,185 @@
             if (siteBooking.getIsHalf() == 2) {
                 for (String s : split) {
                     String convertedValue = s.substring(11);
-                    strings.add(convertedValue);
+                    strings.add(convertedValue + (siteBooking.getTargetAudience() != null ? "," + siteBooking.getTargetAudience() : ",1"));
                 }
             } else {
                 if (halfName == null) {
                     for (String s : split) {
                         String convertedValue = s.substring(11);
-                        strings.add(convertedValue);
+                        strings.add(convertedValue + (siteBooking.getTargetAudience() != null ? "," + siteBooking.getTargetAudience() : ",1"));
                     }
                 }
 
                 if (siteBooking.getHalfName().equals(halfName)) {
                     for (String s : split) {
                         String convertedValue = s.substring(11);
-                        strings.add(convertedValue);
+                        strings.add(convertedValue + (siteBooking.getTargetAudience() != null ? "," + siteBooking.getTargetAudience() : ",1"));
                     }
 
                 }
             }
         }
-        System.out.println("======strings=======" + strings);
-
-
-        List<QuerySiteTimes> timeRanges = new ArrayList<>();
+        System.out.println("======已经预约时间段=======" + strings);
 
 
         Site site = siteService.getById(id);
-        System.out.println("================" + site);
-        String appointmentStartTime = site.getAppointmentStartTime();
-        String appointmentEndTime = site.getAppointmentEndTime();
-
-        String currentTime = appointmentStartTime;
-        while (currentTime.compareTo(appointmentEndTime) < 0) {
-            String nextTime = null;
-            if ("智慧场地".equals(site.getTypeName())) {
-                nextTime = getNextTimeOne(currentTime);
-            } else {
-                nextTime = getNextTime(currentTime);
-            }
-
-
-            String timeRange = currentTime + "-" + nextTime;
-            QuerySiteTimes orderDto = new QuerySiteTimes();
-            orderDto.setTime(timeRange);
-
-            LocalTime currentTime1 = LocalTime.now();
-            LocalTime targetTime = LocalTime.parse(currentTime);
-
-            boolean hasExceeded = currentTime1.isAfter(targetTime);
-//            if (hasExceeded){
-//                orderDto.setSelectable(0);
-//            }
-            if (strings.contains(timeRange)) {
-
-                orderDto.setSelectable(0);
-            } else {
-
-                String stime = day + " " + currentTime;
-                String etime = day + " " + nextTime;
-                orderDto.setSelectable(1);
-                // 查出lock
-                List<SiteLock> list = siteLockService.list(new LambdaQueryWrapper<SiteLock>().eq(SiteLock::getSiteId, id));
-                for (SiteLock siteLock : list) {
-                    boolean stringDateBetween = DateComparisonExample.isStringDateBetween(stime + " - " + etime, siteLock.getStartTime(), siteLock.getEndTime());
-                    if (stringDateBetween) {
-                        orderDto.setSelectable(0);
-                    }
-                    if (DateComparisonExample.isStringWithinTimeRange(stime, siteLock.getStartTime(), siteLock.getEndTime())) {
-                        orderDto.setSelectable(0);
-                    }
-                    if (DateComparisonExample.isStringWithinTimeRange(etime, siteLock.getStartTime(), siteLock.getEndTime())) {
-                        orderDto.setSelectable(0);
-                    }
-
-                }
-
-
-            }
-
-
-            timeRanges.add(orderDto);
-            currentTime = nextTime;
+        List<QuerySiteTimes> timeRanges = new ArrayList<>();
+        LocalDate date = LocalDate.parse(day);
+        DayOfWeek dayOfWeek = date.getDayOfWeek();
+        // 通过日期 确定周X 查询设置的可以约时间段和金额 封装基础时间段数据
+        LambdaQueryWrapper<TSitePrice> tSitePriceLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        tSitePriceLambdaQueryWrapper.eq(TSitePrice::getSiteId, id);
+        tSitePriceLambdaQueryWrapper.orderByAsc(TSitePrice::getStartTime);
+        tSitePriceLambdaQueryWrapper.eq(TSitePrice::getDayOfWeek, dayOfWeek.getValue());
+        if (StringUtils.hasLength(halfName)) {
+            tSitePriceLambdaQueryWrapper.eq(TSitePrice::getFieldType, 2);
+        } else {
+            tSitePriceLambdaQueryWrapper.eq(TSitePrice::getFieldType, 1);
         }
-        System.out.println("-------------" + timeRanges);
+        List<TSitePrice> sitePrice = sitePriceService.list(tSitePriceLambdaQueryWrapper);
+
+        for (TSitePrice tSitePrice : sitePrice) {
+            QuerySiteTimes querySiteTimes = new QuerySiteTimes();
+            querySiteTimes.setTime(tSitePrice.getStartTime() + "-" + tSitePrice.getEndTime());
+            querySiteTimes.setSelectable(1);
+            querySiteTimes.setSelectCount(0);
+            querySiteTimes.setSelectMaxCount(site.getWalkinCapacity());
+            querySiteTimes.setIsReserve(1);
+            querySiteTimes.setCashPrice(tSitePrice.getCashPrice());
+            querySiteTimes.setCoinPrice(tSitePrice.getCoinPrice());
+            String temp = tSitePrice.getStartTime() + "-" + tSitePrice.getEndTime();
+            List<String> booking = strings.stream().filter(e -> e.split(",")[0].equals(temp)).collect(Collectors.toList());
+            if (!booking.isEmpty()) {
+                // 已经预约了 判断是散客模式还是订场模式
+                Integer flag = 0;
+                // 散客预约人数
+                Integer count = 0;
+                for (String time : booking) {
+                    String s = time.split(",")[1];
+                    if (s.equals("1")) {
+                        // 订场 不可再预约了
+                        querySiteTimes.setIsReserve(1);
+                        querySiteTimes.setSelectable(0);
+                        flag = 1;
+                        break;
+                    }
+                    count++;
+                }
+                querySiteTimes.setSelectCount(count);
+                if (flag == 0) {
+                    // 当前时间段还没有预约
+                    Integer walkinCapacity = site.getWalkinCapacity();
+                    // 计算散客预约人数和最大散客容纳数
+                    System.err.println("预约人数" + count);
+                    System.err.println("最大散客容纳数" + walkinCapacity);
+                    if (walkinCapacity <= count) {
+                        // 不可预约 也不能散客
+                        System.err.println("不可预约 也不能散客");
+                        querySiteTimes.setSelectable(0);
+                        querySiteTimes.setIsReserve(0);
+                    }
+                }
+            }
+            // 查出lock
+            List<SiteLock> list = siteLockService.list(new LambdaQueryWrapper<SiteLock>().eq(SiteLock::getSiteId, id));
+            for (SiteLock siteLock : list) {
+                String stime = day + " " + tSitePrice.getStartTime();
+                String etime = day + " " + tSitePrice.getEndTime();
+                boolean stringDateBetween = DateComparisonExample.isStringDateBetween(stime + " - " + etime, siteLock.getStartTime(), siteLock.getEndTime());
+                if (stringDateBetween) {
+                    System.err.println("11111预约开始" + stime + "预约结束" + etime);
+                    querySiteTimes.setSelectable(0);
+                    querySiteTimes.setIsReserve(1);
+                }
+                if (DateComparisonExample.isStringWithinTimeRange(stime, siteLock.getStartTime(), siteLock.getEndTime())) {
+                    System.err.println("22222预约开始" + stime + "预约结束" + etime);
+
+                    querySiteTimes.setSelectable(0);
+                    querySiteTimes.setIsReserve(1);
+                }
+                if (DateComparisonExample.isStringWithinTimeRange(etime, siteLock.getStartTime(), siteLock.getEndTime())) {
+                    System.err.println("33333预约开始" + stime + "预约结束" + etime);
+
+                    querySiteTimes.setSelectable(0);
+                    querySiteTimes.setIsReserve(1);
+                }
+            }
+            timeRanges.add(querySiteTimes);
+        }
+        System.out.println("封装后的基础时间段和价格" + site);
+
+//        System.out.println("================" + site);
+//        String appointmentStartTime = site.getAppointmentStartTime();
+//        String appointmentEndTime = site.getAppointmentEndTime();
+//
+//        String currentTime = appointmentStartTime;
+//        while (currentTime.compareTo(appointmentEndTime) < 0) {
+//            String nextTime = null;
+//            if ("智慧场地".equals(site.getTypeName())) {
+//                nextTime = getNextTimeOne(currentTime);
+//            } else {
+//                nextTime = getNextTime(currentTime);
+//            }
+//
+//
+//            String timeRange = currentTime + "-" + nextTime;
+//            QuerySiteTimes orderDto = new QuerySiteTimes();
+//            orderDto.setTime(timeRange);
+//
+//            LocalTime currentTime1 = LocalTime.now();
+//            LocalTime targetTime = LocalTime.parse(currentTime);
+//
+//            boolean hasExceeded = currentTime1.isAfter(targetTime);
+////            if (hasExceeded){
+////                orderDto.setSelectable(0);
+////            }
+//            if (strings.contains(timeRange)) {
+//
+//                orderDto.setSelectable(0);
+//            } else {
+//
+//                String stime = day + " " + currentTime;
+//                String etime = day + " " + nextTime;
+//                orderDto.setSelectable(1);
+//                // 查出lock
+//                List<SiteLock> list = siteLockService.list(new LambdaQueryWrapper<SiteLock>().eq(SiteLock::getSiteId, id));
+//                for (SiteLock siteLock : list) {
+//                    boolean stringDateBetween = DateComparisonExample.isStringDateBetween(stime + " - " + etime, siteLock.getStartTime(), siteLock.getEndTime());
+//                    if (stringDateBetween) {
+//                        orderDto.setSelectable(0);
+//                    }
+//                    if (DateComparisonExample.isStringWithinTimeRange(stime, siteLock.getStartTime(), siteLock.getEndTime())) {
+//                        orderDto.setSelectable(0);
+//                    }
+//                    if (DateComparisonExample.isStringWithinTimeRange(etime, siteLock.getStartTime(), siteLock.getEndTime())) {
+//                        orderDto.setSelectable(0);
+//                    }
+//
+//                }
+//
+//
+//            }
+//
+//
+//            timeRanges.add(orderDto);
+//            currentTime = nextTime;
+//        }
+        System.out.println("----最后封装的时间段数据------" + timeRanges);
 
         return timeRanges;
 
 
     }
+
+//    public static void main(String[] args) {
+//        String temp = "09:00-09:30";
+//        List<String> strings = new ArrayList<>();
+//        strings.add("09:00-09:30,1");
+//        List<String> booking = strings.stream().filter(e -> e.split(",")[0].equals(temp)).collect(Collectors.toList());
+//
+//        System.err.println( booking);
+//    }
 
 
     public static String getNextTime(String currentTime) {
@@ -340,17 +434,31 @@
         Site site = this.getById(reservationSite.getId());
         AppUser appUser = appUserClient.queryAppUser(uid);
         String[] split = reservationSite.getTimes().split(";");
+        // 所选时间段 所需总计金额
+        BigDecimal money = BigDecimal.ZERO;
+        BigDecimal playCoin = BigDecimal.ZERO;
         for (String s : split) {
             String day = s.split(" ")[0];
             String time = s.split(" ")[1];
-            List<QuerySiteTimes> querySiteTimes = querySiteTimes(reservationSite.getId(), day, reservationSite.getHalfName(), reservationSite.getNextName());
+            List<QuerySiteTimes> querySiteTimes = querySiteTimes(reservationSite.getId(), day, reservationSite.getHalfName(), reservationSite.getNextName(), reservationSite.getTargetAudience());
             for (QuerySiteTimes querySiteTime : querySiteTimes) {
                 if (querySiteTime.getTime().equals(time) && querySiteTime.getSelectable() == 0) {
-                    return ResultUtil.error("【" + s + "】" +
-                            "时间段已被使用");
+                    if (querySiteTime.getIsReserve() == 1) {
+                        return ResultUtil.error("【" + s + "】" +
+                                "时间段已被使用");
+                    } else {
+                        return ResultUtil.error("【" + s + "】" +
+                                "时间段散客人数已满");
+                    }
+                }
+                if (querySiteTime.getTime().equals(time)) {
+                    money = money.add(querySiteTime.getCashPrice());
+                    playCoin = playCoin.add(querySiteTime.getCoinPrice());
+                    break;
                 }
             }
         }
+
 
         String s_time = split[0];
         String e_time = split[split.length - 1];
@@ -359,21 +467,10 @@
         e_time = s1[0] + " " + s1[1].split("-")[1];
         SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-        Double payMoney = 0D;
         if (reservationSite.getPayType() == 3) {
-            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();
-            }
-            if (appUser.getPlayPaiCoins().compareTo(payMoney.intValue()) < 0) {
+
+            if (appUser.getPlayPaiCoins().compareTo(playCoin.intValue()) < 0) {
                 return new ResultUtil(3, "玩湃币不足");
-            }
-        } else {
-            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.getCashPriceOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
             }
         }
 
@@ -394,19 +491,19 @@
                     JSONObject jsonObject = JSON.parseObject(coupon.getContent());
                     Double num1 = jsonObject.getDouble("conditionalAmount");
                     Double num2 = jsonObject.getDouble("deductionAmount");
-                    if (payMoney.compareTo(num1) < 0) {
+                    if (money.compareTo(new BigDecimal(num1)) < 0) {
                         return ResultUtil.error("该优惠券无法使用");
                     }
 
-                    payMoney = new BigDecimal(payMoney).subtract(new BigDecimal(num2)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                    money = money.subtract(new BigDecimal(num2)).setScale(2, RoundingMode.HALF_EVEN);
                 }
                 if (userCoupon != null && coupon.getType() == 2) {//代金券
                     JSONObject jsonObject = JSON.parseObject(coupon.getContent());
                     Double num1 = jsonObject.getDouble("conditionalAmount");
-                    if (payMoney.compareTo(num1) <= 0) {
+                    if (money.compareTo(new BigDecimal(num1)) <= 0) {
                         return ResultUtil.error("该优惠券无法使用");
                     }
-                    payMoney = new BigDecimal(payMoney).subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+                    money = money.subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN);
                 }
                 userCoupon.setStatus(2);
                 userCouponClient.updateUserCoupon(userCoupon);
@@ -429,10 +526,11 @@
         siteBooking.setBooker(reservationSite.getBooker());
         siteBooking.setPhone(reservationSite.getPhone());
         siteBooking.setPayType(reservationSite.getPayType());
-        siteBooking.setPayMoney(payMoney);
+        siteBooking.setPayMoney(money.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
         siteBooking.setUserCouponId(reservationSite.getCouponId());
         siteBooking.setStatus(0);
         siteBooking.setState(1);
+        siteBooking.setTargetAudience(reservationSite.getTargetAudience());
         siteBooking.setInsertTime(new Date());
 
         siteBooking.setNextName(reservationSite.getNextName());
@@ -442,23 +540,21 @@
 
 
         if (reservationSite.getPayType() == 1) {//微信支付
-            ResultUtil resultUtil = weChatPaymentSite(payMoney, siteBooking);
+            ResultUtil resultUtil = weChatPaymentSite(money.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), siteBooking);
             return resultUtil;
         }
         if (reservationSite.getPayType() == 2) {//支付宝支付
-            return aliPaymentSite(payMoney, siteBooking);
+            return aliPaymentSite(money.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), siteBooking);
         }
         if (reservationSite.getPayType() == 3) {//玩湃币支付
-            if (reservationSite.getIsHalf() == 2) {
-                return playPaiCoinPaymentSite(appUser, Double.valueOf(site.getPlayPaiCoin()), siteBooking);
-            } else {
-                return playPaiCoinPaymentSite(appUser, site.getPlayPaiCoinOne(), siteBooking);
-            }
+            return playPaiCoinPaymentSite(appUser, playCoin.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), siteBooking);
+
         }
         return ResultUtil.success();
     }
 
     private String smidVx = "2088330203191220";//平台微信商户号
+
     /**
      * 课程微信支付
      *
@@ -471,19 +567,19 @@
         Integer id = siteBooking.getId();
         Site byId = siteService.getById(siteBooking.getSiteId());
         Store store = storeService.getById(byId.getStoreId());
-        if (store.getOperatorId()==null || store.getOperatorId()==0){
+        if (store.getOperatorId() == null || store.getOperatorId() == 0) {
             // 平台
-                    ResultUtil weixinpay = payMoneyUtil.weixinpay("预约场地", id.toString(), code, paymentPrice.toString(),
-                "/base/site/weChatPaymentSiteCallback", "APP", "");
-                    return weixinpay;
-        }else{
-            String smidVx= operatorUserService.getmerchantNumberByOperatorId(store.getOperatorId());
-            if (!StringUtils.hasLength(smidVx)){
+            ResultUtil weixinpay = payMoneyUtil.weixinpay("预约场地", id.toString(), code, paymentPrice.toString(),
+                    "/base/site/weChatPaymentSiteCallback", "APP", "");
+            return weixinpay;
+        } else {
+            String smidVx = operatorUserService.getmerchantNumberByOperatorId(store.getOperatorId());
+            if (!StringUtils.hasLength(smidVx)) {
                 return ResultUtil.error("运营商未配置微信商户号,获取支付失败!");
             }
-            return payMoneyUtil.weixinpayV3(smidVx,"预约场地"
-                    ,code,"/base/site/weChatPaymentSiteCallback1",
-                    paymentPrice.toString(),id.toString());
+            return payMoneyUtil.weixinpayV3(smidVx, "预约场地"
+                    , code, "/base/site/weChatPaymentSiteCallback1",
+                    paymentPrice.toString(), id.toString());
         }
 
 
@@ -494,6 +590,7 @@
     private IOperatorUserService operatorUserService;
     @Autowired
     private StoreClient storeClient;
+
     /**
      * 课程支付宝支付
      *
@@ -509,16 +606,16 @@
         Store byId = storeService.getById(storeId);
         Integer operatorId = byId.getOperatorId();
         String smid1 = "";
-        if (operatorId == null ){
+        if (operatorId == null) {
             // 平台的门店
             smid1 = smid;
-        }else if (operatorId == 0){
+        } else if (operatorId == 0) {
             smid1 = smid;
-        }else{
+        } else {
             smid1 = siteService.getmerchantNumberAliByOperatorId(operatorId);
 
         }
-        ResultUtil alipay = payMoneyUtil.alipay(smid1,"预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
+        ResultUtil alipay = payMoneyUtil.alipay(smid1, "预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
         System.out.println("预约场地----" + alipay.getCode());
         if (alipay.getCode() == 200) {
             String finalSmid = smid1;
@@ -588,7 +685,7 @@
         String randomCode = UUIDUtil.getRandomCode(16);
 
         String proportionByOperatorId = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
-                .eq("operatorId",operatorId)).getAlipayProportion();
+                .eq("operatorId", operatorId)).getAlipayProportion();
         // 支付宝分账比例
         String s1 = proportionByOperatorId.split(",")[1];
         double i = Double.parseDouble(s1);
@@ -602,7 +699,7 @@
                 "  \"royalty_parameters\":[" +
                 "    {" +
                 "      \"royalty_type\":\"transfer\"," +
-                "      \"trans_out\":\"" + storeClient.getSMIDByOperatorId(operatorId)+ "\"," +
+                "      \"trans_out\":\"" + storeClient.getSMIDByOperatorId(operatorId) + "\"," +
                 "      \"trans_out_type\":\"userId\"," +
                 "      \"trans_in_type\":\"userId\"," +
                 "      \"trans_in\":\"" + smid + "\"," +
@@ -623,6 +720,7 @@
             System.out.println("调用失败");
         }
     }
+
     /**
      * 玩湃币支付
      *
@@ -713,16 +811,16 @@
         Store store = storeService.getById(storeId);
 
         if (siteBooking.getPayType() == 1) {//微信支付
-            if (store.getOperatorId()!=null && store.getOperatorId()!=0){
-                String smidVx= operatorUserService.getmerchantNumberByOperatorId(store.getOperatorId());
-                if (!StringUtils.hasLength(smidVx)){
+            if (store.getOperatorId() != null && store.getOperatorId() != 0) {
+                String smidVx = operatorUserService.getmerchantNumberByOperatorId(store.getOperatorId());
+                if (!StringUtils.hasLength(smidVx)) {
                     return ResultUtil.error("运营商未配置微信商户号,获取支付失败!");
                 }
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
                 String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);// 退款单号
                 // 运营商退款
                 payMoneyUtil.weixinRefundV3(smidVx, code, siteBooking.getPayOrderNo(), siteBooking.getPayMoney().toString(), "/base/site/cancelMySiteCallback1");
-            }else{
+            } else {
                 Map<String, String> map = payMoneyUtil.wxRefund(siteBooking.getPayOrderNo(), siteBooking.getOrderNo(), siteBooking.getPayMoney().toString(),
                         siteBooking.getPayMoney().toString(), "/base/site/cancelMySiteCallback");
                 if (null == map) {
@@ -946,6 +1044,7 @@
     public String getSMIDByOperatorId(Integer id) {
         return siteMapper.getSMIDByOperatorId(id);
     }
+
     @Override
     public String getmerchantNumberByOperatorId(Integer id) {
         return siteMapper.getmerchantNumberByOperatorId(id);

--
Gitblit v1.7.1