xuhy
2025-10-29 9dc6a3ffd0cd9b245d756118d4550aaf0cdf5099
Merge remote-tracking branch 'origin/master'
2个文件已修改
28 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-prod.yml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
@@ -131,7 +131,7 @@
            }
            String apiPath = "sit/api/v3/labs/trans/preorder";
            String apiPath = "api/v3/labs/trans/preorder";
            String body = "{\n" +
                    "\t\"req_time\": \"" + time + "\",\n" +
                    "\t\"version\": \"3.0\",\n" +
@@ -219,7 +219,7 @@
            // 操作分账
            HttpRequest post = HttpUtil.createPost(LakalaConfig.getServerUrl() + "sit/api/v3/sacs/separate");
            HttpRequest post = HttpUtil.createPost(LakalaConfig.getServerUrl() + "api/v3/sacs/separate");
            HashMap<String, Object> reqMap = new HashMap<>();
            reqMap.put("version", "3.0");
@@ -252,7 +252,7 @@
            HashMap<String, Object> map1 = new HashMap<>();
            //TODO hzt
            map1.put("recv_no", "SR2024021195105");
            map1.put("recv_no", "SR2024000144253");
            // 手续费
            BigDecimal bigDecimal = allMoney.multiply(new BigDecimal("0.038")).setScale(2, RoundingMode.HALF_UP);
            payMoney = payMoney.subtract(bigDecimal);
@@ -298,7 +298,7 @@
//            String responseStr = response.body();
            String authorization1 = getAuthorization(jsonString);
            org.apache.http.HttpResponse response1 = post(LakalaConfig.getServerUrl() + "sit/api/v3/sacs/separate", jsonString, authorization1);
            org.apache.http.HttpResponse response1 = post(LakalaConfig.getServerUrl() + "api/v3/sacs/separate", jsonString, authorization1);
            String responseStr = IOUtils.toString(response1.getEntity().getContent(), ENCODING);
            System.err.println("分佣!!!!"+responseStr);
@@ -374,7 +374,7 @@
                String outTradeNo = time + str;
                String refund_amount = erpProcurement.getPayMoney().multiply(BigDecimal.valueOf(100)).intValue() + "";
                String apiPath = "sit/api/v3/rfd/refund_front/refund";
                String apiPath = "api/v3/rfd/refund_front/refund";
                String body1 = "{\n" +
                        "\t\"req_data\": {\n" +
                        "\t\t\"merchant_no\": \""+erpProcurement.getMerchantNo()+"\",\n" +
@@ -478,7 +478,7 @@
                }
                String outTradeNo = time + str;
                String refund_amount = erpProcurement.getPayMoney().multiply(BigDecimal.valueOf(100)).intValue() + "";
                String apiPath = "sit/api/v3/rfd/refund_front/refund";
                String apiPath = "api/v3/rfd/refund_front/refund";
                String body1 = "{\n" +
                        "\t\"req_data\": {\n" +
@@ -561,7 +561,7 @@
//            }
            HashMap<String, Object> map1 = new HashMap<>();
            // TODO hzt
            map1.put("recv_no", "SR2024021195105");
            map1.put("recv_no", "SR2024000144253");
            map1.put("amt", erpProcurement.getMoney().multiply(BigDecimal.valueOf(100)).intValue() + "");
            objects.add(map1);
            map.put("total_amt",erpProcurement.getMoney().multiply(BigDecimal.valueOf(100)).intValue() + "");
@@ -572,7 +572,7 @@
            String jsonString = JSON.toJSONString(reqMap);
            String authorization1 = getAuthorization(jsonString);
            org.apache.http.HttpResponse response1 = post(LakalaConfig.getServerUrl() + "sit/api/v3/sacs/fallback", jsonString, authorization1);
            org.apache.http.HttpResponse response1 = post(LakalaConfig.getServerUrl() + "api/v3/sacs/fallback", jsonString, authorization1);
            String responseStr = IOUtils.toString(response1.getEntity().getContent(), ENCODING);
ruoyi-admin/src/main/resources/application-prod.yml
@@ -205,16 +205,16 @@
    appLiveResultTemplateId: 1wheNdyQ88Cz9Z7L1EXxR2L0u4X4LaeXoZVtZwHCagk
    officeAppLiveResultTemplateId: 7w1JVe3S4ClFnff7g8us7x-hqFuV3f2SKjKclP_X2FI
lakala:
  MerchantNo: 822290059430BFA
  MerchantNo: 8226410512200DY
  TermNo: D9261078
  NotifyUrl: 1
  subAppId: 1
  appId: OP00000003
  serialNo: 00dfba8194c41b84cf
  priKeyStr: /usr/local/project/cert/lakala/OP00000003_private_key.pem
  lklNotifyCerStr: /usr/local/project/cert/lakala/lkl-apigw-v2.cer
  appId: OP10001646
  serialNo: 01993d1dc59e
  priKeyStr: /usr/local/project/cert/lakala/api_private_key.pem
  lklNotifyCerStr: /usr/local/project/cert/lakala/api_public_cer.cer
  sm4Key: LHo55AjrT4aDhAIBZhb5KQ==
  serverUrl: https://test.wsmsd.cn/
  serverUrl: https://s2.lakala.com/
payment:
  wx:
    # 微信appid