Merge branch 'local/share_1008' into test

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/TeacherFeignService.java

@@ -72,4 +72,8 @@ public interface TeacherFeignService {
      */
     @GetMapping("/open/teacher/identity/{ID}")
     HttpResponseResult<Boolean> userTeacherIdentityInfo(@PathVariable("ID") Long userId);
+
+
+    @GetMapping("/task/divBack")
+    public HttpResponseResult<Object> divBack();
 }

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/fallback/TeacherFeignServiceFallback.java

@@ -52,4 +52,9 @@ public class TeacherFeignServiceFallback implements TeacherFeignService {
     public HttpResponseResult<Boolean> userTeacherIdentityInfo(Long userId) {
         return null;
     }
+
+    @Override
+    public HttpResponseResult<Object> divBack() {
+        return null;
+    }
 }

cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/DivBackTask.java

@@ -0,0 +1,20 @@
+package com.yonge.cooleshow.task.jobs;
+
+import com.yonge.cooleshow.api.feign.AdminFeignService;
+import com.yonge.cooleshow.api.feign.TeacherFeignService;
+import com.yonge.cooleshow.task.core.BaseTask;
+import com.yonge.cooleshow.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DivBackTask extends BaseTask {
+
+    @Autowired
+    private TeacherFeignService teacherFeignService;
+
+    @Override
+    public void execute() throws TaskException {
+        Object o = teacherFeignService.divBack();
+    }
+}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.beust.jcommander.internal.Lists;
 import com.microsvc.toolkit.config.jwt.utils.JwtUserInfo;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;

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

@@ -103,7 +103,7 @@ public class DivBackRecordServiceImpl extends ServiceImpl<DivBackRecordMapper, D
 
         for (DivBackRecord divBackRecord : list) {
 
-            PaymentDivMemberRecord divMemberRecord = paymentDivMemberRecordService.getById(divBackRecord.getId());
+            PaymentDivMemberRecord divMemberRecord = paymentDivMemberRecordService.getById(divBackRecord.getPaymentDivMemberRecordId());
             if (divMemberRecord == null){
                 continue;
             }
@@ -124,10 +124,17 @@ public class DivBackRecordServiceImpl extends ServiceImpl<DivBackRecordMapper, D
                 .payOrderNo(paymentOrder.getOrderNo())
                 .transNo(paymentOrder.getTransNo())
                 .build();
-            DivideResp.DivideBack divideBack = paymentService.queryDivideBack(tenantMemberService.getMerchantConfig(divBackRecord.getPaymentVendor()), memberDivideBack);
-            if (divideBack == null) {
+            DivideResp.DivideBack divideBack;
+            try {
+                divideBack = paymentService.queryDivideBack(tenantMemberService.getMerchantConfig(divBackRecord.getPaymentVendor()), memberDivideBack);
+                if (divideBack == null) {
+                    continue;
+                }
+            } catch (Exception e) {
+                log.error("分账回归查询异常", e);
                 continue;
             }
+
             if (divideBack.getStatus() == DivideBackStatus.SUCCESS) {
                 // 修改回归状态
                 divBackRecord.setStatus(DivideBackStatus.SUCCESS.name());

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

@@ -792,7 +792,7 @@
         FROM course_schedule_student_payment p
         LEFT JOIN sys_user u ON p.user_id_=u.id_
         LEFT JOIN course_schedule c ON p.course_id_=c.id_
-        LEFT JOIN student_attendance a ON p.user_id_=a.student_id_  and a.course_group_type_ = c.type_
+        LEFT JOIN student_attendance a ON p.user_id_=a.student_id_  and a.course_schedule_id_ = c.id_
         <where>
             <if test="courseId !=null">
                 AND p.course_id_=#{courseId}

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/task/TaskController.java

@@ -1,10 +1,7 @@
 package com.yonge.cooleshow.teacher.task;
 
 import com.yonge.cooleshow.biz.dal.entity.TeacherTotal;
-import com.yonge.cooleshow.biz.dal.service.CourseGroupService;
-import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
-import com.yonge.cooleshow.biz.dal.service.LiveRoomService;
-import com.yonge.cooleshow.biz.dal.service.TeacherTotalService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.ApiOperation;
@@ -33,6 +30,9 @@ public class TaskController extends BaseController {
     @Autowired
     private LiveRoomService liveRoomService;
 
+    @Autowired
+    private DivBackRecordService divBackRecordService;
+
 
     /***
      * 查询所有老师统计数据
@@ -89,4 +89,11 @@ public class TaskController extends BaseController {
         scheduleService.teacherSalaryTask();
         return HttpResponseResult.succeed();
     }
+
+
+    @GetMapping("/divBack")
+    public HttpResponseResult<Object> divBack() {
+        divBackRecordService.divBack();
+        return HttpResponseResult.succeed();
+    }
 }