java/JiaDianHuiShou.git

			@@ -79,8 +79,9 @@
			@RequestParam(value = "state", required = false) Integer state,
			@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
			@RequestParam(name = "userIds") List<Integer> userIds) {
			return R.ok(withdrawService.withdrawPage1(cityList,userIds,nickname, userPhone, applyForTime, state, Page.of(pageNum, pageSize)));
			@RequestParam(name = "userIds") List<Integer> userIds,
			@RequestParam("siteIds") List<String> siteIds) {
			return R.ok(withdrawService.withdrawPage1(cityList,userIds,nickname, userPhone, applyForTime, state, Page.of(pageNum, pageSize),siteIds));
			}
			/**
			* 查看提现记录详情
			@@ -137,9 +138,9 @@
			throw new GlobalException("订单信息异常！");
			}
			Boolean b = withdrawService.confirmWithdraw(openId, userId, order);
			if (!b) {
			throw new GlobalException("提现失败！");
			}
			// if (!b) {
			// throw new GlobalException("提现失败！");
			// }
			}else {
			Order order = orderService.lambdaQuery()
			.eq(Order::getId, withdraw.getOrderId())
			@@ -249,8 +250,9 @@
			@GetMapping(value = "/withdrawList1")
			public R<Page<UserWithdrawRecordVO>> withdrawList1(@RequestParam("cityList") List<String> cityList,@RequestParam("userId") Integer userId,
			@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
			return R.ok(withdrawService.withdrawList1(cityList,userId, Page.of(pageNum, pageSize)));
			@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
			@RequestParam("siteIds") List<String> siteIds) {
			return R.ok(withdrawService.withdrawList1(cityList,userId, Page.of(pageNum, pageSize),siteIds));
			}


			@@ -338,6 +340,7 @@
			withdrawDetailVO.setWithdrawalState(withdraw.getState());
			withdrawDetailVO.setWithdrawalTime(withdraw.getCreateTime());
			}
			withdrawDetailVO.setPackageInfo(order.getPackageInfo());
			withdrawDetailVO.setAddress(order.getAddress());
			if (null != serveRecord) {
			withdrawDetailVO.setPhoto(serveRecord.getPhoto());