Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/EduPracticeGroupService.java

@@ -15,9 +15,10 @@ public interface EduPracticeGroupService {
      * @author Joburgess
      * @date 2020/2/17
      * @param practiceGroupBuyParams: 购买参数
+     * @param operatorInfo: 操作者信息
      * @return void
      */
-    HttpResponseResult buyPracticeGroup(PracticeGroupBuyDto practiceGroupBuyParams);
+    HttpResponseResult buyPracticeGroup(PracticeGroupBuyDto practiceGroupBuyParams, String operatorInfo);
 
     /**
      * @describe 支付订单回调

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EduPracticeGroupServiceImpl.java

@@ -134,7 +134,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
 
     @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-    public HttpResponseResult buyPracticeGroup(PracticeGroupBuyDto practiceGroupBuyParams) {
+    public HttpResponseResult buyPracticeGroup(PracticeGroupBuyDto practiceGroupBuyParams, String operatorInfo) {
         if (Objects.isNull(practiceGroupBuyParams.getUserId())) {
             return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择教师");
         }
@@ -271,6 +271,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         practiceGroupBuyParams.setOrganId(sysUser.getOrganId());
         practiceGroupBuyParams.setSingleClassMinutes(practiceCourseMinutes);
         practiceGroupBuyParams.setGroupStatus(GroupStatusEnum.LOCK);
+        practiceGroupBuyParams.setMemo(operatorInfo+"，教务代买");
         practiceGroupDao.insert(practiceGroupBuyParams);
 
         //创建班级信息
@@ -413,7 +414,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         studentPaymentOrder.setMusicGroupId(practiceGroupBuyParams.getId().toString());
         studentPaymentOrder.setActualAmount(studentPaymentOrder.getExpectAmount());
         studentPaymentOrder.setClassGroupId(classGroup.getId());
-        studentPaymentOrder.setMemo("教务端代学生购买");
+        studentPaymentOrder.setMemo(operatorInfo+"，教务代买");
         studentPaymentOrder.setVersion(0);
         studentPaymentOrderService.insert(studentPaymentOrder);
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPracticeGroupController.java

@@ -131,7 +131,7 @@ public class EduPracticeGroupController extends BaseController {
         if(Objects.isNull(practiceGroupBuyParams.getStudentId())){
             throw new BizException("请指定学生");
         }
-        return eduPracticeGroupService.buyPracticeGroup(practiceGroupBuyParams);
+        return eduPracticeGroupService.buyPracticeGroup(practiceGroupBuyParams, sysUser.getUsername()+"("+sysUser.getId()+")");
     }
 
     @ApiOperation("获取用户历史购买的陪练课")