Merge remote-tracking branch 'origin/master'

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TeamPerformanceMapper.java

 package cn.wisenergy.mapper;
 
 import cn.wisenergy.model.app.TeamPerformance;
+import cn.wisenergy.model.app.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -100,4 +101,10 @@ public interface TeamPerformanceMapper extends BaseMapper<TeamPerformance> {
      */
     List<TeamPerformance> getList(Map<String, Object> map);
 
+    /**
+     *
+     * @param userId
+     * @return
+     */
+    TeamPerformance getByUserId(String userId);
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java

@@ -228,4 +228,12 @@ public interface UsersMapper extends BaseMapper<User> {
      * @return
      */
     User getUserByInviteCode(String inviteCode);
+
+    /**
+     * 根据用户的userid查询用户对象
+     * @param userId
+     * @return
+     */
+    User getUserByUserId(String userId);
+
 }

wisenergy-mapper/src/main/resources/mapper/MonthAwardMapper.xml

@@ -27,7 +27,7 @@
 
     <sql id="cols_exclude_id">
         growth_award,award_total,month_award_total,month_increased,gold_award,farmer_award, forest_start_award,
-        partner_award,year_month,create_time,update_time
+        partner_award,`year_month`,create_time,update_time
     </sql>
 
     <sql id="vals">
@@ -44,7 +44,7 @@
         <if test="farmerAward != null">farmer_award =#{farmerAward},</if>
         <if test="forestStartAward != null">forest_start_award =#{forestStartAward},</if>
         <if test="partnerAward != null">partner_award =#{partnerAward},</if>
-        <if test="yearMonth != null">year_month =#{yearMonth},</if>
+        <if test="yearMonth != null">`year_month` =#{yearMonth},</if>
         update_time =now()
     </sql>
 
@@ -58,7 +58,7 @@
         <if test="farmerAward != null">and farmer_award =#{farmerAward}</if>
         <if test="forestStartAward != null">and forest_start_award =#{forestStartAward}</if>
         <if test="partnerAward != null">and partner_award =#{partnerAward}</if>
-        <if test="yearMonth != null">and year_month =#{yearMonth}</if>
+        <if test="yearMonth != null">and `year_month` =#{yearMonth}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
     </sql>
@@ -96,7 +96,7 @@
         <include refid="table"/>
         <where>
             <if test="yearMonth != null">
-                year_month=#{yearMonth}
+                `year_month`=#{yearMonth}
             </if>
         </where>
         order by create_time desc

wisenergy-mapper/src/main/resources/mapper/TeamPerformanceMapper.xml

@@ -204,4 +204,13 @@
         order by create_time desc
         limit #{startNum},#{endNum}
     </select>
+
+    <select id="getByUserId" resultType="cn.wisenergy.model.app.TeamPerformance">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        where
+        user_id = #{userId}
+    </select>
 </mapper>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -429,4 +429,13 @@
         invite_code = #{inviteCode}
     </select>
 
+    <select id="getUserByUserId" resultType="cn.wisenergy.model.app.User">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        where
+        user_id = #{userId}
+    </select>
+
 </mapper>

wisenergy-service/src/main/java/cn/wisenergy/service/app/AerialDeliveryUserService.java

 package cn.wisenergy.service.app;
 
 
+import cn.wisenergy.model.app.User;
+
+import java.util.Map;
+
 /**
  * @author 86187
  */
@@ -11,9 +15,40 @@ public interface AerialDeliveryUserService {
     void aerialDeliveryUserRand();
 
     /**
-     * 设置邀请码接口
+     * 设置邀请码接口 维护直推和团队数据
      * @param userId  当前用户id
      * @param userInvitedId  推荐人用户id
      */
     void userSetBeinviteCode(String userId, String userInvitedId);
+
+    /**
+     * 团队整体数据的计算
+     * @param beInvitedUserId  推荐人的用户id
+     * @param userId 当前用户的id
+     * @return  map  团队中各等级的用户数量
+     */
+    Map teamUserInfoByAerialDelivery(String beInvitedUserId, String userId);
+
+
+    /**
+     * 整体团队数据维护
+     * @param teamDataMap teamUserInfoByAerialDelivery 返回的map
+     * @param userId  当前用户的userid
+     */
+    void teamData(Map<String, Integer> teamDataMap, String userId);
+
+    /**
+     * 查询当前用户所在团队的最上级用户
+     * @param userId  当前用户的userID
+     * @return  user  当前用户所在的最上级用户
+     */
+    User highUser(String userId);
+
+
+    /**
+     * 团队数据维护  只维护团队数据 不包含直推数据的维护
+     * @param userId  当期用户的userId
+     * @param userInvitedId  推荐人的userId
+     */
+    void teamDataNotRecommend(String userId, String userInvitedId);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AerialDeliveryUserServiceImpl.java

@@ -7,16 +7,15 @@ import cn.wisenergy.model.app.RecommendUser;
 import cn.wisenergy.model.app.TeamUserInfo;
 import cn.wisenergy.model.app.User;
 import cn.wisenergy.service.app.AerialDeliveryUserService;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.pqc.crypto.newhope.NHOtherInfoGenerator;
+import org.bytedeco.javacpp.presets.opencv_core;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 @Service
@@ -76,7 +75,7 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
             }
         }
 
