From 745320cbb4edfa4fbc8f0f95483a4ee7893d5769 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 四月 2021 20:18:08 +0800
Subject: [PATCH] 3.9.2完善
---
src/main/java/com/yeshi/buwan/service/imp/order/OrderServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/imp/order/OrderServiceImpl.java b/src/main/java/com/yeshi/buwan/service/imp/order/OrderServiceImpl.java
index 6c4a0db..3970e42 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/order/OrderServiceImpl.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/order/OrderServiceImpl.java
@@ -13,6 +13,7 @@
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.exception.vip.VideoBuyRecordException;
import com.yeshi.buwan.pptv.PPTVVipManager;
import com.yeshi.buwan.service.inter.order.OrderService;
import com.yeshi.buwan.service.manager.GoldCornManager;
@@ -62,7 +63,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
public OrderRecord createOrder(OrderRecord record) throws OrderException {
- if (record.getMoney() == null || (record.getType() == null && record.getVideoInfoId() == null) || record.getOrderType() == null || record.getUid() == null) {
+ if (record.getMoney() == null || (record.getType() == null && record.getVideoCid() == null) || record.getOrderType() == null || record.getUid() == null) {
throw new OrderException(1, "鍙傛暟涓嶅畬鏁�");
}
@@ -104,7 +105,7 @@
@Transactional(rollbackFor = Exception.class)
// @GlobalTransactional(timeoutMills = 30000, name = "buwan-order", rollbackFor = Exception.class)
@Override
- public PayWayInfoDTO payOrder(OrderRecord record) throws OrderException, GoldCornException, PayException, VIPException, PPTVException {
+ public PayWayInfoDTO payOrder(OrderRecord record) throws OrderException, GoldCornException, PayException, VIPException, PPTVException, VideoBuyRecordException {
String orderNo = VIPOrderUtil.getOutOrderNo(record.getOrderType(), record.getId());
switch (record.getPayWay()) {
case OrderRecord
@@ -206,7 +207,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
public OrderRecord paySuccess(String id, int payWay, BigDecimal payMoney, Date payTime) throws
- VIPException, PPTVException {
+ VIPException, PPTVException, VideoBuyRecordException, OrderException {
orderLogger.info("璁㈠崟鏀粯鎴愬姛鐩殑鎵ц锛歩d-{}锛屾敮浠樻柟寮�-{},鏀粯閲戦-{}锛屾敮浠樻椂闂�-{}", id, payWay, payMoney, payTime.getTime());
Session session = vipOrderRecordDao.getSession();
@@ -215,11 +216,11 @@
Query query = session.createSQLQuery("select * from wk_vip_order_record r where r.id=? for update").addEntity(OrderRecord.class).setCacheable(false).setParameter(0, id);
List<OrderRecord> list = query.list();
if (list == null || list.size() == 0)
- throw new VIPException(10, "璁㈠崟涓嶅瓨鍦�");
+ throw new OrderException(10, "璁㈠崟涓嶅瓨鍦�");
OrderRecord record = list.get(0);
if (record.getState() != OrderRecord.STATE_NOT_PAY)
- throw new VIPException(1, "璁㈠崟鏈浜庡緟鏀粯鐘舵��");
+ throw new OrderException(1, "璁㈠崟鏈浜庡緟鏀粯鐘舵��");
if (payWay != OrderRecord.PAY_WAY_GOLDCORN) {
--
Gitblit v1.8.0