0409

dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java

@@ -1,8 +1,10 @@
 package cn.iocoder.yudao.module.base.controller.app;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoach;
 import cn.iocoder.yudao.module.base.entity.DlDriveSchoolCoachCourse;
 import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachCourseService;
 import cn.iocoder.yudao.module.base.service.DlDriveSchoolCoachService;
@@ -92,4 +94,21 @@ public class DlDriveSchoolCoachSmallProgramController {
     public CommonResult<?> getCoachByUserId(@RequestParam("userId") Long userId) {
         return success(dlDriveSchoolCoachService.getDlDriveSchoolCoachByUserId(userId));
     }
+
+    /**
+     * 通过教练id获取驾校教练
+     *
+     * @param id 教练id
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<cn.iocoder.yudao.module.base.vo.DlDriveSchoolCoachRespVO>
+     * @author PQZ
+     * @date 21:41 2025/1/16
+     **/
+    @GetMapping("/get")
+    @Operation(summary = "获得驾校教练")
+    @TenantIgnore
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    public CommonResult<DlDriveSchoolCoachRespVO> getDlDriveSchoolCoach(@RequestParam("id") String id) {
+        DlDriveSchoolCoach dlDriveSchoolCoach = dlDriveSchoolCoachService.getDlDriveSchoolCoach(id);
+        return success(BeanUtils.toBean(dlDriveSchoolCoach, DlDriveSchoolCoachRespVO.class));
+    }
 }

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

@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.jx.payment.app;
 
-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;
@@ -8,11 +7,8 @@ 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;
-import cn.iocoder.yudao.module.jx.domain.DriveSchoolCourse;
 import cn.iocoder.yudao.module.jx.mapper.DriveSchoolCourseMapper;
-import cn.iocoder.yudao.module.jx.payment.entity.PayEntity;
 import cn.iocoder.yudao.module.jx.payment.mapper.DrivePayMapper;
-import cn.iocoder.yudao.module.jx.payment.utils.AesUtil;
 import cn.iocoder.yudao.module.jx.payment.utils.WechatPayRequests;
 import cn.iocoder.yudao.module.jx.service.DrivePayService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
@@ -29,15 +25,11 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.security.*;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
 
 @Slf4j
 @RestController
@@ -226,144 +218,4 @@ public class SmallProgramJxOrderController {
         return resMap;
     }
 
