Merge branch 'dev_1_2_20220802' of http://git.dayaedu.com/yonge/cooleshow into dev_1_2_20220802

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

@@ -29,6 +29,20 @@ public interface ActivityPlanDao extends BaseMapper<ActivityPlan> {
 	 * @return: com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo
 	 */
 	List<ActivityPlanVo> selectPage(@Param("page") IPage page, @Param("param") ActivityPlanSearch activityPlan);
+	/**
+	 <if test="param.startTime !=null or param.endTime !=null">
+		 and NOT (
+			 <trim prefixOverrides="OR">
+				 <if test="param.startTime !=null">
+					OR t.activity_end_ &lt; #{param.startTime}
+				 </if>
+				 <if test="param.endTime !=null">
+					OR t.activity_start_ &gt; #{param.endTime}
+				 </if>
+			 </trim>
+		 )
+	 </if>
+	 */
 
 	/**
 	 * 评测活动 活动难度

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

@@ -183,6 +183,9 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
     @Override
     public MusicActivityVo getActivityInfo(Long activityPlanId, SysUser user) {
         ActivityPlan activityPlan = this.getById(activityPlanId);
+        if(activityPlan.getActivityState()!=1){
+            activityPlan.setActivityState(0);
+        }
 
         MusicActivityVo activityVo = new MusicActivityVo();
         BeanUtils.copyProperties(activityPlan, activityVo);

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

@@ -210,7 +210,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         OrderSearch query = new OrderSearch();
         query.setStatus("WAIT_PAY,PAYING");
         List<UserOrderVo> userOrderVos = selectAllList(query);
-        for (UserOrderVo userOrderVo : userOrderVos) {
+         for (UserOrderVo userOrderVo : userOrderVos) {
             testOrderSuccess(userOrderVo);
         }
     }
@@ -907,7 +907,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             //获取当前活动的分润比例
             ActivityPlan byId = activityPlanService.getById(bizId);
             if (null != byId && null != byId.getShareRate()) {
-                return byId.getShareRate();
+                return byId.getShareRate().divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
             }
         }
         return BigDecimal.ZERO;

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

@@ -77,17 +77,11 @@
                     and t.activity_state_ = 1
                 </if>
             </if>
-            <if test="param.startTime !=null or param.endTime !=null">
-                and NOT (
-                    <trim prefixOverrides="OR">
-                        <if test="param.startTime !=null">
-                            OR t.activity_end_ &lt; #{param.startTime}
-                        </if>
-                        <if test="param.endTime !=null">
-                            OR t.activity_start_ &gt; #{param.endTime}
-                        </if>
-                    </trim>
-                )
+            <if test="param.startTime !=null">
+                and t.activity_start_ &gt;= #{param.startTime}
+            </if>
+            <if test="param.endTime !=null">
+                and t.activity_end_ &lt;= #{param.endTime}
             </if>
         </where>
         order by t.id_ desc