From ddb398c1a41d7923e12dbc0fdda4172254fad93e Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 28 六月 2022 15:49:10 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
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 5ad1e67..a9d5bb5 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
@@ -19,16 +19,14 @@
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.enums.C3mRedisConstant;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.enums.OrderType;
import com.sandu.ximon.dao.mapper.C3mOrderMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.util.Date;
-import java.util.List;
/**
* @Author liuhaonan
@@ -56,7 +54,7 @@
return false;
} else {
orderByOutTradeNo.setRefundAmount(refundAmount);
- return c3mOrderRefund(orderByOutTradeNo, "椤甸潰API閫�娆�", userId, username);
+ return c3mOrderRefund(orderByOutTradeNo, "鍏呯數妗╅��娆�", userId, username);
}
@@ -140,9 +138,9 @@
);
// 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
orderQueryListener.startScan(OrderScanType.C3M.getType());
- if(b){
- save(c3mOrderEntity);
- }
+// if(b){
+// save(c3mOrderEntity);
+// }
return b ? c3mOrderEntity : null;
}
@@ -153,6 +151,7 @@
WxPayOrderNotifyResult wxPayOrderNotifyResult = fastPayService.parseOrderNotifyResult(xmlData);
String orderSn = wxPayOrderNotifyResult.getOutTradeNo();
String transactionId = wxPayOrderNotifyResult.getOutTradeNo();
+ Integer totalFee = wxPayOrderNotifyResult.getTotalFee();
C3mOrder userOrder = getByOrderSn(orderSn);
if (userOrder == null) {
return WxPayNotifyResponse.fail("璁㈠崟涓嶅瓨鍦� sn=" + orderSn);
@@ -168,14 +167,6 @@
if (!updateById(userOrder)) {
return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
}
-
-// UserPayRecord userPayRecord = new UserPayRecord();
-// userPayRecord.setOrderId(userOrder.getId());
-// userPayRecord.setPayAmount(userOrder.getTotalPrice());
-// userPayRecord.setPayType(PayTypeEnums.WECHAT.getCode());
-// userPayRecord.setPayDate(userOrder.getPayTime());
-// userPayRecord.setUserId(userOrder.getUserId());
-// userPayRecordService.save(userPayRecord);
return WxPayNotifyResponse.success("鏇存柊鏁版嵁鎴愬姛");
}
--
Gitblit v1.9.3