Merge remote-tracking branch 'origin/dev_1_3_2_20220815' into dev_1_3_2_20220815

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityRewardServiceImpl.java

@@ -182,7 +182,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
         try {
             lock.lock();
             for (ActivityPlanRewardDto activityReward : activityPlanRewardDtos) {
-                int update = activityPlanRewardService.reduceStock(activityId, activityReward.getId());
+                int update = activityPlanRewardService.reduceStock(activityId, activityReward.getActivityReward().getId());
                 if (update == 0) {
                     continue;
                 }
@@ -201,7 +201,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
                 }
 
                 activityRewardName.append(activityReward.getActivityReward().getRewardName());
-                activityRewardIdList.add(activityReward.getId());
+                activityRewardIdList.add(activityReward.getActivityReward().getId());
             }
             // 发送活动获奖推送
             if (!StringUtil.isEmpty(activityRewardName)) {

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -802,8 +802,8 @@
     <select id="queryCourseHomeOfMonth" parameterType="map"
             resultType="com.yonge.cooleshow.biz.dal.vo.CourseHomeVo$CourseHomeInfoVo">
         select class_date_                                                            as `date`,
-               ifnull(case when status_ in ('NOT_START', 'ING') then count(1) end, 0) as undoneCount,
-               ifnull(case when status_ = 'COMPLETE' then count(1) end, 0)            as doneCount
+        sum( CASE WHEN status_ IN ( 'NOT_START', 'ING' ) THEN  1  else 0   END ) AS undoneCount,
+        sum( CASE WHEN status_ = 'COMPLETE' THEN  1 else 0 END ) AS doneCount
         from course_schedule
         where type_ = #{param.type}
           and status_ in ('NOT_START', 'ING', 'COMPLETE')