管乐迷迭代

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStudentPaymentDao.java

@@ -568,7 +568,7 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
     * @author zx
     * @date 2021/11/5 11:30
     */
-    boolean hasCourse(@Param("organId") Integer organId);
+    boolean hasCourse(@Param("organId") String organId);
 
     /**
     * @description:  报表中心学员小课记录导出
@@ -577,5 +577,5 @@ public interface CourseScheduleStudentPaymentDao extends BaseDAO<Long, CourseSch
     * @author zx
     * @date 2021/11/5 11:54 
     */
-    List<StudentVipPracticeExportDto> exportStudentVipPractice(@Param("organId") Integer organId);
+    List<StudentVipPracticeExportDto> exportStudentVipPractice(@Param("organId") String organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SchoolDao.java

@@ -49,7 +49,9 @@ public interface SchoolDao extends BaseDAO<Integer, School> {
      */
     List<School> findVipSchoolByUserId(@Param("userId") Integer userId,
                                        @Param("organId") String organId,
-                                       @Param("isDefault") Integer isDefault);
+                                       @Param("isDefault") Integer isDefault,
+                                       @Param("search") String search);
+
     List<School> findVipSchoolByUserId2(@Param("userId") Integer userId,
                                        @Param("organId") String organId);
 

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

@@ -40,5 +40,5 @@ public interface ExportService {
     * @author zx
     * @date 2021/11/5 11:38 
     */
-    void studentVipPractice(Integer organId, ManagerDownload managerDownload) throws FileNotFoundException;
+    void studentVipPractice(String organId, ManagerDownload managerDownload) throws FileNotFoundException;
 }

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

@@ -33,7 +33,7 @@ public interface SchoolService extends BaseService<Integer, School> {
      * @param teacherId:
      * @return java.util.List<com.ym.mec.biz.dal.entity.School>
      */
-    List<School> findVipSchoolByTeacher(Integer teacherId,String organId,Integer isDefault);
+    List<School> findVipSchoolByTeacher(Integer teacherId,String organId,Integer isDefault,String search);
 
     /**
      * @describe 获取教师vip课教学点

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

@@ -886,7 +886,7 @@ public class ExportServiceImpl implements ExportService {
 
     @Override
     @Async
-    public void studentVipPractice(Integer organId, ManagerDownload managerDownload) throws FileNotFoundException {
+    public void studentVipPractice(String organId, ManagerDownload managerDownload) throws FileNotFoundException {
         List<StudentVipPracticeExportDto> studentVipPracticeExportDtos = courseScheduleStudentPaymentDao.exportStudentVipPractice(organId);
         for (StudentVipPracticeExportDto studentVipPracticeExportDto : studentVipPracticeExportDtos) {
             String vipOverTeacherIds = studentVipPracticeExportDto.getVipOverTeacherIds();

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

@@ -49,8 +49,8 @@ public class SchoolServiceImpl extends BaseServiceImpl<Integer, School>  impleme
 	}
 
 	@Override
-	public List<School> findVipSchoolByTeacher(Integer teacherId,String organId,Integer isDefault) {
-		return schoolDao.findVipSchoolByUserId(teacherId,organId,isDefault);
+	public List<School> findVipSchoolByTeacher(Integer teacherId,String organId,Integer isDefault,String search) {
+		return schoolDao.findVipSchoolByUserId(teacherId,organId,isDefault,search);
 	}
 
 	@Override

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

@@ -20,6 +20,8 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.ym.mec.biz.dal.enums.GroupType.GOODS_SELL;
+
 @Service
 public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> implements SellOrderService {
     @Autowired
@@ -33,7 +35,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
     @Autowired
     private SysPaymentConfigService sysPaymentConfigService;
     @Autowired
-    private SysUserCashAccountService sysUserCashAccountService;
+    private SysUserCashAccountLogDao sysUserCashAccountLogDao;
     @Autowired
     private GoodsService goodsService;
     @Autowired
@@ -407,9 +409,18 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
             sellOrderDao.update(sellOrder);
 
             //2、金额退到余额
-//            if (reBackFee && sellOrder.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
+            if (reBackFee && sellOrder.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
+                SysUserCashAccountLog sysUserCashAccountLog = new SysUserCashAccountLog();
+                sysUserCashAccountLog.setReturnFeeType(ReturnFeeEnum.GOODS);
+                sysUserCashAccountLog.setOrganId(sellOrder.getOrganId());
+                sysUserCashAccountLog.setUserId(sellOrder.getUserId());
+                sysUserCashAccountLog.setGroupType(GOODS_SELL);
+                sysUserCashAccountLog.setComment("商品退费");
+                sysUserCashAccountLog.setGroupId(sellOrder.getId().toString());
+                sysUserCashAccountLog.setAmount(sellOrder.getExpectAmount().multiply(new BigDecimal(0.995)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP));
+                sysUserCashAccountLogDao.insert(sysUserCashAccountLog);
 //                sysUserCashAccountService.updateBalance(sellOrder.getUserId(), sellOrder.getExpectAmount().multiply(new BigDecimal(0.995)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP), PlatformCashAccountDetailTypeEnum.REFUNDS, "订单：" + sellOrder.getOrderId() + " 商品id：" + sellOrder.getGoodsId() + "退货");
-//            }
+            }
         }
         //3、退货
         if (sellOrders.get(0).getAccountType() != null) {

mec-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -838,8 +838,8 @@
 		LEFT JOIN sys_user su ON s.user_id_ = su.id_
 		LEFT JOIN course_schedule_student_payment cssp FORCE INDEX(group_type_) ON cssp.user_id_ = s.user_id_
 		WHERE cssp.group_type_ IN ('VIP','PRACTICE')
-		<if test="organId != null">
-			AND su.organ_id_ = #{organId}
+		<if test="organId != null and organId != ''">
+			AND FIND_IN_SET(su.organ_id_,#{organId})
 		</if>
 		LIMIT 1
 	</select>
@@ -882,7 +882,7 @@
 		LEFT JOIN organization o ON o.id_ = su.organ_id_
 		WHERE cssp.group_type_ IN ('VIP','PRACTICE')
 		<if test="organId != null">
-			AND su.organ_id_ = #{organId}
+			AND FIND_IN_SET(su.organ_id_,#{organId})
 		</if>
 		GROUP BY s.user_id_
 	</select>

mec-biz/src/main/resources/config/mybatis/SchoolMapper.xml

@@ -147,6 +147,9 @@
         <if test="organId != null">
         AND ((FIND_IN_SET(organ_id_,#{organId}) and user_id_ is NULL) or user_id_ = #{userId})
         </if>
+        <if test="search != null and search != ''">
+            AND (name_ LIKE CONCAT('%',#{search},'%') OR address_ LIKE CONCAT('%',#{search},'%'))
+        </if>
     </select>
     <select id="findVipSchoolByUserId2" resultMap="School">
         SELECT * FROM school WHERE del_flag_ != 1

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -563,7 +563,7 @@
         FROM
         (SELECT SUM(CASE WHEN expect_amount_ IS NULL THEN 0 ELSE expect_amount_ END) a FROM student_payment_order
          WHERE group_type_ = 'VIP' AND type_ = 'SMALL_CLASS_TO_BUY' AND music_group_id_ = #{vipGroupId} AND status_ = 'SUCCESS') a,
-        (SELECT SUM(CASE WHEN amount_ IS NULL THEN 0 ELSE amount_ END) b FROM sys_user_cash_account_log WHERE group_id_ = #{vipGroupId}) b,
+        (SELECT SUM(CASE WHEN amount_ IS NULL THEN 0 ELSE amount_ END) b FROM sys_user_cash_account_log WHERE group_id_ = #{vipGroupId} AND group_type_ = 'VIP') b,
         (SELECT SUM(CASE WHEN actual_price_ IS NULL THEN 0 ELSE actual_price_ END) c FROM activity_user_mapper WHERE vip_group_id_ = #{vipGroupId}) c,
         (SELECT SUM(CASE WHEN amount_ IS NULL THEN 0 ELSE amount_ END) d FROM sys_user_cash_account_detail WHERE group_id_ = #{vipGroupId}) d,
         (SELECT SUM(CASE WHEN amount_ IS NULL THEN 0 ELSE amount_ END) e FROM sys_user_courses_account_detail WHERE group_id_ = #{vipGroupId}) e

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherSchoolController.java

@@ -90,7 +90,7 @@ public class TeacherSchoolController extends BaseController {
 
     @ApiOperation(value = "获取教师vip课教学点")
     @GetMapping("/findVipSchoolByTeacher2")
-    public Object findVipSchoolByTeacher2(Integer isDefault){
+    public Object findVipSchoolByTeacher2(Integer isDefault,String search){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
             return failed(HttpStatus.FORBIDDEN,"请登录");
@@ -104,6 +104,6 @@ public class TeacherSchoolController extends BaseController {
         if (StringUtils.isNoneBlank(teacher.getFlowOrganRange())) {
             organIdList += "," + teacher.getFlowOrganRange();
         }
-        return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId(),organIdList,isDefault));
+        return succeed(schoolService.findVipSchoolByTeacher(sysUser.getId(),organIdList,isDefault,search));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1503,7 +1503,7 @@ public class ExportController extends BaseController {
     @ApiOperation(value = "学员小课记录导出")
     @RequestMapping("export/studentVipPractice")
     @PreAuthorize("@pcs.hasPermissions('export/studentVipPractice')")
-    public HttpResponseResult exportStudentVipPractice(Integer organId) throws IOException {
+    public HttpResponseResult exportStudentVipPractice(String organId) throws IOException {
         boolean hasCourse = courseScheduleStudentPaymentDao.hasCourse(organId);
         if (!hasCourse) {
             return failed("没有可导出的数据");

mec-web/src/main/java/com/ym/mec/web/controller/SchoolController.java

@@ -129,6 +129,6 @@ public class SchoolController extends BaseController {
         if(StringUtils.isNotEmpty(teacher.getFlowOrganRange())){
             organId += "," + teacher.getFlowOrganRange();
         }
-        return succeed(schoolService.findVipSchoolByTeacher(userId,organId,null));
+        return succeed(schoolService.findVipSchoolByTeacher(userId,organId,null,null));
     }
 }

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

@@ -38,7 +38,7 @@ public class EduSchoolController extends BaseController {
 
     @ApiOperation(value = "获取教师vip课教学点")
     @GetMapping("/findVipSchoolByTeacher")
-    public Object findVipSchoolByTeacher(@ApiParam(value = "教师编号", required = true) Integer userId){
+    public Object findVipSchoolByTeacher(@ApiParam(value = "教师编号", required = true) Integer userId,String search){
         Teacher teacher = teacherDao.get(userId);
         if (teacher == null) {
             return failed("用户信息获取失败");
@@ -50,12 +50,12 @@ public class EduSchoolController extends BaseController {
         if(StringUtils.isEmpty(teacher.getFlowOrganRange())){
             organId += "," + teacher.getFlowOrganRange();
         }
-        return succeed(schoolService.findVipSchoolByTeacher(userId,organId,null));
+        return succeed(schoolService.findVipSchoolByTeacher(userId,organId,null,search));
     }
 
     @ApiOperation(value = "获取教师vip课教学点")
     @GetMapping("/findVipSchoolByTeacher2")
-    public Object findVipSchoolByTeacher2(Integer userId,Integer isDefault){
+    public Object findVipSchoolByTeacher2(Integer userId,Integer isDefault,String search){
         Teacher teacher = null;
         if(userId != null){
             teacher = teacherDao.get(userId);
@@ -73,6 +73,6 @@ public class EduSchoolController extends BaseController {
         if (StringUtils.isNoneBlank(teacher.getFlowOrganRange())) {
             organIdList += "," + teacher.getFlowOrganRange();
         }
-        return succeed(schoolService.findVipSchoolByTeacher(teacher.getId(),organIdList,isDefault));
+        return succeed(schoolService.findVipSchoolByTeacher(teacher.getId(),organIdList,isDefault,search));
     }
 }