Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-19 75295401fba9b3c4b8cedc81f717987e196cc1d4

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

@@ -22,6 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -353,5 +354,43 @@
        }
    }

    /**
     * 查询所有现金支付的预约记录
     * @param appUserId
     * @return
     */
    @PostMapping("/base/site/queryPaymentSiteDetail")
    public List<SiteBooking> getAllSiteBookingList(@RequestBody Integer appUserId){
        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",appUserId));
    }

    /**
     * 查询所有玩湃币支付的预约记录
     * @param appUserId
     * @return
     */
    @PostMapping("/base/site/queryPlaypaiGoldSiteDetail")
    public List<SiteBooking> wanpaiGoldSiteBookingList(@RequestBody Integer appUserId){
        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)
                .eq("payType",3)
                .eq("appUserId",appUserId));
    }


}