更新bug修改

puzhibing

2024-02-05 640ff18d2d7f4be02ddb7f8f75e899f05545eb98

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

@@ -174,9 +174,7 @@
        System.out.println("=======date======" + day);
        List<String> strings = new ArrayList<>();

//        List<SiteBooking> siteBookings = siteClient.listBooks(id);
        List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).ne("status", 5).eq("nextName", siteName).like("times", day));


        if (siteName == null || siteName.equals("")) {
            siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).ne("status", 5).like("times", day));
@@ -329,7 +327,6 @@
     */
    @Override
    public ResultUtil reservationSite(Integer uid, ReservationSite reservationSite) throws Exception {

        Site site = this.getById(reservationSite.getId());
        AppUser appUser = appUserClient.queryAppUser(uid);
        String[] split = reservationSite.getTimes().split(";");
@@ -389,7 +386,6 @@
                    return ResultUtil.error("优惠券已过期");
                }
                if (userCoupon != null && coupon.getType() == 1) {//满减
//                {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
                    JSONObject jsonObject = JSON.parseObject(coupon.getContent());
                    Double num1 = jsonObject.getDouble("conditionalAmount");
                    Double num2 = jsonObject.getDouble("deductionAmount");
@@ -451,6 +447,9 @@
        }
        if (reservationSite.getPayType() == 3) {//玩湃币支付
            if (reservationSite.getIsHalf() == 2) {



                return playPaiCoinPaymentSite(appUser, Double.valueOf(site.getPlayPaiCoin()), siteBooking);
            } else {
                return playPaiCoinPaymentSite(appUser, site.getPlayPaiCoinOne(), siteBooking);
@@ -524,7 +523,7 @@
        return weixinpay;
    }


    private String smid = "2088330203191220";//平台支付宝商户号
    /**
     * 课程支付宝支付
     *
@@ -535,7 +534,21 @@
    public ResultUtil aliPaymentSite(Double paymentPrice, SiteBooking siteBooking) throws Exception {
        String code = siteBooking.getOrderNo();
        Integer id = siteBooking.getId();
        ResultUtil alipay = payMoneyUtil.alipay("预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
        // 判断预约的门店 属于哪个运营商
        Integer storeId = siteBooking.getStoreId();
        Store byId = storeService.getById(storeId);
        Integer operatorId = byId.getOperatorId();
        String smid1 = "";
        if (operatorId == null ){
            // 平台的门店
            smid1 = smid;
        }else if (operatorId == 0){
            smid1 = smid;
        }else{
            smid1 = siteService.getSMIDByOperatorId(operatorId);

        }
        ResultUtil alipay = payMoneyUtil.alipay(smid1,"预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
        System.out.println("预约场地----" + alipay.getCode());
        if (alipay.getCode() == 200) {
            new Thread(new Runnable() {
@@ -574,6 +587,20 @@
                                    siteBooking.setPayOrderNo(tradeNo);
                                    siteBookingService.updateById(siteBooking);
                                    System.err.println("======完成支付");
                                    // 判断预约的门店 属于哪个运营商
                                    Integer storeId = siteBooking.getStoreId();
                                    Store byId = storeService.getById(storeId);
                                    Integer operatorId = byId.getOperatorId();
                                    String smid1 = "";
                                    if (operatorId == null ){
                                        // 平台的门店
                                    }else if (operatorId == 0){
                                        smid1 = smid;
                                    }else{
                                        smid1 = siteService.getSMIDByOperatorId(operatorId);

                                    }
                                    payMoneyUtil.confirm(smid1,code,tradeNo,paymentPrice.toString());
                                    break;
                                }
                                if ("WAIT_BUYER_PAY".equals(s)) {
@@ -894,4 +921,9 @@
        return siteMapper.changeState(siteIds, type);

    }

    @Override
    public String getSMIDByOperatorId(Integer id) {
        return siteMapper.getSMIDByOperatorId(id);
    }
}