fix订单

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserController.java

@@ -56,12 +56,21 @@ public class UserController extends BaseController {
     /**
      * 收藏数等数据
      */
-    @ApiOperation("收藏数等数据")
+    @ApiOperation("我的列表数据")
     @GetMapping("/infoAttached")
     public AjaxResult infoAttached() {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         Map<String,Object> map = new HashMap<>();
         Long planSum = iUserService.planSum(loginUser.getUser().getUserId());
+        Long periodSum = iUserService.periodSum(loginUser.getUser().getUserId());
+        Long subscribeSum = iUserService.subscribeSum(loginUser.getUser().getUserId());
+        Long informSum = iUserService.informSum(loginUser.getUser().getUserId());
+        Long orderSum = iUserService.orderSum(loginUser.getUser().getUserId());
+        map.put("planSum",planSum);
+        map.put("periodSum",periodSum);
+        map.put("subscribeSum",subscribeSum);
+        map.put("informSum",informSum);
+        map.put("orderSum",orderSum);
         return AjaxResult.success(map);
     }
 

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -36,10 +36,7 @@ import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.mapper.UserMapper;
 import com.zhongzheng.modules.user.service.IUserPlanService;
 import com.zhongzheng.modules.user.service.IUserService;
-import com.zhongzheng.modules.user.vo.RanKingUser;
-import com.zhongzheng.modules.user.vo.UserPlanVo;
-import com.zhongzheng.modules.user.vo.UserStudyRecordVo;
-import com.zhongzheng.modules.user.vo.UserVo;
+import com.zhongzheng.modules.user.vo.*;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -620,7 +617,42 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         userPlanQueryBo.setUserId(userId);
         userPlanQueryBo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
         List<UserPlanVo> userPlanVos = userPlanService.queryList(userPlanQueryBo);
-        return null;
+        Calendar now = Calendar.getInstance();
+        Long planSum =0L;
+        for (UserPlanVo userPlanVo : userPlanVos) {
+            List<CalendarStudyVo> collect = userPlanVo.getCalendarStudyVo().stream().filter(CalendarStudyVo -> CalendarStudyVo.getMonth().equals((now.get(Calendar.MONTH) + 1))).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(collect)){
+                for (CalendarStudyVo calendarStudyVo : collect) {
+                    List<DayStudyVo> dayStudyVos = calendarStudyVo.getDayStudyList().stream().filter(CalendarStudyVo -> CalendarStudyVo.getDate().equals(now.get(Calendar.DAY_OF_MONTH))).collect(Collectors.toList());
+                    for (DayStudyVo dayStudyVo : dayStudyVos) {
+                        if (dayStudyVo.getPerform() != 1){
+                            planSum ++;
+                        }
+                    }
+                }
+            }
+        }
+        return planSum;
+    }
+
+    @Override
+    public Long periodSum(Long userId) {
+        return baseMapper.periodSum(userId);
+    }
+
+    @Override
+    public Long subscribeSum(Long userId) {
+        return baseMapper.subscribeSum(userId);
+    }
+
+    @Override
+    public Long informSum(Long userId) {
+        return baseMapper.informSum(userId);
+    }
+
+    @Override
+    public Long orderSum(Long userId) {
+        return baseMapper.orderSum(userId);
     }
 
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserMapper.java

@@ -37,4 +37,12 @@ public interface UserMapper extends BaseMapper<User> {
     Integer selectByRankOneByTime(@Param("hourse") Integer toInt,@Param("startTime") long startTime,@Param("endTime") long endTime);
 
     Integer selectLookNum(Long userId);
+
+    Long periodSum(Long userId);
+
+    Long subscribeSum(Long userId);
+
+    Long informSum(Long userId);
+
+    Long orderSum(Long userId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserService.java

@@ -88,4 +88,12 @@ public interface IUserService extends IService<User> {
 	Boolean bindIdCard(UserAppBindIdBo bo);
 
 	Long planSum(Long userId);
+
+    Long periodSum(Long userId);
+
+	Long subscribeSum(Long userId);
+
+	Long informSum(Long userId);
+
+	Long orderSum(Long userId);
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -226,4 +226,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND look_status = 0
     </select>
 
+    <select id="periodSum" parameterType="Long" resultType="Long">
+        SELECT
+            COUNT(1)
+        FROM
+            user_period up
+                LEFT JOIN user_period_status ups ON ups.period_id = up.id
+        WHERE
+            up.user_id = #{userId}
+          and ups.period_status =1
+          and ups.`status` in (0,3)
+    </select>
+    <select id="subscribeSum" parameterType="Long" resultType="Long">
+        SELECT
+            COUNT(1)
+        FROM
+            user_subscribe us
+        WHERE
+            us.user_id = #{userId}
+          AND us.subscribe_status = 1
+          AND us.exam_status = 0
+
+    </select>
+
+    <select id="informSum" parameterType="Long" resultType="Long">
+        SELECT
+            COUNT(1)
+        FROM
+            inform_user iu
+        WHERE
+            iu.user_id = #{userId}
+          and iu.receipt_status = 0
+    </select>
+
+    <select id="orderSum" parameterType="Long" resultType="Long">
+        SELECT
+            COUNT( 1 )
+        FROM
+            `order`
+        WHERE
+            user_id = #{userId}
+          AND order_status =0
+    </select>
+
 </mapper>