-
-
-    /*@PostMapping("/insertPay")
-    public String UserPay(@RequestBody SchoolCourseOrder schoolCourseOrder) {
-        drivePayService.insertPayInfoNew(schoolCourseOrder);
-        return SchoolCourseOrder.getOrderNo();
-
-    }*/
-
-    /**
-     * type：h5、jsapi、app、native、sub_jsapi
-     * @param type
-     * @return
-     */
-    /*@GetMapping("/prepayment")
-    public Map<String,Object> transactions(String type, Long orderNo, String payType) throws SignatureException, NoSuchAlgorithmException, InvalidKeyException, IOException {
-        Long userId = SecurityFrameworkUtils.getLoginUserId();
-        AdminUserRespDTO user = userApi.getUser(userId);
-//       SysUser user = SecurityUtils.getLoginUser().getUser();
-//        OrderInfo orderInfo = orderInfoService.getById(orderId);
-        // 钱， 商品名称
-//        PayVo payVoList = drivePayMapper.findPayListByUserId(SecurityFrameworkUtils.getLoginUserId());
-
-        DriveSchoolCourse driveSchoolCourse = driveSchoolCourseMapper.findSchoolCourseByOrderNumber(orderNo);
-//        DriveSchoolInfo driveSchoolInfo = driveSchoolInfoMapper.selectDriveSchoolInfoById(Long.valueOf(payVoList.getJxId()));
-//        DriveSchoolCoach driveSchoolCoach = driveSchoolCoachMapper.selectDriveSchoolCoachById(Long.valueOf(payVoList.getJlId()));
-
-        // 统一参数封装
-        Map<String, Object> params = new HashMap<>(8);
-        params.put("appid", wechatPayConfigs.getAppId());
-        params.put("mchid", wechatPayConfigs.getMchId());
-        params.put("description", driveSchoolCourse.getName());
-        params.put("out_trade_no", orderNo.toString());
-        params.put("notify_url", wechatPayConfigs.getNotifyUrl());
-        Map<String, Object> amountMap = new HashMap<>(4);
-
-        Double amount = 0.0;
-        // 金额单位为分
-        amount = driveSchoolCourse.getReserveMoney().doubleValue()*100;
-        if (payType.equals("2")){
-            amount = driveSchoolCourse.getPrice().doubleValue()*100;
-        }
-        amountMap.put("total", amount.intValue());
-        //人民币
-        amountMap.put("currency", "CNY");
-        params.put("amount", amountMap);
-
-        // 场景信息
-        Map<String, Object> sceneInfoMap = new HashMap<>(4);
-        // 客户端IP
-        sceneInfoMap.put("payer_client_ip", "127.0.0.1");
-        // 商户端设备号（门店号或收银设备ID）
-        sceneInfoMap.put("device_id", "127.0.0.1");
-        // 除H5与JSAPI有特殊参数外，其他的支付方式都一样
-        if (type.equals(WechatPayUrlEnum.H5.getType())) {
-            Map<String, Object> h5InfoMap = new HashMap<>(4);
-            // 场景类型:iOS, Android, Wap
-            h5InfoMap.put("type", "IOS");
-            sceneInfoMap.put("h5_info", h5InfoMap);
-        } else if (type.equals(WechatPayUrlEnum.JSAPI.getType()) || type.equals(WechatPayUrlEnum.SUB_JSAPI.getType())) {
-            Map<String, Object> payerMap = new HashMap<>(4);
-            //payerMap.put("openid", user.getJcOpenId());
-            params.put("payer", payerMap);
-        }
-        params.put("scene_info", sceneInfoMap);
-        String paramsStr = JSON.toJSONString(params);
-        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);
-        return signMap;
-    }
-
-    String buildMessage(String appId, String timestamp,String nonceStr,String prepay_id) {
-
-        return appId + "\n"
-                + timestamp + "\n"
-                + nonceStr + "\n"
-                + prepay_id + "\n";
-    }
-
-    String sign(byte[] message,String privateKeyStr) throws NoSuchAlgorithmException, SignatureException, IOException, InvalidKeyException {
-        //签名方式
-        Signature sign = Signature.getInstance("SHA256withRSA");
-        //私钥，通过MyPrivateKey来获取，这是个静态类可以接调用方法 ，需要的是_key.pem文件的绝对路径配上文件名
-        PrivateKey privateKey =null;
-        if (StringUtils.isNotEmpty(privateKeyStr)){
-            privateKey = PemUtil.loadPrivateKey(privateKeyStr);
-        }else {
-            privateKey =  wechatPayConfigs.getPrivateKey(wechatPayConfigs.getKeyPemPath());
-        }
-
-        sign.initSign(privateKey);
-        sign.update(message);
-        return Base64.getEncoder().encodeToString(sign.sign());
-    }
-
-    private  Map<String, Object>  paySignMsg(String prepayId,String appId,String privateKeyStr) throws IOException, NoSuchAlgorithmException, InvalidKeyException, SignatureException {
-        long timeMillis = System.currentTimeMillis();
-        String timeStamp = timeMillis/1000+"";
-        String nonceStr = timeMillis+"";
-        String packageStr = "prepay_id="+prepayId;
-        // 公共参数
-        Map<String, Object> resMap = new HashMap<>();
-        resMap.put("nonceStr",nonceStr);
-        resMap.put("timeStamp",timeStamp);
-        resMap.put("appId",appId);
-        resMap.put("package", packageStr);
-        // 使用字段appId、timeStamp、nonceStr、package进行签名
-        //从下往上依次生成
-        String message = buildMessage(appId, timeStamp, nonceStr, packageStr);
-        //签名
-        String paySign = sign(message.getBytes("utf-8"), privateKeyStr);
-        resMap.put("paySign", paySign);
-        resMap.put("signType", "RSA");
-        return resMap;
-    }
-
-
-    @PostMapping("/payNotify")
-    public Map<String, String> payNotify(@RequestBody JSONObject jsonObject) throws GeneralSecurityException, IOException {
-        String key = wechatPayConfigs.getApiV3Key();
-        String json = jsonObject.toString();
-        String associated_data = (String) JSONUtil.getByPath(JSONUtil.parse(json), "resource.associated_data");
-        String ciphertext = (String) JSONUtil.getByPath(JSONUtil.parse(json), "resource.ciphertext");
-        String nonce = (String) JSONUtil.getByPath(JSONUtil.parse(json), "resource.nonce");
-
-        String decryptData = new AesUtil(key.getBytes(StandardCharsets.UTF_8)).decryptToString(associated_data.getBytes(StandardCharsets.UTF_8), nonce.getBytes(StandardCharsets.UTF_8), ciphertext);
-        //验签成功
-        JSONObject decryptDataObj = JSONObject.parseObject(decryptData, JSONObject.class);
-
-        String orderNo = decryptDataObj.get("out_trade_no").toString();
-
-        drivePayMapper.updatePayByOrderNumber(orderNo);
-
-        Map<String, String> res = new HashMap<>();
-        res.put("code", "SUCCESS");
-        res.put("message", "成功");
-        return res;
-    }*/
 }