From 58b6e9d8f412c406e3851ea7d2111dbaaed6fcc2 Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Mon, 31 Mar 2025 10:53:11 +0800 Subject: [PATCH] 0331 --- ...veSchoolStudentSmallProgramController.java | 53 +++++++++++++++++++ .../app/SmallProgramJxOrderController.java | 16 ++++-- .../mapper/base/DlDriveSchoolCourseMapper.xml | 3 +- .../mapper/course/SchoolCourseOrderMapper.xml | 4 +- 4 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java new file mode 100644 index 00000000..9cb7abe0 --- /dev/null +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java @@ -0,0 +1,53 @@ +package cn.iocoder.yudao.module.base.controller.app; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.base.service.DlDriveSchoolStudentService; +import cn.iocoder.yudao.module.base.vo.DlDriveSchoolStudentVO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "驾校学员") +@RestController +@RequestMapping("/small/dl-drive-school-student") +@Validated +public class DlDriveSchoolStudentSmallProgramController { + + @Resource + private DlDriveSchoolStudentService schoolStudentService; + + @PostMapping("/create") + @Operation(summary = "创建驾校学员") + public CommonResult createDlDriveSchoolStudent(@Valid @RequestBody DlDriveSchoolStudentVO createReqVO) { + return success(schoolStudentService.createDlDriveSchoolStudent(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新驾校学员") + public CommonResult updateDlDriveSchoolStudent(@Valid @RequestBody DlDriveSchoolStudentVO updateReqVO) { + schoolStudentService.updateDlDriveSchoolStudent(updateReqVO); + return success(true); + } + + /** + * 获取学员详细信息 + * + * @param id 学员id + * @return cn.iocoder.yudao.framework.common.pojo.CommonResult + * @author PQZ + * @date 9:58 2025/2/10 + **/ + @GetMapping("/get") + @Operation(summary = "获得驾校学员") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult getDlDriveSchoolStudent(@RequestParam("id") String id) { + return success(schoolStudentService.queryStudentById(id)); + } +} diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/app/SmallProgramJxOrderController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/app/SmallProgramJxOrderController.java index a2225e53..f51da770 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/app/SmallProgramJxOrderController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/app/SmallProgramJxOrderController.java @@ -70,11 +70,17 @@ public class SmallProgramJxOrderController { int maxRetry = 5; do { - // 1. 生成订单号（示例：时间戳 + 随机数） - orderNo = "ORD" + System.currentTimeMillis() + - ThreadLocalRandom.current().nextInt(100, 999); + // 生成 14 位订单号 + Random random = new Random(); + StringBuilder number = new StringBuilder(); - // 2. 检查订单号是否已存在 + for (int i = 0; i < 14; i++) { + int randomDigit = random.nextInt(10); + number.append(randomDigit); + } + orderNo = number.toString(); + + // 检查订单号是否已存在 exists = schoolCourseOrderService.lambdaQuery() .eq(SchoolCourseOrder::getOrderNo, orderNo) .exists(); @@ -167,7 +173,7 @@ public class SmallProgramJxOrderController { log.info("请求参数 ===> {}" + paramsStr); String resStr = wechatPayRequests.wechatHttpPost("https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi",paramsStr); Map resMap = JSONObject.parseObject(resStr, new TypeReference>(){}); - Map signMap = paySignMsg(resMap.get("prepay_id").toString(), wechatPayConfigs.getAppId(),null); + Map signMap = paySignMsg(resMap.get("prepay_id").toString(), wechatPayConfigs.getJxAppId(),null); return signMap; } diff --git a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml index 9039502a..af48c80f 100644 --- a/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/base/DlDriveSchoolCourseMapper.xml @@ -17,7 +17,8 @@ main.deleted = 0 and main.name like concat('%', #{entity.name}, '%') and main.type = #{entity.type} + and main.tenant_id = #{entity.tenantId} order by main.create_time desc - \ No newline at end of file + diff --git a/dl-module-jx/src/main/resources/mapper/course/SchoolCourseOrderMapper.xml b/dl-module-jx/src/main/resources/mapper/course/SchoolCourseOrderMapper.xml index bc56c24e..4179cde8 100644 --- a/dl-module-jx/src/main/resources/mapper/course/SchoolCourseOrderMapper.xml +++ b/dl-module-jx/src/main/resources/mapper/course/SchoolCourseOrderMapper.xml @@ -18,6 +18,8 @@ main.deleted = 0 and main.order_no = #{entity.orderNo} and main.user_name like concat('%', #{entity.userName}, '%') + and main.user_id = #{entity.userId} + and main.payment_status = #{entity.paymentStatus} - \ No newline at end of file +