0331

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<String> createDlDriveSchoolStudent(@Valid @RequestBody DlDriveSchoolStudentVO createReqVO) {
+        return success(schoolStudentService.createDlDriveSchoolStudent(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新驾校学员")
+    public CommonResult<Boolean> updateDlDriveSchoolStudent(@Valid @RequestBody DlDriveSchoolStudentVO updateReqVO) {
+        schoolStudentService.updateDlDriveSchoolStudent(updateReqVO);
+        return success(true);
+    }
+
+    /**
+     * 获取学员详细信息
+     *
+     * @param id 学员id
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<cn.iocoder.yudao.module.base.vo.DlDriveSchoolStudentVO>
+     * @author PQZ
+     * @date 9:58 2025/2/10
+     **/
+    @GetMapping("/get")
+    @Operation(summary = "获得驾校学员")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<DlDriveSchoolStudentVO> getDlDriveSchoolStudent(@RequestParam("id") String id) {
+        return success(schoolStudentService.queryStudentById(id));
+    }
+}

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<String, Object> resMap = JSONObject.parseObject(resStr, new TypeReference<Map<String, Object>>(){});
-        Map<String, Object> signMap = paySignMsg(resMap.get("prepay_id").toString(), wechatPayConfigs.getAppId(),null);
+        Map<String, Object> signMap = paySignMsg(resMap.get("prepay_id").toString(), wechatPayConfigs.getJxAppId(),null);
         return signMap;
     }
 

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

@@ -17,7 +17,8 @@
             main.deleted = 0
             <if test="entity.name != null  and entity.name != ''">and main.name like concat('%', #{entity.name}, '%')</if>
             <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>
         </where>
         order by main.create_time desc
     </select>
-</mapper>
+</mapper>

dl-module-jx/src/main/resources/mapper/course/SchoolCourseOrderMapper.xml

@@ -18,6 +18,8 @@
         main.deleted = 0
             <if test="entity.orderNo!= null and entity.orderNo != ''"> and main.order_no = #{entity.orderNo}</if>
             <if test="entity.userName != null and entity.userName != ''"> and main.user_name like concat('%', #{entity.userName}, '%')</if>
+            <if test="entity.userId != null and entity.userId != ''"> and main.user_id = #{entity.userId}</if>
+            <if test="entity.paymentStatus != null and entity.paymentStatus != ''"> and main.payment_status = #{entity.paymentStatus}</if>
         </where>
     </select>
     <select id="selectByCoachUserId" resultType="java.lang.Double">
@@ -43,4 +45,4 @@
         </if>
     </select>
 
-</mapper>
+</mapper>