Merge remote-tracking branch 'origin/master'

# Conflicts:
#	wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java

wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java

 package cn.wisenergy.model.app;
 
-import cn.wisenergy.model.common.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -3,7 +3,6 @@ package cn.wisenergy.service.app.impl;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.PayRecordMapper;
 import cn.wisenergy.model.app.PayRecord;
-import cn.wisenergy.model.app.User;
 import cn.wisenergy.model.dto.PayPageDto;
 import cn.wisenergy.model.dto.PayQueryDto;
 import cn.wisenergy.model.vo.AddLimitVo;
@@ -37,6 +36,9 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+/**
+ * @author 86187
+ */
 @Slf4j
 @Service
 public class AliPayServiceImpl implements AliPayService {

wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java

 package cn.wisenergy.service.common;
 
 import cn.wisenergy.common.utils.R;
-import cn.wisenergy.common.utils.StringUtil;
 import cn.wisenergy.mapper.*;
 import cn.wisenergy.model.app.*;
 import cn.wisenergy.model.enums.CardStatus;
 import cn.wisenergy.model.enums.OperationTypeEnum;
 import cn.wisenergy.model.enums.PayType;
+import cn.wisenergy.model.enums.SchemeTypeEnums;
 import cn.wisenergy.model.vo.AddLimitVo;
 import cn.wisenergy.model.vo.UserInfoVo;
 import cn.wisenergy.service.app.UserLimitService;
@@ -14,13 +14,11 @@ import cn.wisenergy.service.app.UserVolunteerService;
 import cn.wisenergy.service.app.VolunteerService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -107,10 +105,7 @@ public class VolunteerManager {
         userLimitRecord.setUserId(userLimit.getUserId());
         int record = userLimitRecordMapper.add(userLimitRecord);
 
-        if (record == 0) {
-            return false;
-        }
-        return true;
+        return record != 0;
     }
 
     /**
@@ -147,9 +142,7 @@ public class VolunteerManager {
             payRecord.setType(addLimitVo.getPayType());
             payRecord.setUserId(addLimitVo.getUserId());
             int pay = payRecordMapper.add(payRecord);
-            if (pay == 0) {
-                return false;
-            }
+            return pay != 0;
         } else {
             //1、更新用户查询次数信息
             int limit = userLimitMapper.edit(userLimit);
@@ -167,22 +160,17 @@ public class VolunteerManager {
             payRecord.setUserId(addLimitVo.getUserId());
             payRecord.setTradeNo(addLimitVo.getTradeNo());
             QueryWrapper<PayRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("trade_no",payRecord.getTradeNo());
+            queryWrapper.eq("trade_no", payRecord.getTradeNo());
             PayRecord byTradeNo = payRecordMapper.selectOne(queryWrapper);
-            payRecord.setId(byTradeNo.getId());
-            int pay =0;
-            if(null!=byTradeNo){
-                payRecord.setUpdateTime(new Date());
-                 pay = payRecordMapper.updateById(payRecord);
-            }else{
-                 pay = payRecordMapper.add(payRecord);
-            }
-            if (pay == 0) {
-                return false;
+            int pay;
+            if (null != byTradeNo) {
+                pay = payRecordMapper.updateById(payRecord);
+            } else {
+                pay = payRecordMapper.add(payRecord);
             }
+            return pay != 0;
         }
 
-        return true;
     }
 
     /**
@@ -259,7 +247,6 @@ public class VolunteerManager {
         }
         schemeQueryRecord.setScore(scoreInfo.getCultureGrade().toString());
 
-        List<Integer> ids = list.stream().map(Volunteer::getId).collect(Collectors.toList());
         //保存方案查询记录
         int count = schemeRecordMapper.add(schemeQueryRecord);
         if (count == 0) {
@@ -305,9 +292,7 @@ public class VolunteerManager {
         //flag =2  编辑
         if (null != flag && flag == 2) {
             int edit = scoreInfoMapper.edit(scoreInfo);
-            if (edit == 0) {
-                return false;
-            }
+            return edit != 0;
         }
         return true;
     }
@@ -320,7 +305,7 @@ public class VolunteerManager {
      * @return true or false
      */
     @Transactional(rollbackFor = Exception.class)
-    public boolean updateAndSaveUserVipInfo(User user, ScoreInfo scoreInfo, Integer flag,Integer staffId) {
+    public boolean updateAndSaveUserVipInfo(User user, ScoreInfo scoreInfo, Integer flag, Integer staffId) {
 
         //添加vip客户信息
         //1、更新用户信息
@@ -358,10 +343,7 @@ public class VolunteerManager {
         int add = staffUserVipMapper.add(staffUserVip);
 
         //判断数据是否添加成功
-        if (add==0) {
-            return false;
-        }
-        return true;
+        return add != 0;
     }
 
     /**
@@ -381,11 +363,7 @@ public class VolunteerManager {
 
         //2、保存用户成绩信息
         int save = scoreInfoMapper.edit(scoreInfo);
-        if (save == 0) {
-            return false;
-        }
-
-        return true;
+        return save != 0;
     }
 
     /**
@@ -406,6 +384,10 @@ public class VolunteerManager {
         for (Volunteer volunteer : list) {
             volunteer.setSchemeId(schemeInfo.getId());
             volunteer.setType(schemeInfo.getType());
+            if (!SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode().equals(volunteer.getType()) ||
+                    !SchemeTypeEnums.JUNIOR_COLLEGE_MAJOR.getCode().equals(volunteer.getType())) {
+                volunteer.setLowestRank(null);
+            }
         }
         boolean bool = volunteerService.saveBatch(list);
         if (!bool) {
@@ -432,11 +414,7 @@ public class VolunteerManager {
 
         //更行志愿状态为删除
         int count = volunteerMapper.updateBySchemeId(schemeId);
-        if (size != count) {
-            return false;
-        }
-
-        return true;
+        return size == count;
     }
 
     /**
@@ -531,6 +509,6 @@ public class VolunteerManager {
         UserInfoVo userInfoVo = new UserInfoVo();
         userInfoVo.setUserId(userInfo.getId());
         userInfoVo.setPhone(userInfo.getPhone());
-        return R.ok(0,userInfoVo);
+        return R.ok(0, userInfoVo);
     }
 }