Merge branch 'test' into dev

src/main/java/com/sqx/modules/course/controller/app/AppCourseCollectController.java

@@ -22,7 +22,7 @@ public class AppCourseCollectController extends AbstractController {
     @Login
     @PostMapping("/insertCourseCollect")
     @ApiOperation("app收藏短剧信息")
-    @Debounce(interval = 1000, value = "#userId,#courseCollect.courseId,#courseCollect.classify,#courseCollect.type")
+    @Debounce(interval = 1000, value = "#userId,#courseCollect.courseId,#courseCollect.classify")
     public Result insertCourseCollect(@RequestBody CourseCollect courseCollect, @RequestAttribute("userId") Long userId) {
         courseCollect.setUserId(userId);
         return courseCollectService.insertCourseCollect(courseCollect);

src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java

@@ -96,7 +96,9 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
                     baseMapper.delete(queryWrapper);
                 }
             }
-            upGoodNum(courseCollect, courseCollect.getType());
+            if(!courseCollect.getClassify().equals(1)){
+                upGoodNum(courseCollect, courseCollect.getType());
+            }
             return Result.success("操作成功！");
         } catch (Exception e) {
 //            e.printStackTrace();
@@ -114,7 +116,6 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
      * @param collect courseId 和 courseDetailsId 必须有值
      * @param isGood  1为加一 其它为 减一
      */
-    @Async
     public void upGoodNum(CourseCollect collect, Integer isGood) {
         LambdaQueryWrapper<CourseDetails> queryWrapper = new LambdaQueryWrapper<CourseDetails>()
                 .eq(CourseDetails::getCourseId, collect.getCourseId())

src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java

@@ -178,9 +178,9 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
         }
         List<CourseDetailsSetVo> courseDetailsSetVos;
         if (freeWatch || courseUser != null) {
-            courseDetailsSetVos = baseMapper.courseSets(courseId,2, null, null);
+            courseDetailsSetVos = baseMapper.courseSets(courseId, 2, null, null);
         } else {
-            courseDetailsSetVos = baseMapper.courseSets(courseId,1, bean.getPrice(), bean.getWholesalePrice());
+            courseDetailsSetVos = baseMapper.courseSets(courseId, 1, bean.getPrice(), bean.getWholesalePrice());
         }
         if (sort != null && sort > 2) {
             startSort = sort - 3;
@@ -225,7 +225,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl<CourseDetailsDao, Cour
         Map<String, Object> map = new HashMap<>();
         map.put("current", current.get());
         map.put("title", bean.getTitle());
-        map.put("collect", collect == null ? 0L : 1L);
+        map.put("collect", collect == null || collect.equals(0) ? 0L : 1L);
         map.put("list", courseDetailsSetVos);
         return new Result().put("data", map);
     }

src/main/java/com/sqx/modules/course/vo/CourseDetailsSetVo.java

@@ -32,10 +32,6 @@ public class CourseDetailsSetVo {
      * 点赞数
      */
     private Integer goodNum;
-    /**
-     * 是否已追
-     */
-    private Long isCollect;
     /**
      * 是否点赞
      */

src/main/java/com/sqx/modules/job/task/TempOrdersTask.java

@@ -247,7 +247,7 @@ public class TempOrdersTask {
                     sysUserMoneyDetailsService.save(userMoneyDetails4);
 
                     SysUserMoney sysUserMoney = sysUserMoneyService.selectSysUserMoneyByUserId(sysUser.getSysUserId());
-                    sysUserMoney.setInviteIncomeMoney(sysUserMoney.getInviteIncomeMoney().add(new BigDecimal(qdAward)));
+                    sysUserMoney.setInviteIncomeMoney(sysUserMoney.getInviteIncomeMoney() == null ? new BigDecimal(qdAward) : sysUserMoney.getInviteIncomeMoney().add(new BigDecimal(qdAward)));
                     sysUserMoneyService.update(sysUserMoney, new LambdaQueryWrapper<SysUserMoney>()
                             .eq(SysUserMoney::getUserId, sysUserMoney.getUserId())
                             .eq(SysUserMoney::getId, sysUserMoney.getId()));

src/main/java/com/sqx/sharding/StandardShardingStrategyConf.java

@@ -2,13 +2,25 @@ package com.sqx.sharding;
 
 import org.apache.shardingsphere.api.sharding.standard.PreciseShardingAlgorithm;
 import org.apache.shardingsphere.api.sharding.standard.PreciseShardingValue;
+
 import java.util.Collection;
 
-public class StandardShardingStrategyConf implements PreciseShardingAlgorithm<Long> {
+public class StandardShardingStrategyConf implements PreciseShardingAlgorithm<String> {
     @Override
-    public String doSharding(Collection<String> availableTargetNames, PreciseShardingValue<Long> shardingValue) {
+    public String doSharding(Collection<String> availableTargetNames, PreciseShardingValue<String> shardingValue) {
+        Object valueObj = shardingValue.getValue();
+        long value = 0;
+        if (valueObj instanceof String) {
+            // 如果是字符串类型，尝试解析为Long
+            value = Long.parseLong((String) valueObj);
+
+        } else if (valueObj instanceof Long) {
+            // 如果是字符串类型，尝试解析为Long
+            value = (long) valueObj;
+
+        }
         // 根据ID对5取模来确定表名
-        long tableIndex = shardingValue.getValue() % 5;
+        long tableIndex = value % 5;
         for (String tableName : availableTargetNames) {
             if (tableName.endsWith(String.valueOf(tableIndex))) {
                 return tableName;