From 7e92584190223b2967e6a5473d9c23e0e05b2437 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 19 八月 2024 21:00:59 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java
index 2f4a5ff..d6d9cd4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java
@@ -4,10 +4,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSe.*;
-import com.dy.pipIrrGlobal.pojoSe.SeVcRecharge;
-import com.dy.pipIrrGlobal.pojoSe.SeVcRefund;
-import com.dy.pipIrrGlobal.pojoSe.SeVcRefundItem;
-import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
+import com.dy.pipIrrGlobal.pojoSe.*;
import com.dy.pipIrrGlobal.voSe.VoOrders;
import com.dy.pipIrrGlobal.voSe.VoVcRecharge;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
@@ -50,6 +47,9 @@
@Autowired
private SeClientMapper seClientMapper;
+
+ @Autowired
+ private SeVcOperateMapper seVcOperateMapper;
/**
* 鏍规嵁鍐滄埛ID鑾峰彇5绾ц鏀垮尯鍒掍唬鐮侊紝娉ㄥ唽铏氭嫙鍗′娇鐢�
@@ -128,9 +128,10 @@
* 娣诲姞铏氭嫙鍗″厖鍊艰褰�
* JSAPI涓嬪崟鍚庣敓鎴愰儴鍒嗗厖鍊艰褰�
* @param po
- * @return
+ * @return -1锛氳櫄鎷熷崱涓嶅瓨鍦紝0锛氭坊鍔犲厖鍊艰褰曞け璐�
*/
- public BaseResponse<Boolean> insertVCRecharge(DtoVirtualCard po) {
+ //public BaseResponse<Boolean> insertVCRecharge(DtoVirtualCard po) {
+ public Long insertVCRecharge(DtoVirtualCard po) {
String orderNumber = po.getOrderNumber();
Long virtualId = po.getVirtualId();
Long clientId = po.getClientId();
@@ -138,8 +139,9 @@
// 楠岃瘉璇ヨ櫄鎷熷崱璐︽埛鏄惁瀛樺湪骞跺彇鍑哄綋鍓嶈处鎴蜂綑棰�
SeVirtualCard seVirtualCard = seVirtualCardMapper.selectByPrimaryKey(virtualId);
+
if(seVirtualCard == null) {
- return BaseResponseUtils.buildFail(WechatResultCode.NO_ACCOUNT.getMessage());
+ return -1L;
}
Double money = seVirtualCard.getMoney();
@@ -152,11 +154,12 @@
seVcRecharge.setRechargeAmount(rechargeAmount);
seVcRecharge.setOrderTime(new Date());
seVcRecharge.setOrderState(OrderStateENUM.NON_PAYMENT.getCode());
- Integer rec = seVcRechargeMapper.insert(seVcRecharge);
- if(rec == null) {
- return BaseResponseUtils.buildFail(WechatResultCode.RECHARGE_FAIL.getMessage());
+ seVcRechargeMapper.insert(seVcRecharge);
+ Long rechargeId = seVcRecharge.getId();
+ if(rechargeId == null) {
+ return 0L;
}
- return BaseResponseUtils.buildSuccess(true) ;
+ return rechargeId;
}
/**
@@ -349,4 +352,14 @@
return rsVo;
}
+
+ /**
+ * 娣诲姞铏氭嫙鍗℃搷浣滆褰�
+ * @param po
+ * @return
+ */
+ public Long insertVcOperate(SeVcOperate po) {
+ seVcOperateMapper.insert(po);
+ return po.getId();
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0