From 0181e61c148bb1ad682726e464066963ecb4848e Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Tue, 28 May 2024 15:55:32 +0800
Subject: [PATCH] =?UTF-8?q?courseMedicine=20=E6=B7=BB=E5=8A=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=20courseToMedicine=20=E6=B7=BB=E5=8A=A0=E5=88=9D?=
 =?UTF-8?q?=E7=BA=A7=E3=80=81=E9=80=89=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/common/entity/CourseMedicine.java   |  2 ++
 .../modules/common/entity/CourseToMedicine.java |  6 ++++++
 .../service/impl/CourseMedicineServiceImpl.java |  2 +-
 .../service/impl/UserMergeServiceImpl.java      | 17 ++++++++++++-----
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/entity/CourseMedicine.java b/src/main/java/com/peanut/modules/common/entity/CourseMedicine.java
index 7e2138da..439653f7 100644
--- a/src/main/java/com/peanut/modules/common/entity/CourseMedicine.java
+++ b/src/main/java/com/peanut/modules/common/entity/CourseMedicine.java
@@ -23,6 +23,8 @@ public class CourseMedicine {
 
     private Integer sort;
 
+    private String icon;
+
     private Date createTime;
 
     @TableLogic
diff --git a/src/main/java/com/peanut/modules/common/entity/CourseToMedicine.java b/src/main/java/com/peanut/modules/common/entity/CourseToMedicine.java
index b99f4b66..0478921d 100644
--- a/src/main/java/com/peanut/modules/common/entity/CourseToMedicine.java
+++ b/src/main/java/com/peanut/modules/common/entity/CourseToMedicine.java
@@ -19,6 +19,12 @@ public class CourseToMedicine {
 
     private Integer sort;
 
+    //0隐藏1初级2高级
+    private Integer level;
+
+    //0隐藏1必修2选修
+    private Integer selective;
+
     private Date createTime;
 
     @TableLogic
diff --git a/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java
index 254fa068..f3479199 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/CourseMedicineServiceImpl.java
@@ -58,7 +58,7 @@ public class CourseMedicineServiceImpl extends ServiceImpl<CourseMedicineDao, Co
             }
         }
         this.updateById(courseMedicine);
-        return R.ok().put("sociology", courseMedicine);
+        return R.ok().put("medicine", courseMedicine);
     }
 
     private List<CourseMedicine> medicals(int id){
diff --git a/src/main/java/com/peanut/modules/master/service/impl/UserMergeServiceImpl.java b/src/main/java/com/peanut/modules/master/service/impl/UserMergeServiceImpl.java
index 6787f5b4..1d3de7ae 100644
--- a/src/main/java/com/peanut/modules/master/service/impl/UserMergeServiceImpl.java
+++ b/src/main/java/com/peanut/modules/master/service/impl/UserMergeServiceImpl.java
@@ -50,13 +50,20 @@ public class UserMergeServiceImpl implements UserMergeService {
                         contributionDao.updateById(c);
                     }
                 }
+                //湖分剩余
                 LambdaQueryWrapper<UserContributionExchange> exchangeWrapper = new LambdaQueryWrapper<>();
                 exchangeWrapper.eq(UserContributionExchange :: getUserId,secondUser.getId());
-                List<UserContributionExchange> exchanges = exchangeDao.selectList(exchangeWrapper);
-                if (exchanges != null&&exchanges.size()>0) {
-                    for (UserContributionExchange c : exchanges) {
-                        c.setUserId(mainUser.getId());
-                        exchangeDao.updateById(c);
+                UserContributionExchange exchange = exchangeDao.selectOne(exchangeWrapper);
+                if (exchange != null) {
+                    LambdaQueryWrapper<UserContributionExchange> mainExchangeWrapper = new LambdaQueryWrapper<>();
+                    mainExchangeWrapper.eq(UserContributionExchange :: getUserId,mainUser.getId());
+                    UserContributionExchange mainExchanges = exchangeDao.selectOne(mainExchangeWrapper);
+                    if (mainExchanges != null) {
+                        mainExchanges.setSurplus(mainExchanges.getSurplus()+exchange.getSurplus());
+                        exchangeDao.updateById(mainExchanges);
+                    }else {
+                        exchange.setUserId(mainUser.getId());
+                        exchangeDao.updateById(exchange);
                     }
                 }
                 //课