Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

 cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java

@@ -66,6 +66,15 @@
    private CityManagerClient cityManagerClient;

    /**
     * 通过运营商id查询运营商对应的支付宝商户号
     */
    @RequestMapping("/base/getSMIDByOperatorId")
    @ResponseBody
    public String getSMIDByOperatorId(Integer id) {
        // 获取运营商的管理员
        return siteService.getSMIDByOperatorId(id);
    }
    /**
     * 获取所有场地
     */
    @RequestMapping("/base/site/getList")
@@ -340,7 +349,6 @@
        }
    }


    /**
     * 预约场地支付宝回调
     *
@@ -356,7 +364,8 @@
            if (null != map) {
                String code = map.get("out_trade_no");
                String trade_no = map.get("trade_no");
                SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("orderNo", code).eq("state", 1));
                SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>()
                        .eq("orderNo", code).eq("state", 1));
                if (siteBooking.getStatus() == 0) {
                    siteBooking.setPayTime(new Date());
                    siteBooking.setStatus(1);