0401

dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java

@@ -12,6 +12,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -39,6 +40,7 @@ public class DlDriveSchoolCourseController {
      **/
     @GetMapping("/page")
     @Operation(summary = "分页获取课程信息")
+    @PermitAll
     public CommonResult<IPage<?>> getDlDriveSchoolCoursePage(DlDriveSchoolCourseVO pageReqVO,
                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {

dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/service/impl/DlDriveSchoolCourseServiceImpl.java

@@ -66,6 +66,10 @@ public class DlDriveSchoolCourseServiceImpl extends ServiceImpl<DlDriveSchoolCou
         if (StringUtils.isNotEmpty(courseVO.getName())) {
             lambdaQueryWrapper.like(DlDriveSchoolCourse::getName, courseVO.getName());
         }
+        if (courseVO.getTenantId() != null) {
+            lambdaQueryWrapper.eq(DlDriveSchoolCourse::getTenantId, courseVO.getTenantId());
+        }
+
         return list(lambdaQueryWrapper);
     }
 

dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/app/SmallProgramJxOrderController.java

@@ -4,6 +4,7 @@ import cn.hutool.json.JSONUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.course.entity.SchoolCourseOrder;
 import cn.iocoder.yudao.module.course.service.SchoolCourseOrderService;
 import cn.iocoder.yudao.module.course.vo.SchoolCourseOrderVO;
@@ -61,6 +62,7 @@ public class SmallProgramJxOrderController {
 
 
     @PostMapping("/offLinePay")
+    @TenantIgnore
     public CommonResult offLinePay(@RequestBody SchoolCourseOrder schoolCourseOrder) {
         SchoolCourseOrderVO schoolCourseOrderVO = BeanUtils.toBean(schoolCourseOrder, SchoolCourseOrderVO.class);
         schoolCourseOrderVO.setPaymentStatus("0");
@@ -93,6 +95,7 @@ public class SmallProgramJxOrderController {
     }
 
     @PostMapping("/onLinePay")
+    @TenantIgnore
     public Map<String,String> userPayOnLine(@RequestBody SchoolCourseOrder schoolCourseOrder) {
         SchoolCourseOrderVO schoolCourseOrderVO = BeanUtils.toBean(schoolCourseOrder, SchoolCourseOrderVO.class);
         schoolCourseOrderVO.setPaymentStatus("0");
@@ -125,6 +128,7 @@ public class SmallProgramJxOrderController {
     }
 
     @GetMapping("/prepayment")
+    @TenantIgnore
     public Map<String,Object> transactions(String type, String orderId, String orderNo, String payType) throws SignatureException, NoSuchAlgorithmException, InvalidKeyException, IOException {
         Long userId = SecurityFrameworkUtils.getLoginUserId();
         AdminUserRespDTO user = userApi.getUser(userId);

dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCoachMapper.xml

@@ -17,6 +17,7 @@
         <where>
             main.deleted = 0
             <if test="entity.type != null and entity.type != '' ">and main.type = #{entity.type}</if>
+            <if test="entity.tenantId != null and entity.tenantId != '' ">and main.tenant_id = #{entity.tenantId}</if>
             <if test="entity.name != null  and entity.name != ''">and main.name like concat('%', #{entity.name}, '%')</if>
             <if test="entity.phone != null  and entity.phone != ''">and main.phone like concat('%', #{entity.phone},'%')
             </if>