From 52d926ef0abf4f4f857d74c156191e84303cb746 Mon Sep 17 00:00:00 2001
From: YJ <YJ>
Date: 星期一, 17 五月 2021 17:16:08 +0800
Subject: [PATCH] 订单
---
service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java | 163 ++++++++++++++++++++++++++++-------------------------
1 files changed, 86 insertions(+), 77 deletions(-)
diff --git a/service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java b/service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java
index 872e011..bd9bdbe 100644
--- a/service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java
+++ b/service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java
@@ -40,88 +40,97 @@
private VipCenterService vipCenterService;
-
-
- @Transactional(rollbackFor = Exception.class)
@Override
- 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.PAY_WAY_ALIPAY_GOLDCORN:
- try {
- goldCornManager.consumeGoldCorn(record, record.getGoldCorn());
- } catch (Exception e) {
- throw new GoldCornException(1, "褰辫璞嗘墸闄ゅ嚭閿�");
- }
- paySuccess(record.getId(), OrderRecord.PAY_WAY_GOLDCORN, null, new Date());
+ public PayWayInfoDTO payOrder(VipOrder order) {
+ return null;
+ }
- orderLogger.info("璁㈠崟褰辫璞嗘敮浠樻垚鍔燂細id-{}", record.getId());
- case OrderRecord.PAY_WAY_ALIPAY: {
- if (record.getMoney() != null && record.getMoney().compareTo(new BigDecimal(0)) == 0) {
- return new PayWayInfoDTO(0, VipUtil.getPaySuccessUrl(record.getId()));
- }
- //鐢熸垚鏀粯瀹濇敮浠樿鍗�
- String form = VipUtil.getVipChargeAlipayForm(record.getId(), record.getOrderType(), orderNo, record.getMoney());
- //鏆傚瓨2鍒嗛挓
- String id = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
- redisManager.cacheCommonString(id, form, 120);
- String payUrl = Constant.HOST + "/BuWan/alipay/printPayForm?formId=" + id;
- orderLogger.info("璁㈠崟鍒涘缓鏀粯瀹濇敮浠橀摼鎺ユ垚鍔燂細id-{} 閾炬帴-{}", record.getId(), payUrl);
- return new PayWayInfoDTO(OrderRecord
- .PAY_WAY_ALIPAY, payUrl);
- }
- case OrderRecord.PAY_WAY_WX_GOLDCORN:
- try {
- goldCornManager.consumeGoldCorn(record, record.getGoldCorn());
- } catch (){
- }
- }
+ @Override
+ public VipOrder checkOrderPayState(String id) {
+ return null;
+ }
- @Transactional(rollbackFor = Exception.class)
- @Override
- public OrderRecord checkOrderPayState(String id) {
- OrderRecord record = vipOrderRecordDao.find(OrderRecord.class, id);
- if (record.getState() == OrderRecord.STATE_PAY)
- return record;
+// @Transactional(rollbackFor = Exception.class)
+// @Override
+// 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.PAY_WAY_ALIPAY_GOLDCORN:
+// try {
+// goldCornManager.consumeGoldCorn(record, record.getGoldCorn());
+// } catch (Exception e) {
+// throw new GoldCornException(1, "褰辫璞嗘墸闄ゅ嚭閿�");
+// }
+// paySuccess(record.getId(), OrderRecord.PAY_WAY_GOLDCORN, null, new Date());
+//
+// case OrderRecord.PAY_WAY_ALIPAY: {
+// if (record.getMoney() != null && record.getMoney().compareTo(new BigDecimal(0)) == 0) {
+// return new PayWayInfoDTO(0, VipUtil.getPaySuccessUrl(record.getId()));
+// }
+// //鐢熸垚鏀粯瀹濇敮浠樿鍗�
+// String form = VipUtil.getVipChargeAlipayForm(record.getId(), record.getOrderType(), orderNo, record.getMoney());
+// //鏆傚瓨2鍒嗛挓
+// String id = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
+// redisManager.cacheCommonString(id, form, 120);
+// String payUrl = Constant.HOST + "/BuWan/alipay/printPayForm?formId=" + id;
+// orderLogger.info("璁㈠崟鍒涘缓鏀粯瀹濇敮浠橀摼鎺ユ垚鍔燂細id-{} 閾炬帴-{}", record.getId(), payUrl);
+// return new PayWayInfoDTO(OrderRecord
+// .PAY_WAY_ALIPAY, payUrl);
+// }
+// case OrderRecord.PAY_WAY_WX_GOLDCORN:
+// try {
+// goldCornManager.consumeGoldCorn(record, record.getGoldCorn());
+// } catch (){
+// }
+// }
- switch (record.getPayWay()) {
- case OrderRecord.PAY_WAY_ALIPAY_GOLDCORN:
- case OrderRecord.PAY_WAY_ALIPAY: {
- //鏀粯瀹�
- AlipayTradeQueryResponse res = null;
- try {
- res = AlipayH5PayUtil.queryOrder(VipUtil.getAlipayApp(), VIPOrderUtil.getOutOrderNo(record.getOrderType(), id), null);
- //鏀粯鎴愬姛
- if (res.isSuccess() && "TRADE_SUCCESS".equalsIgnoreCase(res.getTradeStatus())) {
- try {
- return paySuccess(id, OrderRecord.PAY_WAY_ALIPAY, new BigDecimal(res.getTotalAmount()), new Date());
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- } catch (AlipayApiException e) {
- e.printStackTrace();
- }
- }
- break;
- case OrderRecord.PAY_WAY_WX_GOLDCORN:
- case OrderRecord.PAY_WAY_WX: {
- //寰俊
- try {
- WXPayOrderInfoV3 info = WXPayV3Util.getPayOrderInfo(VIPOrderUtil.getOutOrderNo(record.getOrderType(), id), VipUtil.getWXAPP());
- if (info != null && info.getTrade_state().equalsIgnoreCase("SUCCESS")) {
- paySuccess(id, record.getPayWay(), new BigDecimal(info.getAmount().getPayer_total()).divide(new BigDecimal(100), 2, RoundingMode.FLOOR), new Date());
- return record;
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- break;
- }
- return record;
- }
+// @Transactional(rollbackFor = Exception.class)
+// @Override
+// public OrderRecord checkOrderPayState(String id) {
+// OrderRecord record = vipOrderRecordDao.find(OrderRecord.class, id);
+// if (record.getState() == OrderRecord.STATE_PAY)
+// return record;
+//
+// switch (record.getPayWay()) {
+// case OrderRecord.PAY_WAY_ALIPAY_GOLDCORN:
+// case OrderRecord.PAY_WAY_ALIPAY: {
+// //鏀粯瀹�
+// AlipayTradeQueryResponse res = null;
+// try {
+// res = AlipayH5PayUtil.queryOrder(VipUtil.getAlipayApp(), VIPOrderUtil.getOutOrderNo(record.getOrderType(), id), null);
+// //鏀粯鎴愬姛
+// if (res.isSuccess() && "TRADE_SUCCESS".equalsIgnoreCase(res.getTradeStatus())) {
+// try {
+// return paySuccess(id, OrderRecord.PAY_WAY_ALIPAY, new BigDecimal(res.getTotalAmount()), new Date());
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+// } catch (AlipayApiException e) {
+// e.printStackTrace();
+// }
+// }
+//
+// break;
+// case OrderRecord.PAY_WAY_WX_GOLDCORN:
+// case OrderRecord.PAY_WAY_WX: {
+// //寰俊
+// try {
+// WXPayOrderInfoV3 info = WXPayV3Util.getPayOrderInfo(VIPOrderUtil.getOutOrderNo(record.getOrderType(), id), VipUtil.getWXAPP());
+// if (info != null && info.getTrade_state().equalsIgnoreCase("SUCCESS")) {
+// paySuccess(id, record.getPayWay(), new BigDecimal(info.getAmount().getPayer_total()).divide(new BigDecimal(100), 2, RoundingMode.FLOOR), new Date());
+// return record;
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+// break;
+// }
+// return record;
+//
+// }
}
--
Gitblit v1.8.0