From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 9 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 23a1a8f..9790b3c 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
@@ -1,9 +1,25 @@
package com.sandu.ximon.admin.service;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.common.third.pay.wx.WxFastPayService;
+import com.sandu.ximon.admin.config.C3mRedisConfig;
+import com.sandu.ximon.admin.pay.OrderStatusEnums;
+import com.sandu.ximon.admin.pay.wx.WxFastPayService;
+import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.security.order.OrderQueryListener;
+import com.sandu.ximon.admin.security.order.OrderScanType;
import com.sandu.ximon.admin.utils.AliPayUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.vo.C3mOrderVO;
+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.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;
@@ -21,16 +37,24 @@
@AllArgsConstructor
public class C3mOrderService extends BaseServiceImpl<C3mOrderMapper, C3mOrder> {
+ private final RedisUtils redisUtils;
+ private final PoleService poleService;
private final C3mOrderMapper c3mOrderMapper;
private final WxFastPayService fastPayService;
+ private final OrderQueryListener orderQueryListener;
- public boolean orderRefund(String outTradeNo, Double refundAmount, Long userId, String username) {
+ public boolean orderRefund(String outTradeNo, Double refundAmount/*, Long userId, String username*/) {
+ Long userId = SecurityUtils.getUserId();
+ String username = SecurityUtils.getUsername();
C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
+ if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
+ throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
+ }
if (null == orderByOutTradeNo) {
return false;
} else {
orderByOutTradeNo.setRefundAmount(refundAmount);
- return c3mOrderRefund(orderByOutTradeNo, "椤甸潰API閫�娆�", userId, username);
+ return c3mOrderRefund(orderByOutTradeNo, "鍏呯數妗╅��娆�", userId, username);
}
@@ -47,12 +71,12 @@
C3mOrder.getRefundAmount());
} else if (C3mOrder.getOrderType().equals(OrderType.WXPAY.getCode())) {
// 杩涜寰俊閫�娆�
-// b = WxPayUtils.getBean().wxRefund(
-// C3mOrder.getTotalAmount(),
-// C3mOrder.getRefundAmount(),
-// C3mOrder.getOutTradeNo(),
-// C3mOrder.getPoleId()
-// );
+ b = fastPayService.refund(
+ C3mOrder.getTotalAmount(),
+ C3mOrder.getRefundAmount(),
+ C3mOrder.getOutTradeNo(),
+ C3mOrder.getPoleId()
+ );
}
C3mOrder.setRefundTimestamp(new Date().getTime());
C3mOrder.setRefundMsg(msg);
@@ -84,4 +108,80 @@
return false;
}
}
+
+ public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
+ Integer subscribeChargingCapacity) {
+
+ // 鍒ゆ柇璇ュ厖鐢垫々鏄惁瀛樺湪姝ｅ湪杩涜涓殑璁㈠崟
+ String chargingJson = redisUtils.get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3m.getC3Mac());
+ if (null != chargingJson) {
+ return null;
+ }
+ Pole pole = poleService.getById(streetlightId);
+ if (null == pole) {
+ return null;
+ }
+ // 鐢熸垚璁㈠崟锛屽苟鍔犺浇鍒皉edis缂撳瓨锛岃缃秴鏃舵椂闂翠负5鍒嗛挓
+ C3mOrder c3mOrderEntity = new C3mOrderVO().generateOrder(
+ streetlightId,
+ pole.getDeviceCode(),
+ c3m.getC3Mac(),
+ OrderType.getOrderType(orderType),
+ totalAmount,
+ subscribeChargingCapacity
+ );
+ // 鍔犺浇鍒皉edis缂撳瓨涓�, 鏌ヨ妯″潡鑷姩鏌ヨ鐘舵�佸苟澶勭悊
+ boolean b = redisUtils.set(
+ C3mRedisConstant.C3_NO_PAY_ORDER.getCode() + c3m.getC3Mac() + c3mOrderEntity.getOutTradeNo(),
+ JSON.toJSONString(c3mOrderEntity),
+ C3mRedisConfig.ORDER_MAX_TIME
+ );
+ // 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
+ orderQueryListener.startScan(OrderScanType.C3M.getType());
+ if(b){
+ save(c3mOrderEntity);
+ }
+ return b ? c3mOrderEntity : null;
+ }
+
+ /**
+ * 寰俊鏀粯鍥炶皟
+ */
+ public Object payWechatNotify(String xmlData) {
+ WxPayOrderNotifyResult wxPayOrderNotifyResult = fastPayService.parseOrderNotifyResult(xmlData);
+ String orderSn = wxPayOrderNotifyResult.getOutTradeNo();
+ String transactionId = wxPayOrderNotifyResult.getOutTradeNo();
+ C3mOrder userOrder = getByOrderSn(orderSn);
+ if (userOrder == null) {
+ return WxPayNotifyResponse.fail("璁㈠崟涓嶅瓨鍦� sn=" + orderSn);
+ }
+
+ // 妫�鏌ヨ繖涓鍗曟槸鍚﹀凡缁忓鐞嗚繃
+ if (!OrderStatusEnums.UNPAID.getCode().equals(userOrder.getOrderStatus())) {
+ return WxPayNotifyResponse.success("璁㈠崟宸茬粡澶勭悊鎴愬姛!");
+ }
+ userOrder.setOutTradeNo(transactionId);
+ userOrder.setPayTimestamp(new Date().getTime());
+ userOrder.setOrderStatus(OrderStatusEnums.PAID.getCode());
+ 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("鏇存柊鏁版嵁鎴愬姛");
+ }
+
+
+ public C3mOrder getByOrderSn(String orderSn) {
+ LambdaQueryWrapper<C3mOrder> wrapper = Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getOutTradeNo, orderSn).last("limit 1");
+ return getOne(wrapper);
+ }
+
}
--
Gitblit v1.9.3