From 549f10ba314e3e9270ef8c7d52862ccf31ded8a2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 十月 2024 15:12:23 +0800
Subject: [PATCH] Fm中增加分析hash值集合功能方法
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/virtualCard/VirtualCardSv.java | 67 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 15 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..903bf55 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,21 +4,19 @@
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;
-import com.dy.pipIrrWechat.virtualCard.dto.DtoVcRecharge;
+import com.dy.pipIrrWechat.result.WechatResultCode;
import com.dy.pipIrrWechat.virtualCard.dto.DtoVirtualCard;
import com.dy.pipIrrWechat.virtualCard.enums.LastOperateENUM;
import com.dy.pipIrrWechat.virtualCard.enums.OrderStateENUM;
-import com.dy.pipIrrWechat.result.WechatResultCode;
+import com.dy.pipIrrWechat.virtualCard.qo.QoVcRecharge;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +49,12 @@
@Autowired
private SeClientMapper seClientMapper;
+ @Autowired
+ private SeVcOperateMapper seVcOperateMapper;
+
+ @Value("${vc.alarmValue}")
+ private Integer alarmValue;
+
/**
* 鏍规嵁鍐滄埛ID鑾峰彇5绾ц鏀垮尯鍒掍唬鐮侊紝娉ㄥ唽铏氭嫙鍗′娇鐢�
* @param clientId 鍐滄埛ID
@@ -65,7 +69,7 @@
* @return
*/
public List<VoVirtualCard> getVCs(Long clientId) {
- return seVirtualCardMapper.getVCs(clientId);
+ return seVirtualCardMapper.getVCs(alarmValue, clientId);
}
/**
@@ -85,6 +89,26 @@
public Long insertVirtualCard(SeVirtualCard po) {
seVirtualCardMapper.insert(po);
return po.getId();
+ }
+
+ /**
+ * 鏍规嵁鍐滄埛ID鍙婅櫄鎷熷崱ID鑾峰彇姝ｅ父鐘舵�佺殑铏氭嫙鍗″璞�
+ * @param clientId
+ * @param vcId
+ * @return
+ */
+ public SeVirtualCard getVcByClientIdAndVcId (Long clientId, Long vcId) {
+ return seVirtualCardMapper.getVcByClientIdAndVcId(clientId, vcId);
+ }
+
+ /**
+ * 鏍规嵁铏氭嫙鍗D娉ㄩ攢铏氭嫙鍗�
+ * @param clientId
+ * @param vcId
+ * @return
+ */
+ public Integer cancelVc(Long clientId, Long vcId) {
+ return seVirtualCardMapper.cancelVc(clientId, vcId);
}
/**
@@ -128,9 +152,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 +163,9 @@
// 楠岃瘉璇ヨ櫄鎷熷崱璐︽埛鏄惁瀛樺湪骞跺彇鍑哄綋鍓嶈处鎴蜂綑棰�
SeVirtualCard seVirtualCard = seVirtualCardMapper.selectByPrimaryKey(virtualId);
+
if(seVirtualCard == null) {
- return BaseResponseUtils.buildFail(WechatResultCode.NO_ACCOUNT.getMessage());
+ return -1L;
}
Double money = seVirtualCard.getMoney();
@@ -152,11 +178,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;
}
/**
@@ -336,7 +363,7 @@
* @param dtoVcRecharge
* @return
*/
- public QueryResultVo<List<VoVcRecharge>> getVcRechargeRecords(DtoVcRecharge dtoVcRecharge){
+ public QueryResultVo<List<VoVcRecharge>> getVcRechargeRecords(QoVcRecharge dtoVcRecharge){
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(dtoVcRecharge);
Long itemTotal = seVirtualCardMapper.getRechargeRecordCount(params);
@@ -349,4 +376,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