From 7ffd310e52ef6135197379f0ac2c4522780e53b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 26 八月 2026 17:42:27 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java | 102 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 68 insertions(+), 34 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
index 6428c57..2030626 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderController.java
@@ -142,25 +142,50 @@
String apiPath = "api/v3/labs/trans/preorder";
- String body = "{\n" +
- "\t\"req_time\": \"" + time + "\",\n" +
- "\t\"version\": \"3.0\",\n" +
- "\t\"req_data\": {\n" +
- "\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
- "\t\t\"merchant_no\": \""+supplier.getRecvMerchantNo()+"\",\n" +
- "\t\t\"term_no\": \""+supplier.getTermNo()+"\",\n" +
+ String body="";
+ if("822641048160MMJ".equals(supplier.getRecvMerchantNo())){
+ body= "{\n" +
+ "\t\"req_time\": \"" + time + "\",\n" +
+ "\t\"version\": \"3.0\",\n" +
+ "\t\"req_data\": {\n" +
+ "\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
+ "\t\t\"merchant_no\": \""+supplier.getRecvMerchantNo()+"\",\n" +
+ "\t\t\"term_no\": \""+supplier.getTermNo()+"\",\n" +
// "\t\t\"notify_url\": \"http://221.182.45.100:8089/t-sys-order/messageHandle\",\n" +
- "\t\t\"notify_url\": \"https://haizhentong.com/manage/t-sys-order/messageHandle\",\n" +
- "\t\t\"location_info\": {\n" +
- "\t\t\t\"request_ip\": \"" + ipAddr + "\"\n" +
- "\t\t},\n" +
- "\t\t\"subject\": \"商品采购\",\n" +
- "\t\t\"settle_type\": \"1\",\n" +
- "\t\t\"total_amount\": " + amount + ",\n" +
- "\t\t\"account_type\": \"" + type + "\",\n" +
- "\t\t\"trans_type\": \""+trans_type+"\"\n" +
- "\t}\n" +
- "}";
+ "\t\t\"notify_url\": \"https://haizhentong.com/manage/t-sys-order/messageHandle\",\n" +
+ "\t\t\"location_info\": {\n" +
+ "\t\t\t\"request_ip\": \"" + ipAddr + "\"\n" +
+ "\t\t},\n" +
+ "\t\t\"subject\": \"商品采购\",\n" +
+ "\t\t\"settle_type\": \"0\",\n" +
+ "\t\t\"total_amount\": " + amount + ",\n" +
+ "\t\t\"account_type\": \"" + type + "\",\n" +
+ "\t\t\"trans_type\": \""+trans_type+"\"\n" +
+ "\t}\n" +
+ "}";
+ }else {
+ body = "{\n" +
+ "\t\"req_time\": \"" + time + "\",\n" +
+ "\t\"version\": \"3.0\",\n" +
+ "\t\"req_data\": {\n" +
+ "\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
+ "\t\t\"merchant_no\": \""+supplier.getRecvMerchantNo()+"\",\n" +
+ "\t\t\"term_no\": \""+supplier.getTermNo()+"\",\n" +
+// "\t\t\"notify_url\": \"http://221.182.45.100:8089/t-sys-order/messageHandle\",\n" +
+ "\t\t\"notify_url\": \"https://haizhentong.com/manage/t-sys-order/messageHandle\",\n" +
+ "\t\t\"location_info\": {\n" +
+ "\t\t\t\"request_ip\": \"" + ipAddr + "\"\n" +
+ "\t\t},\n" +
+ "\t\t\"subject\": \"商品采购\",\n" +
+ "\t\t\"settle_type\": \"1\",\n" +
+ "\t\t\"total_amount\": " + amount + ",\n" +
+ "\t\t\"account_type\": \"" + type + "\",\n" +
+ "\t\t\"trans_type\": \""+trans_type+"\"\n" +
+ "\t}\n" +
+ "}";
+ }
+
+
String authorization = getAuthorization(body);
System.err.println("支付请求"+body);
@@ -295,33 +320,42 @@
erpProcurement.setMoney(payMoney);
erpProcurement.setOutSeparateNo(outTradeNo);
erpProcurementService.updateById(erpProcurement);
- // 添加平台的
- map.put("recv_datas", objects);
- reqMap.put("req_data", map);
+ TCrmSupplier supplier = crmSupplierService.getById(erpProcurement.getSupplierId());
+ if("822641048160MMJ".equals(supplier.getRecvMerchantNo())){
+ list.forEach(e->e.setStatus(1));
+ erpProcurementGoodsService.updateBatchById(list);
+ }else {
+ // 添加平台的
+ map.put("recv_datas", objects);
+
+ reqMap.put("req_data", map);
- String jsonString = JSON.toJSONString(reqMap);
+ String jsonString = JSON.toJSONString(reqMap);
// String authorization1 = getAuthorization(jsonString);
// post.header("Authorization", SCHEMA + " " + authorization);
//
// post.body(jsonString);
// HttpResponse response = post.execute();
// String responseStr = response.body();
- String authorization1 = getAuthorization(jsonString);
+ String authorization1 = getAuthorization(jsonString);
- Map<String, ? extends Object> maps =
- new ImmutableMap.Builder<String, String>().
- put("id", erpProcurement.getId()).put("authorization", authorization1).put("body", jsonString)
- .build();
- QuartzManager.addJob(
- RevenueSharingJob.class,
- (RevenueSharingJob.name+erpProcurement.getId()).toUpperCase(),
- TimeJobType.REVENUE_SHARING,
- DateUtils.localDateTimeToDate(LocalDateTime.now().plusSeconds(30)),
- maps
- );
+ Map<String, ? extends Object> maps =
+ new ImmutableMap.Builder<String, String>().
+ put("id", erpProcurement.getId()).put("authorization", authorization1).put("body", jsonString)
+ .build();
+ QuartzManager.addJob(
+ RevenueSharingJob.class,
+ (RevenueSharingJob.name+erpProcurement.getId()).toUpperCase(),
+ TimeJobType.REVENUE_SHARING,
+ DateUtils.localDateTimeToDate(LocalDateTime.now().plusSeconds(30)),
+ maps
+ );
+ }
+
+
// org.apache.http.HttpResponse response1 = post(LakalaConfig.getServerUrl() + "api/v3/sacs/separate", jsonString, authorization1);
// String responseStr = IOUtils.toString(response1.getEntity().getContent(), ENCODING);
--
Gitblit v1.7.1