From ec486601f96851b18a4c9a767f25bba8a1a0bca7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 29 七月 2024 16:58:32 +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 | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 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 1b25e36..2f4a5ff 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
@@ -11,13 +11,11 @@
import com.dy.pipIrrGlobal.voSe.VoOrders;
import com.dy.pipIrrGlobal.voSe.VoVcRecharge;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
-
-import com.dy.pipIrrSell.result.SellResultCode;
-import com.dy.pipIrrSell.virtualCard.dto.DtoVcRecharge;
-import com.dy.pipIrrSell.virtualCard.dto.DtoVirtualCard;
-import com.dy.pipIrrSell.virtualCard.enums.LastOperateENUM;
-import com.dy.pipIrrSell.virtualCard.enums.OrderStateENUM;
-
+import com.dy.pipIrrWechat.virtualCard.dto.DtoVcRecharge;
+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 lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,8 +28,8 @@
/**
* @author ZhuBaoMin
- * @date 2024-07-11 15:49
- * @LastEditTime 2024-07-11 15:49
+ * @date 2024-07-15 9:39
+ * @LastEditTime 2024-07-15 9:39
* @Description
*/
@@ -141,7 +139,7 @@
// 楠岃瘉璇ヨ櫄鎷熷崱璐︽埛鏄惁瀛樺湪骞跺彇鍑哄綋鍓嶈处鎴蜂綑棰�
SeVirtualCard seVirtualCard = seVirtualCardMapper.selectByPrimaryKey(virtualId);
if(seVirtualCard == null) {
- return BaseResponseUtils.buildFail(SellResultCode.NO_ACCOUNT.getMessage());
+ return BaseResponseUtils.buildFail(WechatResultCode.NO_ACCOUNT.getMessage());
}
Double money = seVirtualCard.getMoney();
@@ -156,7 +154,7 @@
seVcRecharge.setOrderState(OrderStateENUM.NON_PAYMENT.getCode());
Integer rec = seVcRechargeMapper.insert(seVcRecharge);
if(rec == null) {
- return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(WechatResultCode.RECHARGE_FAIL.getMessage());
}
return BaseResponseUtils.buildSuccess(true) ;
}
@@ -182,7 +180,7 @@
public BaseResponse<Boolean> updateVCRecharge(String orderNumber, Date rechargeTime) {
SeVcRecharge seVcRecharge = seVcRechargeMapper.getVCRechargeByorderNumber(orderNumber);
if(seVcRecharge == null) {
- return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_NOT_EXIST.getMessage());
+ return BaseResponseUtils.buildFail(WechatResultCode.RECHARGE_NOT_EXIST.getMessage());
}
Long virtualId = seVcRecharge.getVcId();
@@ -195,19 +193,19 @@
seVcRecharge.setOrderState(OrderStateENUM.PAID.getCode());
Integer rec = seVcRechargeMapper.updateByPrimaryKeySelective(seVcRecharge);
if(rec == null) {
- return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(WechatResultCode.RECHARGE_FAIL.getMessage());
}
SeVirtualCard seVirtualCard = seVirtualCardMapper.selectByPrimaryKey(virtualId);
if(seVirtualCard == null) {
- return BaseResponseUtils.buildFail(SellResultCode.VIRTUAL_CARD_NOT_EXIST.getMessage());
+ return BaseResponseUtils.buildFail(WechatResultCode.VIRTUAL_CARD_NOT_EXIST.getMessage());
}
seVirtualCard.setMoney(afterRrecharge);
seVirtualCard.setLastOperate(LastOperateENUM.RECHARGE.getCode());
seVirtualCard.setLastOperateTime(new Date());
Integer rec2 = seVirtualCardMapper.updateByPrimaryKeySelective(seVirtualCard);
if(rec2 == null) {
- return BaseResponseUtils.buildFail(SellResultCode.RECHARGE_FAIL.getMessage());
+ return BaseResponseUtils.buildFail(WechatResultCode.RECHARGE_FAIL.getMessage());
}
return BaseResponseUtils.buildSuccess(true) ;
}
@@ -351,5 +349,4 @@
return rsVo;
}
-}
-
+}
\ No newline at end of file
--
Gitblit v1.8.0