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

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/UserOrderClient.java

@@ -108,13 +108,15 @@ public class UserOrderClient extends BaseController {
                                         userOrderRefundService.refundPaymentCallBack(data);
                                     }
                                 }, 60L, TimeUnit.SECONDS);
+                return res.getData().getResMsg();
             } catch (BizException e) {
-                log.error("回调业务异常，msg is {}", e.getMessage());
+                log.error("回调业务异常，data is {}, msg is {}", JSONObject.toJSONString(data), e.getMessage());
             } catch (Exception e) {
+                log.error("回调业务异常，data is {}", JSONObject.toJSONString(data));
                 e.printStackTrace();
             }
         }
-        return res.getData().getResMsg();
+        return null;
     }
 
     /***

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

@@ -765,7 +765,6 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
             }
         }
         return false;
-
     }
 
     /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MyRepliedVo.java

@@ -47,8 +47,38 @@ public class MyRepliedVo implements Serializable {
     @ApiModelProperty(value = "评分")
     private String score;
 
-    @ApiModelProperty(value = "学员课后评价")
-    private String studentReplied;
+    @ApiModelProperty(value = "学生评价 0:未评价 1:已评价")
+    private Integer studentReplied;
+
+    @ApiModelProperty(value = "老师评价 0:未评价 1:已评价")
+    private Integer teacherReplied;
+
+    @ApiModelProperty(value = "学生评价内容")
+    private String studentRepliedStr;
+
+    public String getStudentRepliedStr() {
+        return studentRepliedStr;
+    }
+
+    public void setStudentRepliedStr(String studentRepliedStr) {
+        this.studentRepliedStr = studentRepliedStr;
+    }
+
+    public Integer getStudentReplied() {
+        return studentReplied;
+    }
+
+    public void setStudentReplied(Integer studentReplied) {
+        this.studentReplied = studentReplied;
+    }
+
+    public Integer getTeacherReplied() {
+        return teacherReplied;
+    }
+
+    public void setTeacherReplied(Integer teacherReplied) {
+        this.teacherReplied = teacherReplied;
+    }
 
     public String getRealName() {
         return realName;
@@ -145,12 +175,4 @@ public class MyRepliedVo implements Serializable {
     public void setScore(String score) {
         this.score = score;
     }
-
-    public String getStudentReplied() {
-        return studentReplied;
-    }
-
-    public void setStudentReplied(String studentReplied) {
-        this.studentReplied = studentReplied;
-    }
 }

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

@@ -110,8 +110,7 @@
             r.course_schedule_id_ AS courseId,
             r.course_group_id_ AS courseGroupId,
             r.score_ AS score,
-            r.student_id_ AS studentId,
-            r.student_replied_ AS studentReplied,
+            r.student_replied_ AS studentRepliedStr,
             g.subject_id_ AS subjectId,
             sb.name_ AS subjectName,
             s.class_date_ AS classDate,
@@ -120,7 +119,9 @@
             u.id_ AS studentId,
             u.real_name_ AS realName,
             u.username_ AS userName,
-            u.avatar_ AS avatar
+            u.avatar_ AS avatar,
+            (r.student_replied_ IS NOT NULL) AS studentReplied,
+            (r.teacher_replied_ IS NOT NULL) AS teacherReplied
         FROM course_schedule_replied r
         LEFT JOIN course_group g ON g.id_ = r.course_group_id_
         LEFT JOIN `subject` sb ON sb.id_ = g.subject_id_

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/PianoRoomSettingsController.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/pianoRoomSettings")
-@Api(value = "琴房时长价格配置", tags = "")
+@Api(value = "琴房时长价格配置", tags = "琴房时长价格配置")
 public class PianoRoomSettingsController extends BaseController {
 
     @Autowired

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/ali/OriginalAliAppTemplate.java

@@ -257,7 +257,7 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
                 //退款成功
                 RefundPaymentCallBack refundPayment = new RefundPaymentCallBack();
                 refundPayment.setBillNo(refundNo);
-                refundPayment.setTransNo(refundNo);
+                refundPayment.setTransNo(jsonParams.getString("trade_no"));
 
                 refundPayment.setRefundAmt(jsonParams.getString("refund_fee"));
                 refundPayment.setTradeTime(jsonParams.getDate("gmt_refund"));