Merge branch 'feature/1113-vipCourse' into develop-new

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/SysConfigConstant.java

@@ -136,6 +136,7 @@ public interface SysConfigConstant {
      * @updateTime 2022/4/20 11:43
      */
     String GOOD_LOGO_PRACTICE = "good_logo_practice";
+    String GOOD_LOGO_VIP_COURSE = "good_logo_vip_course";
     /***
      * 商品直播课图片
      * @author liweifan

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/CourseScheduleDao.java

@@ -255,7 +255,7 @@ public interface CourseScheduleDao extends BaseMapper<CourseSchedule> {
             "page") IPage<UserBindingCourseWrapper> page, @Param("query") TeacherBindingUserQueryInfo.BindingStudentCourseQuery query);
 
     Integer countStudentOverCourse(@Param("userId") Long userId,
-                                @Param("monday") Date monday,
-                                @Param("sunday") Date sunday,
+                                @Param("monday") String monday,
+                                @Param("sunday") String sunday,
                                 @Param("courseStatus") String courseStatus);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SysMusicCompareRecordDao.java

@@ -71,7 +71,7 @@ public interface SysMusicCompareRecordDao extends BaseDAO<Long, SysMusicCompareR
 
     List<SysMusicCompareRecord> selectByIds(@Param("musicPracticeRecordIds") List<Long> musicPracticeRecordIds);
 
-    Long countStudentPracticeTime(@Param("userId") Long userId, @Param("monday") Date monday, @Param("sunday") Date sunday);
+    Long countStudentPracticeTime(@Param("userId") Long userId, @Param("monday") String monday, @Param("sunday") String sunday);
 
     TeacherIndexWrapper.PracticeSummaryDto getStudentTrainOverView(@Param("studentIds") List<Long> studentIds,
 																   @Param("param") TeacherIndexWrapper.SummarySearch summarySearch);

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

@@ -110,8 +110,6 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
     @Autowired
     private TeacherSubjectPriceService teacherSubjectPriceService;
     @Autowired
-    private TeacherTotalService teacherTotalService;
-    @Autowired
     private SysMessageService sysMessageService;
     @Autowired
     private HolidaysFestivalsDao holidaysFestivalsDao;

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

@@ -12,16 +12,16 @@ import com.google.common.collect.Lists;
 import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.auth.config.CustomerServiceConfig;
-import com.yonge.cooleshow.biz.dal.dao.*;
+import com.yonge.cooleshow.biz.dal.dao.StudentDao;
+import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
+import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
+import com.yonge.cooleshow.biz.dal.dao.UserBindingTeacherDao;
 import com.yonge.cooleshow.biz.dal.dto.search.QueryMyFollowSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.enums.im.EImUserFriendSourceForm;
 import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
-import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumMapper;
-import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumRefMapper;
 import com.yonge.cooleshow.biz.dal.mapper.TenantGroupAlbumMapper;
 import com.yonge.cooleshow.biz.dal.mapper.TenantGroupMapper;
 import com.yonge.cooleshow.biz.dal.mapper.UserTenantBindRecordMapper;
@@ -52,7 +52,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -71,70 +70,47 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> implements StudentService {
-    @Autowired
+    @Resource
     private RedissonClient redissonClient;
-    @Autowired
+    @Resource
     private StudentTotalService totalService;
-    @Autowired
+    @Resource
     private ImUserFriendService imUserFriendService;
     @Resource
     private UserBindingTeacherDao userBindingTeacherDao;
     @Resource
     private TeacherDao teacherDao;
-    @Autowired
+    @Resource
     private SysUserMapper sysUserMapper;
-    @Autowired
+    @Resource
     private SubjectDao subjectDao;
-    @Autowired
+    @Resource
     private TenantInfoService tenantInfoService;
-    @Autowired
+    @Resource
     private UserTenantAlbumRecordService userTenantAlbumRecordService;
-    @Autowired
+    @Resource
     private SysConfigService sysConfigService;
-
-    @Autowired
+    @Resource
     private ImGroupService imGroupService;
-
-    @Autowired
+    @Resource
     private ImGroupMemberService imGroupMemberService;
-
-    @Autowired
-    private TenantAlbumRefMapper tenantAlbumRefMapper;
-
-    @Autowired
-    private TenantAlbumMapper tenantAlbumMapper;
-
-    @Autowired
-    private EmployeeDao employeeDao;
-
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
-
-    @Autowired
-    private CustomerServiceConfig customerServiceConfig;
-
-
-    @Autowired
+    @Resource
     private SysMessageService sysMessageService;
-
-    @Autowired
+    @Resource
     private VipCardRecordService vipCardRecordService;
-
     @Override
     public StudentDao getDao() {
         return baseMapper;
     }
-
-    @Autowired
+    @Resource
     private ImGroupCoreService imGroupCoreService;
-
-    @Autowired
+    @Resource
     private TenantGroupMapper tenantGroupMapper;
-
-    @Autowired
+    @Resource
     private UserTenantBindRecordMapper userTenantBindRecordMapper;
-
-    @Autowired
+    @Resource
     private TenantGroupAlbumMapper tenantGroupAlbumMapper;
     @Resource
     private SysMusicCompareRecordService sysMusicCompareRecordService;
@@ -1115,8 +1091,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
     public StudentIndexWrapper.SummaryDto indexSummary(Long userId) {
         Date now = new Date();
         //获取学员本周练习时长
-        Date monday = DateUtil.getWeekDayWithDate(now,Calendar.MONDAY);
-        Date sunday = DateUtil.getWeekDayWithDate(now,Calendar.SUNDAY);
+        String monday = DateUtil.format(DateUtil.getWeekDayWithDate(now,Calendar.MONDAY),DateUtil.DEFAULT_PATTERN);
+        String sunday = DateUtil.format(DateUtil.getWeekDayWithDate(now,Calendar.SUNDAY),DateUtil.DEFAULT_PATTERN);
         StudentIndexWrapper.SummaryDto summaryDto = new StudentIndexWrapper.SummaryDto();
         //统计学员本周练习时长
         summaryDto.setRecordTime(sysMusicCompareRecordService.getDao().countStudentPracticeTime(userId, monday, sunday));

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

@@ -1171,7 +1171,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             configValue = sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_SVIP);
         } else if (GoodTypeEnum.DISCOUNT.equals(goodTypeEnum)) {
             configValue = sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_DISCOUNT);
-
+        } else if (GoodTypeEnum.VIP_COURSE.equals(goodTypeEnum)) {
+            configValue = sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_VIP_COURSE);
         }
         return configValue;
     }

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

@@ -846,14 +846,14 @@ DISCOUNT("畅学卡")
 
         // 根据商品金额比例分摊优惠金额
         // 剩余金额
-        BigDecimal remainAmount = BigDecimal.ZERO;
+        BigDecimal remainAmount = BigDecimal.valueOf(couponInfo.getDiscountPrice());
         for (Map.Entry<Integer, BigDecimal> entry : couponAmountMap.entrySet()) {
             UserPaymentOrderWrapper.OrderGoodsInfo goodsInfo = goodsInfos.get(entry.getKey());
             UserOrderDetail userOrderDetail = goodsInfo.getUserOrderDetail();
             BigDecimal actualPrice = entry.getValue();
             BigDecimal couponAmount = BigDecimal.valueOf(couponInfo.getDiscountPrice())
                     .multiply(userOrderDetail.getActualPrice()).divide(amount, 2, RoundingMode.HALF_DOWN);
-            remainAmount = BigDecimal.valueOf(couponInfo.getDiscountPrice()).subtract(couponAmount);
+            remainAmount = remainAmount.subtract(couponAmount);
             userOrderDetail.setCouponAmount(couponAmount.add(userOrderDetail.getCouponAmount()));
 
             userOrderDetail.setDiscountJson(userOrderService.discountJson(EDiscountType.COUPON,