From 5d2d3cca27b31a3c27ad9ec39a5def9de0ddb7b4 Mon Sep 17 00:00:00 2001
From: YJ <YJ>
Date: 星期二, 18 五月 2021 17:02:07 +0800
Subject: [PATCH] 会员订单调整
---
service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java | 269 +++++++++++++++++++++++++----------------------------
1 files changed, 128 insertions(+), 141 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 ad7fcda..38fa184 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
@@ -1,5 +1,7 @@
package com.ks.vip.service.remote;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.response.AlipayTradeQueryResponse;
import com.ks.vip.exception.VipOrderException;
import com.ks.vip.mapper.VipOrderMapper;
import com.ks.vip.pojo.DO.VipCombo;
@@ -48,25 +50,76 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public PayWayInfoDTO addOrderByBuy(VipOrderDTO t) throws VipOrderException {
+ if(t.getComboId() == null || t.getComboId() <= 0){
+ throw new VipOrderException(1, "濂楅ID涓嶈兘涓虹┖");
+ }
+ if(StringUtil.isNullOrEmpty(t.getUid())){
+ throw new VipOrderException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
+ }
+ if(t.getPayWay() == null){
+ throw new VipOrderException(1, "浠樻鏂瑰紡涓嶈兘涓虹┖");
+ }
+ if(StringUtil.isNullOrEmpty(t.getThreeOrderId())){
+ throw new VipOrderException(1, "浠樻璁㈠崟鍙蜂笉鑳戒负绌�");
+ }
+
+ // 妫�鏌ユ槸鍚﹀凡璁板綍
+ VipOrder order = vipOrderMapper.getByThreeOrderId(t.getThreeOrderId());
+ if (order != null) {
+ throw new VipOrderException(1, "璇ヤ粯娆捐鍗曞彿宸插瓨鍦�");
+ }
+
+ // 鍒ゆ柇璁㈠崟绫诲瀷: 棣栧崟銆佺画璐�
+ String orderType = OrderTypeEnum.buyNewly.name();
+ long count = vipOrderMapper.countByTypeAndUid(t.getUid(), orderType);
+ if(count > 0) {
+ orderType = OrderTypeEnum.buyRenew.name();
+ }
+
+ // 鎻掑叆璁㈠崟淇℃伅
+ VipOrder newOrder = new VipOrder();
+ newOrder.setComboId(t.getComboId());
+ newOrder.setUid(t.getUid());
+ newOrder.setThreeOrderId(t.getThreeOrderId());
+ newOrder.setPayWay(t.getPayWay().name());
+ newOrder.setType(orderType);
+ newOrder.setCreateTime(new Date());
+ vipOrderMapper.insertSelective(newOrder);
+
+ // 鏀粯鏂瑰紡
+ return payOrder(newOrder);
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public PayWayInfoDTO payOrder(VipOrder order) {
- String title = Constant.ORDER_PAY_TITLE;
+ String goodsTitle = Constant.ORDER_PAY_TITLE;
String orderId = order.getId() + "";
switch (order.getPayWay()) {
- case "alipay":
- String formAlipay = PayUtil.getVipChargeAlipayForm(orderId, title, orderId, order.getPayMoney());
+ case "alipay": //鐢熸垚鏀粯瀹濇敮浠樿鍗�
+ if (order.getState() == VipOrder.STATE_PAY) {
+ return new PayWayInfoDTO(PayWayEnum.alipay.getWay(), PayUtil.getPaySuccessUrl(orderId));
+ }
+ String form = PayUtil.getVipChargeAlipayForm(orderId, goodsTitle, orderId, order.getPayMoney());
//鏆傚瓨2鍒嗛挓
String id = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
- redisManager.cacheCommonString(id, formAlipay, 120);
+ redisManager.cacheCommonString(id, form, 120);
String payUrl = Constant.HOST + "/BuWan/alipay/printPayForm?formId=" + id;
return new PayWayInfoDTO(PayWayEnum.alipay.getWay(), payUrl);
case "weChat":
- try{
- String formWX = PayUtil.createWXOrder(orderId, null, orderId,order.getPayMoney() ,title);
+ try {
+ if (order.getState() == VipOrder.STATE_PAY) {
+ return new PayWayInfoDTO(PayWayEnum.weChat.getWay(), PayUtil.getPaySuccessUrl(orderId));
+ }
+
+ String formWX = PayUtil.createWXOrder(orderId, null, orderId, order.getPayMoney() ,goodsTitle);
//鏆傚瓨2鍒嗛挓
- String idwx = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
- redisManager.cacheCommonString(idwx, formWX, 120);
- String payUrlwx = Constant.HOST + "/BuWan/alipay/printPayForm?formId=" + idwx;
- return new PayWayInfoDTO(PayWayEnum.weChat.getWay(), payUrlwx);
+ String idWX = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
+ redisManager.cacheCommonString(formWX, formWX, 120);
+ String payUrlWX = Constant.HOST + "/BuWan/alipay/printPayForm?formId=" + idWX;
+ return new PayWayInfoDTO(PayWayEnum.weChat.getWay(), payUrlWX);
} catch (Exception e) {
}
@@ -74,143 +127,77 @@
return null;
}
+
@Override
@Transactional(rollbackFor = Exception.class)
public VipOrder checkOrderPayState(Long id) {
- VipOrder vipOrder = vipOrderMapper.selectByPrimaryKey(id);
- if (vipOrder == null || vipOrder.getState() == VipOrder.STATE_PAY) {
- return vipOrder;
+ VipOrder order = vipOrderMapper.selectByPrimaryKey(id);
+ if (order == null || order.getState() == VipOrder.STATE_PAY) {
+ return order;
+ }
+ switch (order.getPayWay()) {
+ case "alipay": //鏀粯瀹�
+ AlipayTradeQueryResponse res = null;
+ try {
+ res = AlipayH5PayUtil.queryOrder(PayUtil.getAlipayApp(), id+"" , null);
+ //鏀粯鎴愬姛
+ if (res.isSuccess() && "TRADE_SUCCESS".equalsIgnoreCase(res.getTradeStatus())) {
+ try {
+ return paySuccess(order);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ } catch (AlipayApiException e) {
+ e.printStackTrace();
+ }
+ case "weChat": //寰俊
+ try {
+ WXPayOrderInfoV3 info = WXPayV3Util.getPayOrderInfo(id+"" , PayUtil.getWXAPP());
+ if (info != null && info.getTrade_state().equalsIgnoreCase("SUCCESS")) {
+ paySuccess(order);
+ return order;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
+
+ /**
+ * 鏀粯鎴愬姛鏇存柊澶勭悊
+ * @param order
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public VipOrder paySuccess(VipOrder order) throws VipOrderException {
+
+ VipCombo vipCombo = vipComboService.selectByPrimaryKey(order.getComboId());
+ if (vipCombo == null) {
+ throw new VipOrderException(1, "璇ュ椁愪笉瀛樺湪");
+ }
+ // 鏈夋晥澶╂暟
+ Integer validDays = vipCombo.getValidDays();
+
+ // 鍒ゆ柇璁㈠崟绫诲瀷
+ String orderType = OrderTypeEnum.buyNewly.name();
+ long count = vipOrderMapper.countByTypeAndUid(order.getUid(), orderType);
+ if(count > 0) {
+ orderType = OrderTypeEnum.buyRenew.name();
}
+ // order.setThreeOrderId(); TODO
+ order.setState(VipOrder.STATE_PAY);
+ order.setPayTime(new Date());
+ order.setUpdateTime(new Date());
+ vipOrderMapper.updateByPrimaryKeySelective(order);
+ // 鏇存柊绛夌骇
+ vipCenterService.saveVipCenter(order.getUid(), vipCombo.getGradeId(), validDays, order.getId() );
-// 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 order;
+ }
-
-
- return null;
- }
-
-
-// @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 (){
-// }
-// }
-
-
-
-// @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