-        log.info("--------------------------空投池用户随机分派开始执行完成---------------------------------");
+        log.info("--------------------------空投池用户随机分配开始执行完成---------------------------------");
     }
 
     @Override
@@ -150,10 +149,12 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
     }
 
     /**
-     * 团队数据维护
-     * @param beInvitedUserId 推荐人userId
-     * @param userId 当前用户的userId
+     * 团队整体数据的计算
+     * @param beInvitedUserId  推荐人的用户id
+     * @param userId 当前用户的id
+     * @return  map  团队中各等级的用户数量
      */
+    @Override
     public Map<String, Integer> teamUserInfoByAerialDelivery(String beInvitedUserId, String userId) {
         TeamUserInfo teamUserInfoByIntvitedUser = teamUserInfoMapper.getByUserId(beInvitedUserId);
         TeamUserInfo teamUserInfoByUserId = teamUserInfoMapper.getByUserId(userId);
@@ -228,6 +229,7 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
     }
 
     //整体团队数据维护
+    @Override
     public void teamData(Map<String, Integer> teamDataMap, String userId){
         //最上级用户对象
         User user = usersMapper.getByUserId(userId);
@@ -263,6 +265,7 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
     }
 
     //查询顶级用户
+    @Override
     public User highUser(String userId) {
         User byUserId = usersMapper.getByUserId(userId);
         String beInvitedCode = byUserId.getBeInvitedCode();
@@ -274,4 +277,88 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
         return userByInviteCode;
     }
 
