查询酒店详情时查询评分

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/HotelController.java

@@ -174,22 +174,15 @@ public class HotelController extends WebConfig {
     @ApiVersion(group = ApiVersionConstant.FAP_MALLAPI101)
     public Result<BusHotel> queryById(@RequestParam(name = "id", required = true) String id) {
         BusHotel busHotel = busHotelService.getById(id);
-
-//        String token = UUID.randomUUID().toString();
-//        ThirdSession thirdSession = new ThirdSession();
-//        thirdSession.setTenantId("5");
-//        thirdSession.setAppId("wx25c23ef33ba80ee5");
-//        thirdSession.setSessionKey("");
-//        thirdSession.setWxUserId("111111111");
-//        thirdSession.setOpenId("");
-//        thirdSession.setUserId("111111111");
-//
-//        String key = CommonConstant.PREFIX_WX_APP_USER_TOKEN + token;
-//        // 设置token缓存有效时间
-//        redisUtil.set(key, com.alibaba.fastjson.JSON.toJSONString(thirdSession));
-////        redisUtil.set(key, JSONUtils.toJSONString(thirdSession));
-//        redisUtil.expire(key, JwtUtil.EXPIRE_TIME * 24 * 30 / 1000);
-//        busHotel.setTenantId(token);
+        LambdaQueryWrapper<CesOrderComment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(CesOrderComment::getHotelId, busHotel.getId());
+        lambdaQueryWrapper.eq(CesOrderComment::getCommentType, 1);
+        List<CesOrderComment> list = cesOrderCommentService.list(lambdaQueryWrapper);
+        if (ObjectUtils.isNotEmpty(list)) {
+            busHotel.setCommentNum(list.size());
+            Double score = list.stream().collect(Collectors.averagingDouble(CesOrderComment::getScore));
+            busHotel.setScore(score);
+        }
         return Result.OK(busHotel);
     }
 

jeecg-mall-api/src/main/java/org/jeecg/modules/bus/controller/MemberCardController.java

@@ -238,6 +238,9 @@ public class MemberCardController extends WebConfig {
 																@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 																@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 																HttpServletRequest req) {
+		if(StringUtils.isBlank(busMemberBalanceLog.getMemberId())){
+			return Result.error("缺少会员id");
+		}
 		String tenantId = TenantContextHolder.getTenantId();
 		LambdaQueryWrapper<BusMemberBalanceLog> queryWrapper = QueryGenerator.initQueryWrapper(busMemberBalanceLog, req.getParameterMap()).lambda();
 		queryWrapper.eq(BusMemberBalanceLog::getTenantId,tenantId);
@@ -255,6 +258,9 @@ public class MemberCardController extends WebConfig {
 																		  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 																		  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 																		  HttpServletRequest req) {
+		if(StringUtils.isBlank(busMemberPointLog.getMemberId())){
+			return Result.error("缺少会员id");
+		}
 		String tenantId = TenantContextHolder.getTenantId();
 		LambdaQueryWrapper<BusMemberPointLog> queryWrapper = QueryGenerator.initQueryWrapper(busMemberPointLog, req.getParameterMap()).lambda();
 		queryWrapper.eq(BusMemberPointLog::getTenantId,tenantId);
@@ -301,26 +307,27 @@ public class MemberCardController extends WebConfig {
 		busMemberBalanceLog.setPaymentMethod("");
 		busMemberBalanceLog.setTenantId(tenantId);
 		busMemberBalanceLog.setStatus(0);
-		busMemberBalanceLogService.saveBalance(busMemberBalanceLog);
-
-		//创建业务消息信息
-		LambdaQueryWrapper<SysUser> lambdaQueryWrapper3 = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper3.eq(SysUser::getDelFlag, 0);
-		lambdaQueryWrapper3.eq(SysUser::getRelTenantIds, busMemberBalanceLog.getTenantId());
-		List<SysUser> sysUsers = sysUserService.list(lambdaQueryWrapper3);
-		String userIds = "";
-		for (SysUser sysUser : sysUsers) {
-			userIds += sysUser.getUsername() + ",";
-		}
-		if (userIds.length() > 0) {
-			MessageDTO messageDTO = new MessageDTO();
-			messageDTO.setFromUser("");
-			messageDTO.setToUser(userIds);
-			messageDTO.setTitle("用户会员卡充值余额");
-			messageDTO.setContent("用户会员卡充值余额");
-			messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
-			sysBaseAPI.sendSysAnnouncement(messageDTO);
+		Result result = busMemberBalanceLogService.saveBalance(busMemberBalanceLog);
+		if (result.isSuccess()) {
+			//创建业务消息信息
+			LambdaQueryWrapper<SysUser> lambdaQueryWrapper3 = new LambdaQueryWrapper<>();
+			lambdaQueryWrapper3.eq(SysUser::getDelFlag, 0);
+			lambdaQueryWrapper3.eq(SysUser::getRelTenantIds, busMemberBalanceLog.getTenantId());
+			List<SysUser> sysUsers = sysUserService.list(lambdaQueryWrapper3);
+			String userIds = "";
+			for (SysUser sysUser : sysUsers) {
+				userIds += sysUser.getUsername() + ",";
+			}
+			if (userIds.length() > 0) {
+				MessageDTO messageDTO = new MessageDTO();
+				messageDTO.setFromUser("");
+				messageDTO.setToUser(userIds);
+				messageDTO.setTitle("用户会员卡充值余额");
+				messageDTO.setContent("用户会员卡充值余额");
+				messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
+				sysBaseAPI.sendSysAnnouncement(messageDTO);
+			}
 		}
-		return Result.OK("添加成功！");
+		return result;
 	}
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusHotel.java

@@ -273,11 +273,11 @@ public class BusHotel implements Serializable {
 
     @ApiModelProperty(value = "评分")
     @TableField(exist = false)
-    private Integer score;
+    private Double score;
 
     @ApiModelProperty(value = "评论数")
     @TableField(exist = false)
-    private BigDecimal commentNum;
+    private Integer commentNum;
 
     @ApiModelProperty(value = "距离")
     @TableField(exist = false)