From 57a7c48cc4c81f7e9719c414e4abae942c93a21b Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 26 七月 2023 15:13:37 +0800
Subject: [PATCH] 后台代码

---
 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index b0f2838..7f60938 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -83,7 +83,7 @@
      * @return
      */
     @Override
-    public List<CompetitionListVo> queryCompetitionList(String cityCode, String content, Integer registerCondition, Integer heat) throws Exception {
+    public List<CompetitionListVo> queryCompetitionList(String cityCode, String content, Integer registerCondition, String heat) throws Exception {
         return this.baseMapper.queryCompetitionList(cityCode, content, registerCondition, heat);
     }
 
@@ -124,8 +124,9 @@
         competitionInfo.setProvince(competition.getEntryProvince());
         competitionInfo.setCity(competition.getEntryCity());
         competitionInfo.setAddress(competition.getEntryAddress());
-        competitionInfo.setPayType(competition.getPayType());
-        competitionInfo.setPrice(competition.getPrice().doubleValue());
+        competitionInfo.setCashPrice(competition.getCashPrice());
+        competitionInfo.setPlayPaiCoin(competition.getPlayPaiCoin());
+        competitionInfo.setClassPrice(competition.getClassPrice());
         competitionInfo.setIntroduction(competition.getIntroduction());
         competitionInfo.setRegistrationNotes(competition.getRegistrationNotes());
         competitionInfo.setApply(0);
@@ -168,13 +169,18 @@
         AppUser appUser = appUserClient.queryAppUser(uid);
         String[] split = paymentCompetitionVo.getIds().split(";");
         Competition competition = this.getById(paymentCompetitionVo.getId());
-        BigDecimal money = competition.getPrice().multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
+        BigDecimal money = null;
+        if(paymentCompetitionVo.getPayType() == 1 || paymentCompetitionVo.getPayType() == 2){
+            money = new BigDecimal(competition.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
+        }
         if(paymentCompetitionVo.getPayType() == 3){//玩湃币
+            money = new BigDecimal(competition.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
             if(money.compareTo(new BigDecimal(appUser.getPlayPaiCoins())) > 0){
                 return ResultUtil.error("报名失败,玩湃币不足,请充值");
             }
         }
         if(paymentCompetitionVo.getPayType() == 4){//课程
+            money = new BigDecimal(competition.getClassPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
             for (String s : split) {
                 Participant participant = participantService.getById(s);
                 Student student = studentClient.queryStudentByPhone(participant.getPhone());
@@ -182,7 +188,7 @@
                     return ResultUtil.error(participant.getName() + "不是学员,无法使用课时支付。");
                 }
                 Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId());
-                if(new BigDecimal(integer).compareTo(competition.getPrice()) < 0){
+                if(new BigDecimal(integer).compareTo(new BigDecimal(competition.getClassPrice())) < 0){
                     return ResultUtil.error(participant.getName() + "剩余课时不足,无法完成支付。");
                 }
             }
@@ -195,7 +201,7 @@
         paymentCompetition.setCompetitionId(paymentCompetitionVo.getId());
         paymentCompetition.setAppUserId(uid);
         paymentCompetition.setPayType(paymentCompetitionVo.getPayType());
-        paymentCompetition.setAmount(competition.getPrice().multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+        paymentCompetition.setAmount(money.doubleValue());
         paymentCompetition.setPayStatus(1);
         paymentCompetition.setInsertTime(new Date());
         paymentCompetitionService.save(paymentCompetition);
@@ -234,7 +240,7 @@
                 Student student = studentClient.queryStudentByPhone(participant.getPhone());
                 PaymentDeductionClassHour paymentDeductionClassHour = new PaymentDeductionClassHour();
                 paymentDeductionClassHour.setId(student.getId());
-                paymentDeductionClassHour.setClassHour(competition.getPrice().intValue());
+                paymentDeductionClassHour.setClassHour(competition.getClassPrice());
                 paymentDeductionClassHour.setCode(code);
                 coursePackagePaymentClient.paymentDeductionClassHour(paymentDeductionClassHour);
             }

--
Gitblit v1.7.1