二期 管家小程序 bug

src/main/java/com/care/common/service/impl/CareEventOrderServiceImpl.java

@@ -180,6 +180,8 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                 CareOlder careOlder = this.careOlderService.getById(item.getOlderId());
                 CareEventOrderOlder ceoo = new CareEventOrderOlder();
                 BeanUtil.copyProperties(careOlder,ceoo);
+                ceoo.setOrgId(order.getOrgId());
+                ceoo.setStationId(order.getStationId());
                 ceoo.setOrderId(order.getId());
                 ceoo.setOlderId(item.getId());
                 if (order.getOlderId() == item.getId()){

src/main/java/com/care/keeper/controller/KeeperEventApiController.java

@@ -7,6 +7,7 @@ import com.care.common.util.PageResult;
 import com.care.common.util.Result;
 import com.care.common.vo.PageReqVO;
 import com.care.common.vo.order.*;
+import com.care.keeper.service.KeeperInfoApiService;
 import com.care.keeper.service.KeeperOrderApiService;
 import com.care.keeper.service.KeeperPassportService;
 import com.care.keeper.vo.HouseContactVO;
@@ -36,6 +37,9 @@ public class KeeperEventApiController {
     @Resource
     private KeeperOrderApiService keeperOrderApiService;
 
+    @Resource
+    private KeeperInfoApiService keeperInfoApiService;
+
     @Resource
     private KeeperPassportService keeperPassportService;
 
@@ -191,7 +195,7 @@ public class KeeperEventApiController {
     @ApiOperation(tags = {"首页"},value = "获取管家的服务人数")
     public Result<Integer> getFuwuCount( @RequestHeader(name = "token") String token){
         KeeperInfoVO current = this.keeperPassportService.checkToken(token);
-        return  Result.success("查询成功！",this.keeperOrderApiService.queryOlderCount(current));
+        return  Result.success("查询成功！",this.keeperInfoApiService.queryOlderCount(current.getId()));
     }
 
     @GetMapping("/myOrderStat")

src/main/java/com/care/keeper/controller/KeeperMemberApiController.java

@@ -58,8 +58,8 @@ public class KeeperMemberApiController {
         if(current.getStationId() != null) {
             current.setStationName(careStationService.getById(current.getStationId()).getName());
         }
-        //服务次数
-        current.setServeCount(this.keeperInfoApiService.getServeCount(current.getId()));
+        //服务人数
+        current.setServeCount(this.keeperInfoApiService.queryOlderCount(current.getId()));
 
         //老人列表
         List<OlderVO> olderVOList =  keeperInfoApiService.getOlderList(current.getId());

src/main/java/com/care/keeper/service/KeeperInfoApiService.java

@@ -42,6 +42,18 @@ public class KeeperInfoApiService {
     @Resource
     private CareSysUserService careSysUserService;
 
+    /**
+     * 管理服务人数
+     * @return
+     */
+    public int queryOlderCount(Long chambId){
+        return this.careSysUserService.queryOlderCountByChambId(chambId);
+    }
+
+    /**
+     * 管理服务人次
+     * @return
+     */
     public Integer getServeCount(Long chambId){
         QueryWrapper<CareEventOrderChamb> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(CareEventOrderChamb::getChambId,chambId).ne(CareEventOrderChamb::getStatus,"3");

src/main/java/com/care/keeper/service/KeeperOrderApiService.java

@@ -56,14 +56,7 @@ public class KeeperOrderApiService {
     @Resource
     RedisUtil redisUtil;
 
-    /**
-     * 管理服务人数
-     * @param keeperInfoVO
-     * @return
-     */
-    public int queryOlderCount(KeeperInfoVO keeperInfoVO){
-        return this.careSysUserService.queryOlderCountByChambId(keeperInfoVO.getId());
-    }
+
 
 
     /**

src/main/java/com/care/keeper/vo/KeeperInfoVO.java

@@ -70,7 +70,7 @@ public class KeeperInfoVO implements Serializable {
     @ApiModelProperty("头像")
     private String profile;
 
-    @ApiModelProperty("服务次数")
+    @ApiModelProperty("服务人数")
     private Integer serveCount;
 
     @ApiModelProperty("服务用户列表")