+    /**
+     * 团队数据维护  只维护团队数据 不包含直推数据的维护
+     * @param userId  当期用户的userId
+     * @param userInvitedId  推荐人的userId
+     */
+    @Override
+    public void teamDataNotRecommend(String userId, String userInvitedId){
+        //4、用户的团队表数据维护
+        //上级用户的团队数据
+        TeamUserInfo teamUserInfoMapperByUserId = teamUserInfoMapper.getByUserId(userInvitedId);
+        //团队中各等级人数
+        Integer normalUserNum = teamUserInfoMapperByUserId.getNormalUserNum();
+        Integer seedlingNum = teamUserInfoMapperByUserId.getSeedlingNum();
+        Integer bronzeTreeNum = teamUserInfoMapperByUserId.getBronzeTreeNum();
+        Integer silverTreeNum = teamUserInfoMapperByUserId.getSilverTreeNum();
+        Integer goldTreeNum = teamUserInfoMapperByUserId.getGoldTreeNum();
+        Integer farmerNum = teamUserInfoMapperByUserId.getFarmerNum();
+        Integer forestStartNum = teamUserInfoMapperByUserId.getForestStartNum();
+        Integer partnerNum = teamUserInfoMapperByUserId.getPartnerNum();
+
+        //当前用户升级后的数据
+        User userByUserId = usersMapper.getUserByUserId(userId);
+        if (null != userByUserId){
+            int userLevel = userByUserId.getUserLevel();
+            if (userLevel == 1){
+                //用户等级为1
+                //          团队普通用户数量 -1
+                //          是团队幼苗数量 +1
+                if (normalUserNum > 0){
+                    normalUserNum = normalUserNum - 1;
+                }
+                seedlingNum = seedlingNum + 1;
+            }else if (userLevel == 2){
+                if (seedlingNum > 0){
+                    seedlingNum = seedlingNum - 1;
+                }
+                bronzeTreeNum = bronzeTreeNum + 1;
+            }else if (userLevel == 3){
+                if (bronzeTreeNum > 0){
+                    bronzeTreeNum = bronzeTreeNum - 1;
+                }
+                silverTreeNum = silverTreeNum + 1;
+            }else if (userLevel == 4){
+                if (silverTreeNum > 0){
+                    silverTreeNum = silverTreeNum - 1;
+                }
+                goldTreeNum = goldTreeNum + 1;
+            }else if (userLevel == 5){
+                if (goldTreeNum > 0){
+                    goldTreeNum = goldTreeNum - 1;
+                }
+                farmerNum = farmerNum + 1;
+            }else if (userLevel == 6){
+                if (farmerNum > 0){
+                    farmerNum = farmerNum - 1;
+                }
+                forestStartNum = forestStartNum + 1;
+            }else if (userLevel == 7){
+                if (forestStartNum > 0){
+                    forestStartNum = forestStartNum - 1;
+                }
+                partnerNum = partnerNum + 1;
+            }
+        }
+
+        Map<String , Integer> teamDataMap = new HashMap<String , Integer>();
+        teamDataMap.put("resultTeamNormalNum",normalUserNum);
+        teamDataMap.put("resultTeamSeedlingNum",seedlingNum);
+        teamDataMap.put("resultTeamBronzeTreeNum",bronzeTreeNum);
+        teamDataMap.put("resultTeamSilverTreeNum",silverTreeNum);
+        teamDataMap.put("resultTeamGoldTreeNum",goldTreeNum);
+        teamDataMap.put("resultTeamFarmerNum",farmerNum);
+        teamDataMap.put("resultTeamForestStartNum",forestStartNum);
+        teamDataMap.put("resultTeamPartnerNum",partnerNum);
+        //4.1获取当前团队中最上级的用户对象
+        User highUser = highUser(userId);
+        if (null != highUser){
+            //4.2 最上级用户id
+            String highUserId = highUser.getUserId();
+            //4.1整体团队数据维护
+            teamData(teamDataMap, highUserId);
+        }
+    }
+
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java

@@ -55,9 +55,13 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
     @Override
     public R<BankInfo> add(BankInfo bankInfo) {
         log.info("shop-mall[]BankServiceImpl[]add[]input.param.bankInfo:" + bankInfo);
-        if (null == bankInfo) {
+        if (null == bankInfo || StringUtils.isBlank(bankInfo.getUserId())) {
             return R.error("入参不能为空!");
         }
+
+        //获取该用户下是否有银行卡信息  无：新增 有：编辑
+        BankInfo bank = bankInfoMapper.getByUserId(bankInfo.getUserId());
+        if (null == bank) {
             int count = bankInfoMapper.add(bankInfo);
             if (count == 0) {
                 return R.error("保存用户银行卡信息失败!");
@@ -65,6 +69,17 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
 
             return R.ok(bankInfo);
         }
+        bank.setName(bankInfo.getName());
+        bank.setCardNumber(bankInfo.getCardNumber());
+        bank.setBankName(bankInfo.getBankName());
+        bank.setIdCardNo(bankInfo.getIdCardNo());
+        bank.setUserId(bankInfo.getUserId());
+        int number = bankInfoMapper.edit(bank);
+        if (number == 0) {
+            return R.error("保存用户银行卡信息失败!");
+        }
+        return R.ok(bankInfo);
+    }
 
     @Override
     public R<BankInfo> edit(BankInfo bankInfo) {

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/TradeRecordServiceImpl.java

@@ -119,6 +119,7 @@ public class TradeRecordServiceImpl extends ServiceImpl<TradeRecordMapper, Trade
                 return R.ok(1, false);
             }
         } else {
+            result.setId(currentMonthAward.getId());
             int count = monthAwardMapper.edit(result);
             if (count == 0) {
                 return R.ok(1, false);