Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-14 26e2592813b9263124d518d238262910e817d323

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

@@ -363,19 +363,15 @@
     * @param requestVo
     * @return
     */
    @ResponseBody
    @PostMapping("/base/site/queryPaymentSiteDetail")
    public List<SiteBooking> getAllSiteBookingList(@RequestBody BillingDataRequestVo requestVo){
        ArrayList<Integer> integers = new ArrayList<>();
        integers.add(1);
        integers.add(2);
        integers.add(3);
        integers.add(4);
        integers.add(5);
        return siteBookingService.list(new QueryWrapper<SiteBooking>()
                .in("status",integers)
                .ne("payType",3)
                .eq("appUserId",requestVo.getAppUserId())
                .between("payTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
    public RequestOfTypeVo getAllSiteBookingList(@RequestBody BillingDataRequestVo requestVo){
        RequestOfTypeVo typeVo = new RequestOfTypeVo();
        List<BillingRequestOfType> billingRequestOfTypes = siteBookingService.queryDatas(requestVo.getAppUserId(), requestVo.getMonthStart(), requestVo.getMonthEnd());
        if (billingRequestOfTypes.size() > 0 ){
            typeVo.setRequest(billingRequestOfTypes);
        }
        return typeVo;
    }

    /**
@@ -383,6 +379,7 @@
     * @param appUserId
     * @return
     */
    @ResponseBody
    @PostMapping("/base/site/queryPlaypaiGoldSiteDetail")
    public List<SiteBooking> wanpaiGoldSiteBookingList(@RequestBody Integer appUserId){
        ArrayList<Integer> integers = new ArrayList<>();
@@ -398,6 +395,7 @@
    }


    @ResponseBody
    @PostMapping("/base/site/getNewAddSiteList")
    public List<SiteVo> getAppUserSiteList(){
        List<SiteVo> siteVos = new ArrayList<>();