java/qijisheng.git

			@@ -3,6 +3,7 @@

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
			import com.ruoyi.account.api.model.AppUser;
			import com.ruoyi.account.api.model.UserCancellationLog;
			import com.ruoyi.account.api.model.UserCoupon;
			@@ -33,6 +34,7 @@
			import com.ruoyi.system.api.domain.SysUser;
			import com.ruoyi.system.api.feignClient.SysUserClient;
			import io.swagger.annotations.*;
			import org.springframework.util.CollectionUtils;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.RequestBody;
			import org.springframework.web.bind.annotation.RequestMapping;
			@@ -140,7 +142,11 @@
			@ResponseBody
			@PostMapping("/getCouponCount")
			public R<Long> getCouponCount(@RequestParam("userId") Long userId, @RequestParam("couponId") Integer couponId) {
			Long count = userCouponService.lambdaQuery().eq(UserCoupon::getAppUserId, userId).eq(UserCoupon::getCouponId, couponId).count();
			LambdaQueryChainWrapper<UserCoupon> chainWrapper = userCouponService.lambdaQuery().eq(UserCoupon::getCouponId, couponId);
			if(null != userId && -1 == userId){
			chainWrapper.eq(UserCoupon::getAppUserId, userId);
			}
			Long count = chainWrapper.count();
			return R.ok(count);
			}

			@@ -541,6 +547,9 @@
			@GetMapping("/detail")
			@ApiOperation(value = "用户列表-详情", tags = {"管理后台"})
			public R<AppUser> detail(Long id) {

			Long userid = tokenService.getLoginUser().getUserid();
			SysUser sysUser = sysUserClient.getSysUser(userid).getData();
			AppUser byId = appUserService.getById(id);
			if (byId.getShopId() != null) {
			R<Shop> shopById = shopClient.getShopById(Integer.parseInt(String.valueOf(byId.getShopId())));
			@@ -571,6 +580,14 @@
			List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();
			byId.setBottomUsers(list);
			//消费总金额
			R<List<Order>> orderR = remoteOrderGoodsClient.byShopId(sysUser.getObjectId());
			List<Order> orderList = orderR.getData();
			if (!CollectionUtils.isEmpty(orderList)){
			BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
			byId.setShopAmount(paymentAmount);
			}else {
			byId.setShopAmount(BigDecimal.ZERO);
			}
			return R.ok(byId);
			}

			@@ -644,11 +661,14 @@
			SysUser data = sysUserClient.getSysUser(userid).getData();
			Integer shopId = null;
			Set<Long> userId = null;
			Set<Long> userIdT = null;
			if(data.getRoleType() == 2){
			shopId = data.getObjectId();
			userId = orderClient.getAppUserByShoppingShop(shopId).getData();
			}
			UserStatistics userStatistics = appUserMapper.getUserStatistics(shopId, userId);
			UserStatistics userStatistics1 = appUserMapper.getUserStatistics(shopId, userIdT);
			userStatistics.setShopUser(userStatistics1.getShopUser());
			return R.ok(userStatistics);
			}