Skip to content

B
browser-backend
Commit 580f0d37 authored by xuxin's avatar xuxin
Browse files
Options

充值续费相关日志添加

parent bbeea2dc
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 7 deletions
src/main/java/com/edgec/browserbackend/account/service/impl/PaymentServiceImpl.java
View file @ 580f0d37
...@@ -71,6 +71,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -71,6 +71,7 @@ public class PaymentServiceImpl implements PaymentService {
UserPayment byTradeNo = userPaymentRepository.findByTradeNo(tradno); UserPayment byTradeNo = userPaymentRepository.findByTradeNo(tradno);
if (byTradeNo != null && !byTradeNo.isSucceed()) { if (byTradeNo != null && !byTradeNo.isSucceed()) {
log.info("微信支付回调确认订单" + byTradeNo.getTradeNo() + "支付状态,此时chargeType为 0"); log.info("微信支付回调确认订单" + byTradeNo.getTradeNo() + "支付状态,此时chargeType为 0");
log.error("wechat order：step-5 callback {}", byTradeNo.getTradeNo());
wxCheckOrderStatus(byTradeNo.getTradeNo(), 0); wxCheckOrderStatus(byTradeNo.getTradeNo(), 0);
} }
return "<xml>\n" + return "<xml>\n" +
...@@ -85,6 +86,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -85,6 +86,7 @@ public class PaymentServiceImpl implements PaymentService {
UserPayment byTradeNo = userPaymentRepository.findByTradeNo(tradno); UserPayment byTradeNo = userPaymentRepository.findByTradeNo(tradno);
if (byTradeNo != null && !byTradeNo.isSucceed()) { if (byTradeNo != null && !byTradeNo.isSucceed()) {
log.info("支付宝支付回调确认订单" + byTradeNo.getTradeNo() + "支付状态,此时chargeType为 0"); log.info("支付宝支付回调确认订单" + byTradeNo.getTradeNo() + "支付状态,此时chargeType为 0");
log.error("alipay order：step-2 callback {}", tradno);
aliCheckOrderStatus(byTradeNo.getTradeNo(), 0); aliCheckOrderStatus(byTradeNo.getTradeNo(), 0);
} }
} }
...@@ -194,7 +196,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -194,7 +196,7 @@ public class PaymentServiceImpl implements PaymentService {
AlipayTradeQueryResponse response = alipayClient.execute(alipayRequest); AlipayTradeQueryResponse response = alipayClient.execute(alipayRequest);
log.info("ali order status :" + JSONObject.toJSONString(response)); log.info("ali order status {}, {}", JSONObject.toJSONString(response), tradno);
if (response.getTradeStatus() == null) { if (response.getTradeStatus() == null) {
result.setPaid(false); result.setPaid(false);
result.setStatus(convertAlipayStatus("WAIT_BUYER_PAY")); result.setStatus(convertAlipayStatus("WAIT_BUYER_PAY"));
...@@ -210,7 +212,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -210,7 +212,7 @@ public class PaymentServiceImpl implements PaymentService {
result.setPaid(false); result.setPaid(false);
} catch (Exception e) { } catch (Exception e) {
log.error("Alipay payment order generation fails", e); log.error("Alipay payment order generation fails {},{}", e, tradno);
result.setPaid(false); result.setPaid(false);
} }
return result; return result;
...@@ -257,6 +259,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -257,6 +259,7 @@ public class PaymentServiceImpl implements PaymentService {
// 将支付信息保存到 userPayment // 将支付信息保存到 userPayment
internalOrder.setTransId(response.getTradeNo()); internalOrder.setTransId(response.getTradeNo());
userPaymentRepository.save(internalOrder); userPaymentRepository.save(internalOrder);
log.error("alipay order：step-1 create pay order {}", internalOrder.getTradeNo());
String form = response.getBody(); String form = response.getBody();
return form; return form;
...@@ -274,9 +277,11 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -274,9 +277,11 @@ public class PaymentServiceImpl implements PaymentService {
throw new ClientRequestException(AccountErrorCode.NOPERMISSION, "account does not have permission: " + username); throw new ClientRequestException(AccountErrorCode.NOPERMISSION, "account does not have permission: " + username);
} }
try {
// 创建并封装 UserPayment 信息 // 创建并封装 UserPayment 信息
UserPayment internalOrder = getUserPayment(username, amount, PaymentMethod.WECHAT); UserPayment internalOrder = getUserPayment(username, amount, PaymentMethod.WECHAT);
log.error("wechat order：step-1 create order {}", internalOrder.getTradeNo());
try {
// 回调的url // 回调的url
String notifyUrl = AccountController.WECHAT_PAY_CALLBACK_URL + internalOrder.getTradeNo(); String notifyUrl = AccountController.WECHAT_PAY_CALLBACK_URL + internalOrder.getTradeNo();
...@@ -293,18 +298,20 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -293,18 +298,20 @@ public class PaymentServiceImpl implements PaymentService {
Map<String, String> respData = wxPay.unifiedOrder(data); Map<String, String> respData = wxPay.unifiedOrder(data);
if (respData.get("return_code").equals("SUCCESS") && respData.get("result_code").equals("SUCCESS")) { if (respData.get("return_code").equals("SUCCESS") && respData.get("result_code").equals("SUCCESS")) {
log.error("wechat order：step-2 pay status {},{}", respData.get("result_code"), internalOrder.getTradeNo());
// 若微信支付成功，则将支付信息保存到 userPayment // 若微信支付成功，则将支付信息保存到 userPayment
userPaymentRepository.save(internalOrder); userPaymentRepository.save(internalOrder);
log.error("wechat order：step-3.1 save pay info success {}", internalOrder.getTradeNo());
UserPaymentDto result = new UserPaymentDto(); UserPaymentDto result = new UserPaymentDto();
result.setTradeNo(internalOrder.getTradeNo()); result.setTradeNo(internalOrder.getTradeNo());
result.setUrl(respData.get("code_url")); result.setUrl(respData.get("code_url"));
return result; return result;
} else { } else {
log.error("Fail to create ex order : " + JSONObject.toJSONString(respData)); log.error("wechat order：step-3.2 Fail to create ex order {},{}" + JSONObject.toJSONString(respData), internalOrder.getTradeNo());
throw new ClientRequestException(AccountErrorCode.WECHATERROR, "Wechat payment order error"); throw new ClientRequestException(AccountErrorCode.WECHATERROR, "Wechat payment order error");
} }
} catch (Exception e) { } catch (Exception e) {
log.error("Wechat payment order generation fails", e); log.error("wechat order：step-4 Wechat payment order generation fails {}, {}", e, internalOrder.getTradeNo());
throw new ClientRequestException(AccountErrorCode.WECHATERROR, "Wechat payment order error"); throw new ClientRequestException(AccountErrorCode.WECHATERROR, "Wechat payment order error");
} }
} }
...@@ -599,7 +606,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -599,7 +606,7 @@ public class PaymentServiceImpl implements PaymentService {
} }
result.setPaid(false); result.setPaid(false);
} catch (Exception e) { } catch (Exception e) {
log.error("Wechat payment order generation fails", e); log.error("Wechat payment order generation fails{},{}", e, tradeno);
result.setPaid(false); result.setPaid(false);
} }
return result; return result;
...@@ -665,7 +672,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -665,7 +672,7 @@ public class PaymentServiceImpl implements PaymentService {
result.setPaid(false); result.setPaid(false);
} catch (Exception e) { } catch (Exception e) {
log.error("Alipay payment order generation fails", e); log.error("Alipay payment order generation fails {},{}", e, tradno);
result.setPaid(false); result.setPaid(false);
} }
return result; return result;
...@@ -790,6 +797,8 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -790,6 +797,8 @@ public class PaymentServiceImpl implements PaymentService {
byTradeNo.setSucceed(true); byTradeNo.setSucceed(true);
// 2.1 更新 userPayment 的支付状态为成功 // 2.1 更新 userPayment 的支付状态为成功
boolean b = userPaymentRepository.updatePaymentResult(byTradeNo, true, new Date()); boolean b = userPaymentRepository.updatePaymentResult(byTradeNo, true, new Date());
log.error("wechat or ali pay success：step-1 update order status {},{}", b, byTradeNo.getTradeNo());
if (b) { if (b) {
log.info("订单 " + byTradeNo.getTradeNo() + " 的支付状态更新为成功"); log.info("订单 " + byTradeNo.getTradeNo() + " 的支付状态更新为成功");
// 2.2 获取充值优惠赠送 // 2.2 获取充值优惠赠送
...@@ -804,12 +813,14 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -804,12 +813,14 @@ public class PaymentServiceImpl implements PaymentService {
UserPrePaidBilling bill = getUserPrePaidBilling(byTradeNo, byName, balance, payBack); UserPrePaidBilling bill = getUserPrePaidBilling(byTradeNo, byName, balance, payBack);
userPrePaidBillingRepository.save(bill); userPrePaidBillingRepository.save(bill);
log.info("构建订单 " + byTradeNo.getTradeNo() + " 的充值信息成功"); log.info("构建订单 " + byTradeNo.getTradeNo() + " 的充值信息成功");
log.error("wechat or ali pay success：step-2 create paidbilling info {},{}", bill.getId(), byTradeNo.getTradeNo());
} }
// 2.4 更新账户余额 userBalance // 2.4 更新账户余额 userBalance
balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount() + payBack.getBack()); balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount() + payBack.getBack());
userBalanceRepository.save(balance); userBalanceRepository.save(balance);
log.info("更新充值订单 " + byTradeNo.getTradeNo() + " 所对应的账户 " + balance.getUsername() + " 的余额成功"); log.info("更新充值订单 " + byTradeNo.getTradeNo() + " 所对应的账户 " + balance.getUsername() + " 的余额成功");
log.error("wechat or ali pay success：step-3 create balance info {},{}", balance.getUsername(), byTradeNo.getTradeNo());
// 2.5 如果当前用户通过邀请码注册的，则更新邀请人的佣金 // 2.5 如果当前用户通过邀请码注册的，则更新邀请人的佣金
if (byName.getPromotionCode() != null) { if (byName.getPromotionCode() != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment