From a89221efd99beffa3f295b1a5c427e1ea0537bad Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 09:31:38 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
index fa50904..3319ef9 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -383,6 +383,7 @@
//微信
if(payType == 1){
worldCupPayment.setAmount(new BigDecimal(num).multiply(worldCup.getCash()));
+ worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
worldCupPaymentService.save(worldCupPayment);
return payMoneyUtil.weixinpay("社区世界杯报名", "", worldCupPayment.getCode(),
worldCup.getCash().toString(), "/base/worldCup/wxPayWorldCupCallback", "APP", "");
@@ -390,6 +391,7 @@
//支付宝
if(payType == 2){
worldCupPayment.setAmount(new BigDecimal(num).multiply(worldCup.getCash()));
+ worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
worldCupPaymentService.save(worldCupPayment);
return payMoneyUtil.alipay("2088330203191220", "社区世界杯报名", "世界杯报名", "", worldCupPayment.getCode(),
worldCup.getCash().toString(), "/base/worldCup/aliPayWorldCupCallback");
@@ -404,6 +406,7 @@
worldCupPayment.setAmount(multiply);
worldCupPayment.setPayStatus(2);
worldCupPayment.setPayTime(new Date());
+ worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
worldCupPaymentService.save(worldCupPayment);
appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() - multiply.intValue());
@@ -482,6 +485,7 @@
worldCupPayment.setAmount(multiply);
worldCupPayment.setPayStatus(2);
worldCupPayment.setPayTime(new Date());
+ worldCupPayment.setUnitPrice(worldCupPayment.getAmount().divide(new BigDecimal(num)));
worldCupPaymentService.save(worldCupPayment);
return ResultUtil.success();
}
@@ -490,6 +494,7 @@
worldCupPayment.setAmount(BigDecimal.ZERO);
worldCupPayment.setPayStatus(2);
worldCupPayment.setPayTime(new Date());
+ worldCupPayment.setUnitPrice(BigDecimal.ZERO);
worldCupPaymentService.save(worldCupPayment);
//添加报名明细
@@ -547,4 +552,14 @@
}
return ResultUtil.success();
}
+
+
+ /**
+ * 取消赛事后退还费用
+ * @param id
+ */
+ @Override
+ public void cancelWorldCupRefund(Integer id) {
+
+ }
}
--
Gitblit v1.7.1