From 3c88ed137df2428dd43a405336cbd79011345efd Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 28 六月 2022 16:22:02 +0800
Subject: [PATCH] 支付配置
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 87 +++++++++++++++++++++++++++++++++++--------
1 files changed, 71 insertions(+), 16 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 a9d5bb5..583b1f5 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,32 +1,35 @@
package com.sandu.ximon.admin.service;
-import com.alibaba.fastjson.JSON;
+import cn.hutool.core.lang.Snowflake;
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.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.config.C3mRedisConfig;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
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.bo.C3mOrderBo;
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;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
+import java.util.List;
/**
* @Author liuhaonan
@@ -42,6 +45,7 @@
private final C3mOrderMapper c3mOrderMapper;
private final WxFastPayService fastPayService;
private final OrderQueryListener orderQueryListener;
+ private final Snowflake snowflake;
public boolean orderRefund(String outTradeNo, Double refundAmount/*, Long userId, String username*/) {
Long userId = SecurityUtils.getUserId();
@@ -50,8 +54,8 @@
if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
}
- if (null == orderByOutTradeNo) {
- return false;
+ if (orderByOutTradeNo == null) {
+ throw new BusinessException("鏈壘鍒拌鍗�");
} else {
orderByOutTradeNo.setRefundAmount(refundAmount);
return c3mOrderRefund(orderByOutTradeNo, "鍏呯數妗╅��娆�", userId, username);
@@ -61,6 +65,16 @@
}
+ /**
+ * 閫�娆�
+ *
+ * @param C3mOrder
+ * @param msg
+ * @param userId
+ * @param username
+ * @return
+ */
+// @Transactional(rollbackFor = Exception.class)
private boolean c3mOrderRefund(C3mOrder C3mOrder, String msg, Long userId, String username) {
// 杩涜閫�娆撅紝璁剧疆璁㈠崟鐘舵�佷负宸查��娆�
boolean b = false;
@@ -109,6 +123,16 @@
}
}
+ /**
+ * 鍒涘缓璁㈠崟
+ *
+ * @param streetlightId
+ * @param c3m
+ * @param orderType
+ * @param totalAmount
+ * @param subscribeChargingCapacity
+ * @return
+ */
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
Integer subscribeChargingCapacity) {
@@ -131,16 +155,26 @@
subscribeChargingCapacity
);
// 鍔犺浇鍒皉edis缂撳瓨涓�, 鏌ヨ妯″潡鑷姩鏌ヨ鐘舵�佸苟澶勭悊
- boolean b = redisUtils.set(
- C3mRedisConstant.C3_NO_PAY_ORDER.getCode() + c3m.getC3Mac() + c3mOrderEntity.getOutTradeNo(),
- JSON.toJSONString(c3mOrderEntity),
- C3mRedisConfig.ORDER_MAX_TIME
- );
+// boolean b = redisUtils.set(
+// C3mRedisConstant.C3_NO_PAY_ORDER.getCode() + c3m.getC3Mac() + c3mOrderEntity.getOutTradeNo(),
+// JSON.toJSONString(c3mOrderEntity),
+// C3mRedisConfig.ORDER_MAX_TIME // TODO 娴嬭瘯鏃跺叧闂�
+// );
+ boolean b = true;
+ c3mOrderEntity.setOrderId(snowflake.nextId());
+ c3mOrderEntity.setC3Mac(c3m.getC3Name());
+ c3mOrderEntity.setPoleId(streetlightId);
+ c3mOrderEntity.setPoleMac(pole.getDeviceCode());
+ c3mOrderEntity.setPoleName(pole.getPoleName());
+ c3mOrderEntity.setC3Mac(c3m.getC3Mac());
+ c3mOrderEntity.setOrderStatus(0);
+
+
// 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
- orderQueryListener.startScan(OrderScanType.C3M.getType());
-// if(b){
-// save(c3mOrderEntity);
-// }
+// orderQueryListener.startScan(OrderScanType.C3M.getType()); // TODO 娴嬭瘯鏃跺叧闂�
+ if (b) {
+ this.save(c3mOrderEntity);
+ }
return b ? c3mOrderEntity : null;
}
@@ -167,14 +201,35 @@
if (!updateById(userOrder)) {
return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
}
+ /**
+ * 璋冭捣寮�濮嬪厖鐢垫帴鍙� // TODO
+ */
+
return WxPayNotifyResponse.success("鏇存柊鏁版嵁鎴愬姛");
}
-
+ /**
+ * 璁㈠崟璇︽儏 by orderSn
+ *
+ * @param orderSn
+ * @return
+ */
public C3mOrder getByOrderSn(String orderSn) {
LambdaQueryWrapper<C3mOrder> wrapper = Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getOutTradeNo, orderSn).last("limit 1");
return getOne(wrapper);
}
+ /**
+ * 璁㈠崟鍒楄〃
+ *
+ * @param baseConditionVO
+ * @return
+ */
+ public List<C3mOrderBo> orderList(BaseConditionVO baseConditionVO) {
+ Long userId = SecurityUtils.getClientId();
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<C3mOrderBo> list = baseMapper.orderList(userId);
+ return list;
+ }
}
--
Gitblit v1.9.3