diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCoach.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCoach.java index e73def07..5354b389 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCoach.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/entity/DlDriveSchoolCoach.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; +import org.apache.poi.hpsf.Decimal; /** * 驾校教练 DO @@ -100,5 +101,15 @@ public class DlDriveSchoolCoach extends TenantBaseDO { */ private Long folderId; + /** + * 提成 + */ + private Decimal commission; + + /** + * 银行卡号 + */ + private String bankCardId; + } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStudentVO.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStudentVO.java index 7372f98f..50f3dfdf 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStudentVO.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/vo/DlDriveSchoolStudentVO.java @@ -37,4 +37,6 @@ public class DlDriveSchoolStudentVO extends DlDriveSchoolStudent { private String courseName; /**订单ID*/ private String orderId; + /**排序方式:asc desc*/ + private String sort; } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolContractController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolContractController.java index 1d2ddd87..29c145f3 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolContractController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/admin/DriveSchoolContractController.java @@ -80,4 +80,10 @@ public class DriveSchoolContractController extends BaseController { return toAjax(driveSchoolContractService.deleteDriveSchoolContractByIds(ids)); } + + @GetMapping("/getContractByUserId") + public CommonResult getContractByUserId(Long userId) + { + return success(driveSchoolContractService.getContractByUserId(userId)); + } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolContractMapper.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolContractMapper.java index c400188b..4e99ae37 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolContractMapper.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/mapper/DriveSchoolContractMapper.java @@ -64,4 +64,6 @@ public interface DriveSchoolContractMapper * @return 结果 */ public int deleteDriveSchoolContractByIds(Long[] ids); + + public DriveSchoolContract getContractByUserId(Long userId); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolContractService.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolContractService.java index c161ca8d..ef63223e 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolContractService.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/IDriveSchoolContractService.java @@ -62,4 +62,6 @@ public interface IDriveSchoolContractService * @return 结果 */ public int deleteDriveSchoolContractById(Long id); + + public DriveSchoolContract getContractByUserId(Long userId); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolContractServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolContractServiceImpl.java index 5eb27910..beb1d115 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolContractServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/service/impl/DriveSchoolContractServiceImpl.java @@ -168,4 +168,9 @@ public class DriveSchoolContractServiceImpl implements IDriveSchoolContractServi { return driveSchoolContractMapper.deleteDriveSchoolContractById(id); } + + @Override + public DriveSchoolContract getContractByUserId(Long userId) { + return driveSchoolContractMapper.getContractByUserId(userId); + } } diff --git a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml index 79abefe1..26923777 100644 --- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolStudentMapper.xml @@ -167,8 +167,21 @@ AND dss.create_time <= #{entity.endTime} + + AND dsco.course_type = #{entity.courseType} + GROUP BY - dsco.id + dss.user_id + + + ORDER BY + dss.create_time ASC + + + ORDER BY + dss.create_time DESC + + + SELECT *FROM drive_school_contract WHERE user_id = #{userId} AND deleted = 0 ORDER BY id DESC LIMIT 1 +