获取农户数据去掉重复记录，微信支付的传参、返回值、接口、数据库表金额都以元为单位

zhubaomin

2024-11-05 e6a9e6f750115579c8cc90d7e6d5bf1eebe79b90

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/wechatpay/PaymentCtrl.java

@@ -69,12 +69,12 @@
    //private final String appid = com.dy.pipIrrWechat.wechatpay.PayInfo.appid;
    //private final String secret = com.dy.pipIrrWechat.wechatpay.PayInfo.secret;
    //private final String mchid = com.dy.pipIrrWechat.wechatpay.PayInfo.mchid;
    private final String schema = com.dy.pipIrrWechat.wechatpay.PayInfo.schema;
    private final String signType = com.dy.pipIrrWechat.wechatpay.PayInfo.signType;
    private final String description = com.dy.pipIrrWechat.wechatpay.PayInfo.description;
    private final String loginUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.loginUrl;
    private final String notifyUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.notifyUrl;
    private final String grantType = com.dy.pipIrrWechat.wechatpay.PayInfo.grantType;
    //private final String schema = com.dy.pipIrrWechat.wechatpay.PayInfo.schema;
    //private final String signType = com.dy.pipIrrWechat.wechatpay.PayInfo.signType;
    //private final String description = com.dy.pipIrrWechat.wechatpay.PayInfo.description;
    //private final String loginUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.loginUrl;
    //private final String notifyUrl = com.dy.pipIrrWechat.wechatpay.PayInfo.notifyUrl;
    //private final String grantType = com.dy.pipIrrWechat.wechatpay.PayInfo.grantType;

    // 平台证书公钥
    private final Map CERTIFICATE_MAP = new HashMap();
@@ -109,9 +109,9 @@
        queryParams.put("appid", PayInfo.appid);
        queryParams.put("secret", PayInfo.secret);
        queryParams.put("js_code", jsCode);
        queryParams.put("grant_type", grantType);
        queryParams.put("grant_type", com.dy.pipIrrWechat.wechatpay.PayInfo.grantType);
        Map<String, String> headerParams = new HashMap<>();
        JSONObject job = restTemplateUtil.get(loginUrl, queryParams, headerParams);
        JSONObject job = restTemplateUtil.get(com.dy.pipIrrWechat.wechatpay.PayInfo.loginUrl, queryParams, headerParams);

        if(job.getLong("errcode") != null && job.getLong("errcode") >= -1) {
            return BaseResponseUtils.buildFail("登录凭证校验失败");
@@ -163,7 +163,7 @@
        Long timestamp = System.currentTimeMillis() / 1000;

        byte[] certFileBs = WxCertUtil.getKey_pemBytes(resourceLoader) ;
        String header = schema + " " + payHelper.getToken(method, httpUrl, "", nonceStr, timestamp, certFileBs);
        String header = com.dy.pipIrrWechat.wechatpay.PayInfo.schema + " " + payHelper.getToken(method, httpUrl, "", nonceStr, timestamp, certFileBs);

        Map<String, String> headers = new HashMap<>();
        headers.put("Authorization", header);
@@ -199,10 +199,10 @@
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        // 接收参数：登录态ID、虚拟卡ID、充值金额（分）
        // 接收参数：登录态ID、虚拟卡ID、充值金额(单位元)
        Long sessionId = order.getSessionId();
        Long virtualId = order.getVcId();
        Integer rechargeAmount = order.getRechargeAmount();
        //Integer rechargeAmount = (int)(order.getRechargeAmount()*100);

        String prepayId = "";

@@ -233,7 +233,8 @@
        virtualCard.setVirtualId(virtualId);
        virtualCard.setClientId(clientId);
        virtualCard.setOrderNumber(orderNumber);
        virtualCard.setRechargeAmount(rechargeAmount);
        //virtualCard.setRechargeAmount(rechargeAmount);
        virtualCard.setRechargeAmount(order.getRechargeAmount());

        // -1：虚拟卡不存在，0：添加充值记录失败
        Long rechargeId = virtualCardSv.insertVCRecharge(virtualCard);
@@ -260,14 +261,14 @@
        JSONObject job_body = new JSONObject();
        job_body.put("appid", PayInfo.appid);
        job_body.put("mchid", PayInfo.mchid);
        job_body.put("description", description);
        job_body.put("description", com.dy.pipIrrWechat.wechatpay.PayInfo.description);
        job_body.put("out_trade_no", orderNumber);
        job_body.put("attach", DataSourceContext.get());
        job_body.put("notify_url", notifyUrl);
        job_body.put("notify_url", com.dy.pipIrrWechat.wechatpay.PayInfo.notifyUrl);

        //订单金额
        JSONObject job_amount = new JSONObject();
        job_amount.put("total", rechargeAmount);
        job_amount.put("total", (int)(order.getRechargeAmount()*100));
        job_amount.put("currency", "CNY");
        job_body.put("amount", job_amount);

@@ -285,7 +286,7 @@

        String body = job_body.toJSONString();
        byte[] certFileBs = WxCertUtil.getKey_pemBytes(resourceLoader) ;
        String header = schema + " " + payHelper.getToken(method, httpUrl, body, nonceStr, timestamp, certFileBs);
        String header = com.dy.pipIrrWechat.wechatpay.PayInfo.schema + " " + payHelper.getToken(method, httpUrl, body, nonceStr, timestamp, certFileBs);

        Map<String, String> headers = new HashMap<>();
        headers.put("Authorization", header);
@@ -333,7 +334,7 @@
        job_result.put("timeStamp", timeStamp);
        job_result.put("nonceStr", nonceStr);
        job_result.put("package", pkg);
        job_result.put("signType", signType);
        job_result.put("signType", com.dy.pipIrrWechat.wechatpay.PayInfo.signType);
        job_result.put("paySign", paySign);

        return BaseResponseUtils.buildSuccess(job_result) ;