Merge branch 'dev_1_2_20220802'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Subject.java

@@ -31,6 +31,9 @@ public class Subject implements Serializable {
 	
 	@ApiModelProperty(value = "图片地址",required = false)
 	private String img;
+
+	@ApiModelProperty("声部默认频率")
+	private Integer aiDefaultFrequency;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -48,6 +51,14 @@ public class Subject implements Serializable {
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Subject> subjects;
 
+	public Integer getAiDefaultFrequency() {
+		return aiDefaultFrequency;
+	}
+
+	public void setAiDefaultFrequency(Integer aiDefaultFrequency) {
+		this.aiDefaultFrequency = aiDefaultFrequency;
+	}
+
 	public List<Subject> getSubjects() {
 		return subjects;
 	}

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

@@ -148,7 +148,7 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
         }else{
             activityPlan.setActivityState(2);
             //取消活动所有订单
-            cancelActivityOrder(activityPlan);
+            cancelActivityOrder(detail);
         }
 
         activityPlan.setId(activityId);
@@ -156,8 +156,6 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
         activityPlan.setUpdateTime(new Date());
 
         baseMapper.updateById(activityPlan);
-
-
         return true;
     }
 

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

@@ -2011,11 +2011,13 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             e.printStackTrace();
         }
 
-        //清除统计缓存
         for (Long studentId : studentIds) {
+            //清除学生缓存
             redissonClient.getBucket(CacheNameEnum.STUDENT_TOTAL.getRedisKey(studentId)).delete();
+            //发生推送通知
             pianoSend(teacherId, studentId);
         }
+        //清除老师缓存
         redissonClient.getBucket(CacheNameEnum.TEACHER_TOTAL.getRedisKey(teacherId)).delete();
     }
 

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

@@ -107,21 +107,17 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
             param.setPaymentNo(orderPayment.getPaymentNo());
             param.setReason(reason);
 
-            try {
-                BaseResult<ClosePayment> responseResult = paymentClient.closePayment(param);
-                log.info("关单返回: {}", JSONObject.toJSONString(responseResult));
-                if (!responseResult.getStatus()) {
-                    orderPayment.setCloseStatus(TradeStatusEnum.failed);
-                    orderPayment.setCloseFailMsg(responseResult.getMsg());
+            BaseResult<ClosePayment> responseResult = paymentClient.closePayment(param);
+            log.info("关单返回: {}", JSONObject.toJSONString(responseResult));
+            if (!responseResult.getStatus()) {
+                orderPayment.setCloseStatus(TradeStatusEnum.failed);
+                orderPayment.setCloseFailMsg(responseResult.getMsg());
+            } else {
+                if (responseResult.getData().getHasNotify()) {
+                    orderPayment.setCloseStatus(TradeStatusEnum.pending);
                 } else {
-                    if (responseResult.getData().getHasNotify()) {
-                        orderPayment.setCloseStatus(TradeStatusEnum.pending);
-                    } else {
-                        orderPayment.setCloseStatus(TradeStatusEnum.succeeded);
-                    }
+                    orderPayment.setCloseStatus(TradeStatusEnum.succeeded);
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
             }
         }
         updateById(orderPayment);

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

@@ -11,6 +11,7 @@
         <result column="code_" property="code"/>
         <result column="parent_subject_id_" property="parentSubjectId"/>
         <result column="img_" property="img"/>
+        <result column="ai_default_frequency_" property="aiDefaultFrequency"/>
         <result column="desc_" property="desc"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -31,8 +32,8 @@
     <insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.Subject" useGeneratedKeys="true"
             keyColumn="id"
             keyProperty="id">
-        INSERT INTO subject (id_,name_,code_,parent_subject_id_,img_,create_time_,update_time_,desc_)
-        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{img},now(),now(),#{desc})
+        INSERT INTO subject (id_,name_,code_,parent_subject_id_,img_,create_time_,update_time_,desc_,ai_default_frequency_)
+        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{img},now(),now(),#{desc},#{aiDefaultFrequency})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -60,6 +61,9 @@
             <if test="desc != null">
                 desc_ = #{desc},
             </if>
+            <if test="aiDefaultFrequency != null">
+                ai_default_frequency_ = #{aiDefaultFrequency},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>