From 594ce0ec17a858987868cb815c44ef0b363b5010 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 13 四月 2021 04:07:33 +0800
Subject: [PATCH] pom优化
---
src/main/java/com/yeshi/buwan/controller/api/VIPController.java | 166 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 144 insertions(+), 22 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 762c037..8b72b47 100644
--- a/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
+++ b/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
@@ -2,12 +2,15 @@
import com.google.gson.*;
import com.yeshi.buwan.domain.user.LoginUser;
-import com.yeshi.buwan.domain.vip.UserVIPInfo;
-import com.yeshi.buwan.domain.vip.VIPOrderRecord;
-import com.yeshi.buwan.domain.vip.VIPPrice;
-import com.yeshi.buwan.domain.vip.VIPPriceType;
-import com.yeshi.buwan.exception.vip.VIPException;
+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.pptv.entity.VideoPPTVMap;
import com.yeshi.buwan.service.inter.LoginUserService;
+import com.yeshi.buwan.service.inter.juhe.PPTVService;
+import com.yeshi.buwan.service.inter.order.OrderService;
+import com.yeshi.buwan.service.inter.system.SystemConfigService;
import com.yeshi.buwan.service.inter.vip.VIPPriceService;
import com.yeshi.buwan.service.inter.vip.VIPService;
import com.yeshi.buwan.util.*;
@@ -21,10 +24,12 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.yeshi.utils.annotation.RequestSerializableByKey;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Type;
+import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -41,10 +46,19 @@
private VIPService vipService;
@Resource
+ private OrderService orderService;
+
+ @Resource
private LoginUserService loginUserService;
@Resource
private VIPPriceService vipPriceService;
+
+ @Resource
+ private SystemConfigService systemConfigService;
+
+ @Resource
+ private PPTVService pptvService;
@RequestMapping("getVIPPriceList")
@@ -71,6 +85,11 @@
userInfoVO.setId(user.getId());
userInfoVO.setNickName(user.getName());
userInfoVO.setPortrait(user.getPortrait());
+ if (StringUtil.isNullOrEmpty(userInfoVO.getPortrait())) {
+ String portrait = systemConfigService.getConfigValueByKeyCache("default_portrait");
+ userInfoVO.setPortrait(portrait);
+ }
+
if (vipInfo != null && vipInfo.getExpireDate() != null)
userInfoVO.setVipExpireTime(vipInfo.getExpireDate().getTime());
root.put("user", new Gson().toJson(userInfoVO));
@@ -78,6 +97,42 @@
List<VIPPrice> vipPriceList = vipPriceService.listValidPrice();
root.put("list", gson.toJson(vipPriceList));
+ return JsonUtilV2.loadTrueJson(root.toString());
+ }
+
+
+ @RequestMapping("getVIPOrderList")
+ @ResponseBody
+ public String getVIPOrderList(AcceptData acceptData, String loginUid, int page) {
+ Gson gson = new GsonBuilder().registerTypeAdapter(VIPPriceType.class, new JsonSerializer<VIPPriceType>() {
+ @Override
+ public JsonElement serialize(VIPPriceType value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ return new JsonPrimitive(value.getName());
+ }
+ }
+ }).registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
+ @Override
+ public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ return new JsonPrimitive(TimeUtil.getGernalTime(value.getTime(), "yyyy.MM.dd HH:mm"));
+ }
+ }
+ }).create();
+ JSONObject root = new JSONObject();
+
+ List<OrderRecord> list = orderService.listOrderRecord(loginUid, null, page, Constant.pageCount);
+ for (OrderRecord record : list) {
+ record.setIpInfo(null);
+ record.setUpdateTime(null);
+ }
+ long count = orderService.countOrderRecord(loginUid, null);
+ root.put("list", gson.toJson(list));
+ root.put("count", count);
return JsonUtilV2.loadTrueJson(root.toString());
}
@@ -90,7 +145,7 @@
*/
@RequestMapping("createOrder")
@ResponseBody
- public String createOrder(AcceptData acceptData, HttpServletRequest request, String loginUid, String priceId, int payWay) {
+ public String createOrder(AcceptData acceptData, HttpServletRequest request, String loginUid, String priceId, String infoId, Integer goldCorn, int payWay) {
if (StringUtil.isNullOrEmpty(loginUid)) {
return JsonUtilV2.loadFalseJson("鐢ㄦ埛鏈櫥褰�");
@@ -102,49 +157,87 @@
}
if (StringUtil.isNullOrEmpty(user.getPhone())) {
- return JsonUtilV2.loadFalseJson(10001,"璇风粦瀹氱數璇濆彿鐮�");
+ return JsonUtilV2.loadFalseJson(10001, "璇风粦瀹氱數璇濆彿鐮�");
+ }
+
+ if (StringUtil.isNullOrEmpty(priceId) && StringUtil.isNullOrEmpty(infoId)) {
+ return JsonUtilV2.loadFalseJson("璇烽�夋嫨璐拱绫诲瀷");
+ }
+
+ OrderType orderType = OrderType.vip;
+
+ if (!StringUtil.isNullOrEmpty(infoId)) {
+ orderType = OrderType.video;
}
String ip = IPUtil.getRemotIP(request);
- VIPPrice vipPrice = vipPriceService.selectByPrimaryKey(priceId);
- if (vipPrice == null) {
- return JsonUtilV2.loadFalseJson("濂楅涓嶅瓨鍦�");
+
+ VIPPrice vipPrice = null;
+ if (orderType == OrderType.video) {
+ //瑙嗛
+ VideoPPTVMap map = pptvService.selectVideoPPTVMapByInfoId(infoId);
+ if (map == null) {
+ return JsonUtilV2.loadFalseJson("褰辩墖涓嶅瓨鍦�");
+ }
+ } else {
+ vipPrice = vipPriceService.selectByPrimaryKey(priceId);
+ if (vipPrice == null) {
+ return JsonUtilV2.loadFalseJson("濂楅涓嶅瓨鍦�");
+ }
}
- VIPOrderRecord record = new VIPOrderRecord();
+ OrderRecord record = new OrderRecord();
record.setUid(loginUid);
- record.setType(vipPrice.getType());
- record.setMoney(vipPrice.getPrice());
- record.setState(VIPOrderRecord.STATE_NOT_PAY);
+ if (vipPrice != null)
+ record.setType(vipPrice.getType());
+
+ record.setOrderType(orderType);
+ record.setVideoInfoId(infoId);
+ record.setGoldCorn(goldCorn);
+ record.setMoney(vipPrice.getActualPrice());
+ record.setPayWay(payWay);
+ record.setState(OrderRecord.STATE_NOT_PAY);
+ record.setIpInfo(IPUtil.getRemotIP(request) + ":" + IPUtil.getRemotePort(request));
try {
- vipService.addVIPRecord(record);
- } catch (VIPException e) {
+ orderService.createOrder(record);
+ } catch (OrderException e) {
logger.error("鐢熸垚璁㈠崟鍑洪敊", e);
return JsonUtilV2.loadFalseJson("鐢熸垚璁㈠崟鍑洪敊");
}
- String orderNo = VIPOrderUtil.getOutOrderNo(record.getId());
+
+ try {
+ orderService.payOrder(record);
+ } catch (OrderException e) {
+ e.printStackTrace();
+ } catch (GoldCornException e) {
+ e.printStackTrace();
+ } catch (PayException e) {
+ e.printStackTrace();
+ }
+
+ String orderNo = VIPOrderUtil.getOutOrderNo(record.getOrderType(), record.getId());
switch (payWay) {
- case VIPOrderRecord
+ case OrderRecord
.PAY_WAY_ALIPAY: {
//鐢熸垚鏀粯瀹濇敮浠樿鍗�
- String form = VipUtil.getVipChargeAlipayForm(orderNo, record.getMoney());
+ String form = VipUtil.getVipChargeAlipayForm(record.getId(), orderNo, record.getMoney());
//鏆傚瓨2鍒嗛挓
String id = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
redisManager.cacheCommonString(id, form, 120);
org.json.JSONObject data = new org.json.JSONObject();
- data.put("payUrl", "http://api.ysdq.yeshitv.com:8089/BuWan/alipay/printPayForm?formId=" + id);
+ data.put("payUrl", Constant.HOST + "/BuWan/alipay/printPayForm?formId=" + id);
data.put("payWay", payWay);
return JsonUtilV2.loadTrueJson(data.toString());
}
- case VIPOrderRecord
+ case OrderRecord
.PAY_WAY_WX: {
//鐢熸垚寰俊鏀粯璁㈠崟
try {
- String payUrl = VipUtil.createWXOrder(ip, orderNo, vipPrice.getPrice(), "褰辫澶у叏VIP-" + vipPrice.getType().getName());
+ String payUrl = VipUtil.createWXOrder(record.getId(), ip, orderNo, vipPrice.getActualPrice(), "褰辫澶у叏VIP-" + vipPrice.getType().getName());
org.json.JSONObject data = new org.json.JSONObject();
data.put("payUrl", payUrl);
data.put("payWay", payWay);
@@ -159,5 +252,34 @@
return JsonUtilV2.loadFalseJson("璇烽�夋嫨鏀粯鏂瑰紡");
}
+ /**
+ * 妫�鏌ユ槸鍚︽敮浠�
+ *
+ * @param acceptData
+ * @param loginUid
+ * @param id
+ * @return
+ */
+ @RequestMapping("checkPay")
+ @ResponseBody
+ @RequestSerializableByKey(key = "'vip-checkPay-'+#id")
+ public String checkPay(AcceptData acceptData, String loginUid, String 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() != OrderRecord.STATE_PAY) {
+ return JsonUtilV2.loadFalseJson(1, "鏀粯鏈畬鎴�");
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("money", record.getPayMoney() == null ? record.getMoney() : record.getPayMoney());
+
+ return JsonUtilV2.loadTrueJson(data.toString());
+ }
+
}
--
Gitblit v1.8.0