管乐迷商城改造

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

@@ -67,13 +67,14 @@ public class EduRepairController extends BaseController {
     @ApiOperation("获取学生列表")
     @GetMapping(value = "/getStudents")
     public HttpResponseResult<PageInfo<BasicUserDto>> getStudents(RepairStudentQueryInfo queryInfo) {
-        Integer userId = sysUserService.getUserId();
-        Employee employee = employeeDao.get(userId);
+        SysUser user = sysUserService.getUser();
+        Employee employee = employeeDao.get(user.getId());
         if (Objects.isNull(employee)) {
             return failed(HttpStatus.NOT_ACCEPTABLE, "员工信息不存在");
         }
-        queryInfo.setEmployeeId(userId);
+        queryInfo.setEmployeeId(user.getId());
         queryInfo.setOrganIdList(employee.getOrganIdList());
+        queryInfo.setTenantId(user.getTenantId());
         return succeed(studentRepairService.getStudents(queryInfo));
     }
 

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

@@ -486,7 +486,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                 sellOrder.setAccountType(accountType);
                 sellOrder.setOrganSellCost(goodsSub.getGoodsPrice());
                 sellOrder.setOrganId(order.getOrganId());
-                sellOrder.setCooperationOrganId(musicGroup.getCooperationOrganId());
+                sellOrder.setCooperationOrganId(order.getCooperationId());
                 sellOrder.setEduTeacherId(musicGroup.getEducationalTeacherId());
                 sellOrder.setTransNo(order.getTransNo());
                 sellOrder.setOrderId(order.getId());

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

@@ -214,6 +214,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
             studentPaymentOrder.setOrderNo(studentPaymentRouteOrder.getOrderNo());
             studentPaymentOrder.setGroupType(GroupType.OUTORDER);
             studentPaymentOrder.setOrganId(studentPaymentRouteOrder.getRouteOrganId());
+            studentPaymentOrder.setRoutingOrganId(studentPaymentRouteOrder.getRouteOrganId());
             studentPaymentOrder.setExpectAmount(studentPaymentRouteOrder.getRouteAmount());
             studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
             studentPaymentOrder.setCreateTime(studentPaymentRouteOrder.getPayTime());

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

@@ -151,7 +151,7 @@
         SELECT su.username_ ,su.id_ user_id_,su.avatar_ head_url_,su.gender_,su.phone_,s.care_package_,s.come_on_package_,su.organ_id_
         FROM sys_user su
         LEFT JOIN student s ON su.id_=s.user_id_
-        WHERE FIND_IN_SET(su.organ_id_,#{organIdList})
+        WHERE su.tenant_id_ = #{tenantId} AND FIND_IN_SET(su.organ_id_,#{organIdList})
         AND su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = '0'
         <if test="search">
             AND (su.username_ LIKE CONCAT(#{search},'%') OR su.phone_ LIKE CONCAT(#{search},'%'))
@@ -167,7 +167,7 @@
         <if test="repairFlag != null">
             LEFT JOIN student s ON su.id_=s.user_id_
         </if>
-        WHERE FIND_IN_SET(su.organ_id_,#{organIdList}) AND su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = '0'
+        WHERE su.tenant_id_ = #{tenantId} AND FIND_IN_SET(su.organ_id_,#{organIdList}) AND su.user_type_ LIKE '%STUDENT%' AND su.del_flag_ = '0'
         <if test="search">
             AND (su.username_ LIKE CONCAT(#{search},'%') OR su.phone_ LIKE CONCAT(#{search},'%'))
         </if>