From a648f3e08210a1ed04bf819cccedc56e5afc24c3 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 27 六月 2022 17:51:50 +0800
Subject: [PATCH] 支付配置
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 66 +++++++--------------------------
1 files changed, 14 insertions(+), 52 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
index f6f6a66..7260cfe 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
@@ -28,7 +28,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Date;
-import java.util.HashMap;
import java.util.Map;
import java.util.SortedMap;
@@ -68,15 +67,15 @@
*/
@PostMapping("/advancePay")
public ResponseVO<Object> advancePayOrder(@RequestBody PayParam param) {
- if (param.getTotalAmount() == 0d) {
- throw new BusinessException("閲戦涓嶈兘涓�0");
+ if (param.getTotalAmount() < 0) {
+ throw new BusinessException("閲戦蹇呴』澶т簬0");
}
// C3鍏呯數妗╁疄浣�
C3mCharging c3m = c3mService.getC3mByPoleId(param.getPoleId());
if (null == c3m) {
throw new BusinessException("鏈壘鍒板綋鍓嶅厖鐢垫々");
}
- C3mOrder c3mOrderEntity = c3mOrderService.advancePayOrder(param.getPoleId(), c3m, param.getOrderType()
+ C3mOrder c3mOrderEntity = c3mOrderService.advancePayOrder(param.getPoleId(), c3m, "wxpay"
, param.getTotalAmount(), param.getSubscribeChargingCapacity());
if (null == c3mOrderEntity) {
throw new BusinessException("璇ュ厖鐢垫々姝ｈ浣跨敤!");
@@ -84,10 +83,11 @@
// return R.ok().put("outTradeNo",c3mOrderEntity.getOutTradeNo())
// .put("totalAmount",totalAmount);
- Map map = new HashMap();
- map.put("outTradeNo", c3mOrderEntity.getOutTradeNo());
- map.put("totalAmount", param.getTotalAmount());
- return ResponseUtil.success(map);
+ param.setOutTradeNo(c3mOrderEntity.getOutTradeNo());
+ param.setTotalAmount(c3mOrderEntity.getTotalAmount());
+ String s = WxFastPayService.parseWxAmount(param.getTotalAmount().toString());
+ SortedMap<Object, Object> result = wxPayService.miniAppPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(),Integer.valueOf(s) , param.getPoleId());
+ return ResponseUtil.success(result);
}
@@ -151,52 +151,14 @@
return ResponseUtil.success("鏀粯瀹屾垚");
}
- @RequestMapping("/wxpay")
- public ResponseVO<Object> c3Wxpay(@RequestBody PayParam param) {
-
- //String result = wxPayService.miniAppPay(outTradeNo, totalAmount, streetlightId);
- SortedMap<Object, Object> result = wxPayService.appPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(), param.getWxPayTotalAmount(), param.getPoleId());
-
- return ResponseUtil.success(result);
- }
-
- public ResponseVO<Object> queryPayStates(@RequestBody PayParam param) {
-
+// @RequestMapping("/wxpay")
+// public ResponseVO<Object> c3Wxpay(@RequestBody PayParam param) {
+//
// //String result = wxPayService.miniAppPay(outTradeNo, totalAmount, streetlightId);
-////鏀粯瀹濅氦鏄撳彿
-// String trade_no = WIDtrade_no.Text.Trim();
-////鏀粯瀹濅氦鏄撳彿涓庡晢鎴风綉绔欒鍗曞彿涓嶈兘鍚屾椂涓虹┖
-////鍟嗘埛璁㈠崟鍙�
-// String out_trade_no = WIDout_trade_no.Text.Trim();
-////鎶婅姹傚弬鏁版墦鍖呮垚鏁扮粍
+// SortedMap<Object, Object> result = wxPayService.appPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(), param.getWxPayTotalAmount(), param.getPoleId(),c3mOrderEntity);
//
-// SortedDictionary<string, string> sParaTemp = new SortedDictionary<string, string>();
-// sParaTemp.Add("partner", Config.Partner);
-// sParaTemp.Add("_input_charset", Config.Input_charset.ToLower());
-// sParaTemp.Add("service", "single_trade_query");
-// sParaTemp.Add("trade_no", trade_no);
-// sParaTemp.Add("out_trade_no", out_trade_no);
-////寤虹珛璇锋眰
-// string sHtmlText = Submit.BuildRequest(sParaTemp);
-//
-////璇峰湪杩欓噷鍔犱笂鍟嗘埛鐨勪笟鍔￠�昏緫绋嬪簭浠ｇ爜
-//
-////鈥斺�旇鏍规嵁鎮ㄧ殑涓氬姟閫昏緫鏉ョ紪鍐欑▼搴忥紙浠ヤ笅浠ｇ爜浠呬綔鍙傝�冿級鈥斺��
-//
-// XmlDocument xmlDoc = new XmlDocument();
-// try
-// {
-// xmlDoc.LoadXml(sHtmlText);
-// string strXmlResponse = xmlDoc.SelectSingleNode("/alipay").InnerText;
-// Response.Write(strXmlResponse);
-// }
-// catch (Exception exp)
-// {
-// Response.Write(sHtmlText);
-// }
-
- return ResponseUtil.success(null);
- }
+// return ResponseUtil.success(result);
+// }
@RequestMapping("/queryOrder")
--
Gitblit v1.9.3