java/qijisheng.git

			@@ -521,7 +521,10 @@
			@GetMapping("/select")
			@ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"})
			public R<AppUser> select(String phone) {
			AppUser byId = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
			AppUser byId = appUserService.lambdaQuery()
			.eq(AppUser::getPhone, phone)
			.eq(AppUser::getDelFlag,0)
			.one();
			if (byId == null) {
			return R.fail("搜索失败，手机号错误。");
			}

			@@ -22,6 +22,7 @@
			import com.ruoyi.other.api.domain.PointSetting;
			import com.ruoyi.other.api.feignClient.GoodsClient;
			import com.ruoyi.other.api.feignClient.PointSettingClient;
			import org.springframework.util.CollectionUtils;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			@@ -135,12 +136,12 @@
			String phone,
			Integer id) {

			Long appUserId = null;
			List<Long> appUserIds = null;
			if (!StringUtils.isEmpty(phone)){
			AppUser appUser1 = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
			List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
			.like(AppUser::getPhone, phone));
			if (appUser1 != null){
			appUserId = appUser1.getId();
			if (!CollectionUtils.isEmpty(appUserList)){
			appUserIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList());
			}
			}

			@@ -148,7 +149,7 @@
			.isNull(status!=null&&(status==1\|\|status==3),UserCoupon::getUseTime)
			.isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
			.eq(UserCoupon::getCouponId, id)
			.eq(appUserId != null,UserCoupon::getAppUserId, appUserId)
			.in(appUserIds != null,UserCoupon::getAppUserId, appUserIds)
			.lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now()).page(Page.of(pageNum-1, pageSize));
			for (UserCoupon record : page.getRecords()) {
			record.setIdStr(record.getId().toString());

			@@ -290,7 +290,7 @@
			List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
			.eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
			.between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
			.orderByDesc(Order::getCreateTime));
			.orderByAsc(Order::getCreateTime));


			Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()

	ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史