From b353cecfa4181d281243df5a70d1de5cc373e35d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 06 九月 2022 15:51:44 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 4 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 28 ++++++++++++++++++----------
4 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java
index c52eac0..ce7769c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java
@@ -18,7 +18,7 @@
public static final Long SCREEN_SHOT_TIMEOUT = 30 * 60L;
public static final String NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/progress";
- public static final String SCREEN_SHOT_NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/screenshot"; //瑕佹敼
+ public static final String SCREEN_SHOT_NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/screenshot"; // TODO 瑕佹敼
public static final String username = "zhxm";
public static final String password = "xm2512209.";
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 e61da57..4c68bd8 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
@@ -45,8 +45,8 @@
*
* @return
*/
- @PostMapping("/refond")
- public ResponseVO<Object> refond(@RequestBody PayParam params) {
+ @PostMapping("/refund")
+ public ResponseVO<Object> refund(@RequestBody PayParam params) {
if (params.getOutTradeNo().isEmpty() || params.getOutTradeNo() == null) {
throw new BusinessException("閫�娆惧弬鏁颁笉鑳戒负绌�");
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java
index 1ccdb4b..08a3786 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java
@@ -23,7 +23,7 @@
@PostMapping("/screenshot")
public ResponseVO<Object> screenshot(@RequestBody VnnoxScreenShotParam vnnoxScreenShot) {
String url = vnnoxScreenShot.getScreenShotUrl().replace("&", "&");
- redisUtils.set(VnnoxConstant.REDIS_SCREEN_SHOT + vnnoxScreenShot.getPlayerId(), url, VnnoxConstant.SCREEN_SHOT_TIMEOUT);
+ redisUtils.set(VnnoxConstant.REDIS_SCREEN_SHOT + vnnoxScreenShot.getPlayerId(), url);
return ResponseUtil.success("ok");
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
index 535a29d..247bf62 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -14,8 +14,6 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.common.util.SpringContextHolder;
-import com.sandu.ximon.admin.dto.ChargingDto;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.pay.OrderStatusEnums;
import com.sandu.ximon.admin.pay.wx.WxFastPayService;
@@ -24,7 +22,10 @@
import com.sandu.ximon.admin.utils.AliPayUtils;
import com.sandu.ximon.admin.vo.C3mOrderVO;
import com.sandu.ximon.dao.bo.C3mOrderBo;
-import com.sandu.ximon.dao.domain.*;
+import com.sandu.ximon.dao.domain.C3mCharging;
+import com.sandu.ximon.dao.domain.C3mOrder;
+import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.domain.WxConfigEntity;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.enums.OrderType;
import com.sandu.ximon.dao.mapper.C3mOrderMapper;
@@ -36,8 +37,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
@@ -72,6 +71,15 @@
String username = SecurityUtils.getUsername();
C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
+ if(orderByOutTradeNo==null){
+ throw new BusinessException("鏈壘鍒拌鍗�!");
+ }
+ //閫�娆惧墠杩涜鐘舵�佸垽鏂�
+ if (orderByOutTradeNo.getOrderStatus().equals(OrderStatus.REFUND.getStatus())
+ || orderByOutTradeNo.getOrderStatus().equals(OrderStatus.CANCEL.getStatus())
+ || orderByOutTradeNo.getOrderStatus().equals(OrderStatus.NO_PAY.getStatus())) {
+ throw new BusinessException("璁㈠崟鐘舵�侀敊璇�,鏃犳硶閫�娆� !");
+ }
if (orderByOutTradeNo == null) {
throw new BusinessException("鏈壘鍒拌鍗�");
} else {
@@ -152,11 +160,11 @@
throw new BusinessException("鍏呯數妗╂鍦ㄨ鍗犵敤!");
}
- //瀛樺湪璁㈠崟,浣嗘槸鏈敮浠�,闇�瑕佸彇娑堣鍗�
- if (c3mOrder != null) {
- c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
- updateById(c3mOrder);
- }
+// //瀛樺湪璁㈠崟,浣嗘槸鏈敮浠�,闇�瑕佸彇娑堣鍗�
+// if (c3mOrder != null) {
+// c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
+// updateById(c3mOrder);
+// }
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
--
Gitblit v1.9.3