From 3cc8093733d705ed5415e37eb82d909509590c4b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 18 九月 2025 09:01:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
index b794052..eef2033 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java
@@ -132,8 +132,8 @@
"\t\"version\": \"3.0\",\n" +
"\t\"req_data\": {\n" +
"\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
- "\t\t\"merchant_no\": \"822290059430BFA\",\n" +
- "\t\t\"term_no\": \"D9261078\",\n" +
+ "\t\t\"merchant_no\": \"822290059430BF9\",\n" +
+ "\t\t\"term_no\": \"A9358698\",\n" +
"\t\t\"notify_url\": \"http://221.182.45.100:8089/t-sys-order/messageHandle\",\n" +
"\t\t\"location_info\": {\n" +
"\t\t\t\"request_ip\": \"" + ipAddr + "\"\n" +
@@ -160,7 +160,7 @@
String code = jsonObject1.getString("log_no");
erpProcurement.setPayTransactionId(code);
erpProcurement.setStatus(2);
- erpProcurement.setTermNo("D9261078");
+ erpProcurement.setTermNo("A9358698");
erpProcurement.setAccountType(type);
erpProcurement.setTransType("41");
erpProcurementService.updateById(erpProcurement);
@@ -173,10 +173,6 @@
}
- public static void main(String[] args) {
- String a = "{\"code\":\"BBS00000\",\"msg\":\"成功\",\"resp_time\":\"20250916114506\",\"resp_data\":{\"merchant_no\":\"822290059430BFA\",\"out_trade_no\":\"202509161144582Kck\",\"trade_no\":\"2025091666200821320234\",\"log_no\":\"66200821320234\",\"settle_merchant_no\":\"\",\"settle_term_no\":\"\",\"trade_req_date\":\"20250916\",\"acc_resp_fields\":{\"code\":\"https://qr.alipay.com/bax01747cbtdjneesjaz0044\",\"code_image\":\"\",\"prepay_id\":\"\",\"app_id\":\"\",\"pay_sign\":\"\",\"time_stamp\":\"\",\"nonce_str\":\"\",\"package\":\"\",\"sign_type\":\"\",\"form_data\":\"\",\"redirect_url\":\"\",\"best_pay_info\":\"\",\"partner_id\":\"\",\"sub_mch_id\":\"2088240727800097\"}}}";
-
- }
@RequestMapping("/messageHandle")
@ApiOperation(value = "拉卡拉支付信息回调接口")
@@ -223,7 +219,7 @@
HashMap<String, Object> map = new HashMap<>();
- map.put("merchant_no", "822290059430BFA");
+ map.put("merchant_no", "822290059430BF9");
map.put("log_no", erpProcurement.getPayTransactionId());
map.put("log_date", DateUtils.dateTime());
map.put("notify_url", "http://221.182.45.100:8089/t-sys-order/messageSeparateHandle");
@@ -250,7 +246,7 @@
List<TErpProcurementGoods> value = entry.getValue();
BigDecimal reduce = value.stream().map(TErpProcurementGoods::getSupplierMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
payMoney = payMoney.subtract(reduce);
- map1.put("recv_merchant_no", supplier.getRecvMerchantNo());
+ map1.put("recv_no", supplier.getRecvMerchantNo());
map1.put("separate_value", reduce.multiply(BigDecimal.valueOf(100)).intValue() + "");
objects.add(map1);
}
@@ -311,15 +307,12 @@
if ( erpProcurement!=null && "SUCCESS".equals(status)) {
erpProcurement.setRefundStatus(1);
erpProcurementService.updateById(erpProcurement);
+ // 修改分账状态
List<TErpProcurementGoods> list1 = erpProcurementGoodsService.list(new LambdaQueryWrapper<TErpProcurementGoods>().eq(TErpProcurementGoods::getProcurementId, erpProcurement.getId()));
- for (Object object : jsonArray) {
- JSONObject jsonObject = JSONObject.parseObject(object.toString());
- String recvMerchantNo = jsonObject.getString("recv_merchant_no");
- String recvNo = jsonObject.getString("recv_no");
- List<TErpProcurementGoods> collect1 = list1.stream().filter(e -> e.getRecvMerchantNo().equals(recvMerchantNo)).collect(Collectors.toList());
- collect1.stream().forEach(e->e.setRecvNo(recvNo));
- erpProcurementGoodsService.updateBatchById(collect1);
- }
+ list1.stream().forEach(e->e.setStatus(1));
+ erpProcurementGoodsService.updateBatchById(list1);
+
+
// 响应success
JSONObject jsonObject = new JSONObject();
jsonObject.put("code", "SUCCESS");
@@ -352,7 +345,7 @@
"\t\"req_time\": \"" + time + "\",\n" +
"\t\"version\": \"3.0\",\n" +
"\t\"req_data\": {\n" +
- "\t\t\"merchant_no\": \"822290059430BFA\",\n" +
+ "\t\t\"merchant_no\": \"822290059430BF9\",\n" +
"\t\t\"term_no\": \""+erpProcurement.getTermNo()+"\",\n" +
"\t\t\"refund_amount\": " + refund_amount + ",\n" +
"\t\t\"out_trade_no\": \"" + outTradeNo + "\",\n" +
@@ -451,7 +444,7 @@
HashMap<String, Object> map = new HashMap<>();
- map.put("merchant_no", "822290059430BFA");
+ map.put("merchant_no", "822290059430BF9");
map.put("origin_separate_no", erpProcurement.getSeparateNo());
map.put("out_separate_no",outTradeNo);
erpProcurement.setRefundOutSeparateNo(outTradeNo);
--
Gitblit v1.7.1