From 52a3bda95de2e73e5958644f57b2a3d32168a4a1 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 22 八月 2022 16:04:26 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 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 d0e383e..ac8ba31 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
@@ -13,7 +13,6 @@
import com.sandu.ximon.admin.service.C3mChargingChargeService;
import com.sandu.ximon.admin.service.C3mOrderService;
import com.sandu.ximon.admin.utils.AliPayUtils;
-import com.sandu.ximon.dao.bo.C3mOrderBo;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.enums.OrderType;
@@ -21,8 +20,8 @@
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
-import java.util.List;
import java.util.SortedMap;
/**
@@ -63,8 +62,8 @@
*/
@AnonymousAccess
@PostMapping("/advancePay")
- public ResponseVO<Object> advancePayOrder(@RequestBody PayParam param) throws WxErrorException {
- if (param.getWxCode().isEmpty()) {
+ public ResponseVO<Object> advancePayOrder(HttpServletRequest request, @RequestBody PayParam param) throws WxErrorException {
+ if (param.getOpenId().isEmpty()) {
throw new BusinessException("寰俊code涓嶈兘涓虹┖");
}
if (param.getPoleId() == null || param.getSubscribeChargingCapacity() == null) {
@@ -84,16 +83,11 @@
double totalAmount = TotalAmount.doubleValue();
//鐢熸垚璁㈠崟
C3mOrder c3mOrderEntity = c3mOrderService.advancePayOrder(param.getPoleId(), c3m, "wxpay"
- , totalAmount, param.getSubscribeChargingCapacity(), param.getWxCode());
- if (null == c3mOrderEntity) {
- throw new BusinessException("璇ュ厖鐢垫々姝ｈ浣跨敤!");
- }
+ , totalAmount, param.getSubscribeChargingCapacity(), param.getOpenId());
- param.setOutTradeNo(c3mOrderEntity.getOutTradeNo());
- param.setTotalAmount(c3mOrderEntity.getTotalAmount());
- String s = WxFastPayService.parseWxAmount(param.getTotalAmount().toString());
+ String s = WxFastPayService.parseWxAmount(c3mOrderEntity.getTotalAmount().toString());
//鐢熸垚寰俊棰勪粯璁㈠崟
- SortedMap<Object, Object> result = wxPayService.miniAppPay("鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", param.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getWxCode());
+ SortedMap<Object, Object> result = wxPayService.miniAppPay(request,"鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", c3mOrderEntity.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getOpenId());
return ResponseUtil.success(result);
}
@@ -125,11 +119,19 @@
/**
* 璁㈠崟鍒楄〃
+ *
+ * @param baseConditionVO
+ * @param keyword 鐏潌鍚嶇О
+ * @param orderStatus 璁㈠崟鐘舵�侊細// 鏈敮浠�(0) 宸叉敮浠�(1),閫�娆句腑(2),宸查��娆�(3),璁㈠崟瀹屾垚(4),閫�娆惧け璐�5)
+ * @param timeType 鏃堕棿 1锛氫竴涓湀 2锛氫笁涓湀 3锛氬叚涓湀
+ * @return
*/
@GetMapping("/list")
- public ResponseVO<Object> list(BaseConditionVO baseConditionVO) {
- List<C3mOrderBo> list = c3mOrderService.orderList(baseConditionVO);
- return ResponseUtil.successPage(list);
+ public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "orderStatus", required = false) Integer orderStatus,
+ @RequestParam(value = "timeType", required = false) Integer timeType) {
+ return ResponseUtil.successPage(c3mOrderService.orderList(baseConditionVO, keyword, orderStatus, timeType));
}
/**
@@ -142,6 +144,7 @@
throw new BusinessException("鍙傛暟涓嶈兘涓虹┖");
}
String openId = wxPayService.getOpenId(param.getPoleId(), param.getWxCode());
+
return ResponseUtil.success(MapUtil.builder().put("openId", openId).build());
}
--
Gitblit v1.9.3