From 5129d2c63fbef70c6ee45ba5ec12654937e05231 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 12 四月 2021 19:05:57 +0800
Subject: [PATCH] seata集成
---
src/main/java/com/yeshi/buwan/controller/api/VIPController.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/api/VIPController.java b/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
index c860709..8b72b47 100644
--- a/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
+++ b/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
@@ -1,13 +1,11 @@
package com.yeshi.buwan.controller.api;
import com.google.gson.*;
-import com.yeshi.buwan.domain.system.SystemConfig;
import com.yeshi.buwan.domain.user.LoginUser;
import com.yeshi.buwan.domain.vip.*;
import com.yeshi.buwan.exception.goldcorn.GoldCornException;
import com.yeshi.buwan.exception.order.OrderException;
import com.yeshi.buwan.exception.order.PayException;
-import com.yeshi.buwan.exception.vip.VIPException;
import com.yeshi.buwan.pptv.entity.VideoPPTVMap;
import com.yeshi.buwan.service.inter.LoginUserService;
import com.yeshi.buwan.service.inter.juhe.PPTVService;
@@ -127,8 +125,8 @@
}).create();
JSONObject root = new JSONObject();
- List<VIPOrderRecord> list = orderService.listOrderRecord(loginUid, null, page, Constant.pageCount);
- for (VIPOrderRecord record : list) {
+ List<OrderRecord> list = orderService.listOrderRecord(loginUid, null, page, Constant.pageCount);
+ for (OrderRecord record : list) {
record.setIpInfo(null);
record.setUpdateTime(null);
}
@@ -189,7 +187,7 @@
}
}
- VIPOrderRecord record = new VIPOrderRecord();
+ OrderRecord record = new OrderRecord();
record.setUid(loginUid);
if (vipPrice != null)
record.setType(vipPrice.getType());
@@ -199,7 +197,7 @@
record.setGoldCorn(goldCorn);
record.setMoney(vipPrice.getActualPrice());
record.setPayWay(payWay);
- record.setState(VIPOrderRecord.STATE_NOT_PAY);
+ record.setState(OrderRecord.STATE_NOT_PAY);
record.setIpInfo(IPUtil.getRemotIP(request) + ":" + IPUtil.getRemotePort(request));
try {
orderService.createOrder(record);
@@ -221,7 +219,7 @@
String orderNo = VIPOrderUtil.getOutOrderNo(record.getOrderType(), record.getId());
switch (payWay) {
- case VIPOrderRecord
+ case OrderRecord
.PAY_WAY_ALIPAY: {
//鐢熸垚鏀粯瀹濇敮浠樿鍗�
String form = VipUtil.getVipChargeAlipayForm(record.getId(), orderNo, record.getMoney());
@@ -235,7 +233,7 @@
}
- case VIPOrderRecord
+ case OrderRecord
.PAY_WAY_WX: {
//鐢熸垚寰俊鏀粯璁㈠崟
try {
@@ -266,14 +264,14 @@
@ResponseBody
@RequestSerializableByKey(key = "'vip-checkPay-'+#id")
public String checkPay(AcceptData acceptData, String loginUid, String id) {
- VIPOrderRecord record = orderService.getOrderRecord(id);
+ OrderRecord record = orderService.getOrderRecord(id);
if (record == null || !record.getUid().equalsIgnoreCase(loginUid)) {
return JsonUtilV2.loadFalseJson("璁板綍涓嶅瓨鍦�/涓嶆槸鎮ㄧ殑璁㈠崟");
}
record = orderService.checkOrderPayState(id);
//鏈敮浠�
- if (record != null && record.getState() != VIPOrderRecord.STATE_PAY) {
+ if (record != null && record.getState() != OrderRecord.STATE_PAY) {
return JsonUtilV2.loadFalseJson(1, "鏀粯鏈畬鎴�");
}
--
Gitblit v1.8.0