From 3688ab2fe5ea1f85b9a7c26be859410e76a0a1be Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 30 六月 2022 14:28:34 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 409e1b4..98055d4 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
@@ -4,10 +4,12 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.PayParam;
import com.sandu.ximon.admin.pay.alipay.UsrAlipayConfigService;
import com.sandu.ximon.admin.pay.wx.WxFastPayService;
+import com.sandu.ximon.admin.security.wxOpenId.OpenId;
import com.sandu.ximon.admin.service.C3ChargingService;
import com.sandu.ximon.admin.service.C3mChargingChargeService;
import com.sandu.ximon.admin.service.C3mOrderService;
@@ -47,13 +49,12 @@
*/
@PostMapping("/refond")
public ResponseVO<Object> refond(@RequestBody PayParam params) {
-
- if (params.getOutTradeNo().isEmpty() || params.getRefundAmount() == null) {
+ if (params.getOutTradeNo().isEmpty() || params.getOutTradeNo() == null) {
throw new BusinessException("閫�娆惧弬鏁颁笉鑳戒负绌�");
}
+ // 0.00 鐢ㄤ簬鍗犱綅 娌℃湁瀹為檯鐢ㄥ 閫�娆炬帴鍙ｅソ鍑犱釜鍦版柟璋冪敤 涓嶅お濂芥敼
return ResponseUtil.success(c3mOrderService.orderRefund(params.getOutTradeNo(),
- params.getRefundAmount()));
-
+ 0.00));
}
/**
@@ -61,9 +62,10 @@
*
* @return
*/
+ @AnonymousAccess
@PostMapping("/advancePay")
- public ResponseVO<Object> advancePayOrder(@RequestBody PayParam param) throws WxErrorException {
- if (param.getWxCode().isEmpty()) {
+ public ResponseVO<Object> advancePayOrder(@OpenId String openId,@RequestBody PayParam param) throws WxErrorException {
+ if (param.getOpenId().isEmpty()) {
throw new BusinessException("寰俊code涓嶈兘涓虹┖");
}
if (param.getPoleId() == null || param.getSubscribeChargingCapacity() == null) {
@@ -83,7 +85,7 @@
double totalAmount = TotalAmount.doubleValue();
//鐢熸垚璁㈠崟
C3mOrder c3mOrderEntity = c3mOrderService.advancePayOrder(param.getPoleId(), c3m, "wxpay"
- , totalAmount, param.getSubscribeChargingCapacity(), param.getWxCode());
+ , totalAmount, param.getSubscribeChargingCapacity(), param.getOpenId());
if (null == c3mOrderEntity) {
throw new BusinessException("璇ュ厖鐢垫々姝ｈ浣跨敤!");
}
@@ -92,7 +94,7 @@
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(), param.getWxCode());
+ SortedMap<Object, Object> result = wxPayService.miniAppPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getOpenId());
return ResponseUtil.success(result);
}
@@ -134,12 +136,14 @@
/**
* 鑾峰彇wx鐨刼penid
*/
+ @AnonymousAccess
@PostMapping("/getWxOpenId")
public ResponseVO<Object> getWxOpenId(@RequestBody PayParam param) throws WxErrorException {
if (param.getWxCode() == null || param.getPoleId() == null || param.getWxCode().isEmpty()) {
throw new BusinessException("鍙傛暟涓嶈兘涓虹┖");
}
String openId = wxPayService.getOpenId(param.getPoleId(), param.getWxCode());
+
return ResponseUtil.success(MapUtil.builder().put("openId", openId).build());
}
--
Gitblit v1.9.3