Commit 078b4ae0 authored by licc's avatar licc

修改方案上传 不是文化类,无最低位次

parent 805089bc
package cn.wisenergy.model.app; package cn.wisenergy.model.app;
import cn.wisenergy.model.common.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
...@@ -3,7 +3,6 @@ package cn.wisenergy.service.app.impl; ...@@ -3,7 +3,6 @@ package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.utils.R; import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.PayRecordMapper; import cn.wisenergy.mapper.PayRecordMapper;
import cn.wisenergy.model.app.PayRecord; import cn.wisenergy.model.app.PayRecord;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.dto.PayPageDto; import cn.wisenergy.model.dto.PayPageDto;
import cn.wisenergy.model.dto.PayQueryDto; import cn.wisenergy.model.dto.PayQueryDto;
import cn.wisenergy.model.vo.AddLimitVo; import cn.wisenergy.model.vo.AddLimitVo;
...@@ -26,6 +25,9 @@ import java.util.HashMap; ...@@ -26,6 +25,9 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
/**
* @author 86187
*/
@Slf4j @Slf4j
@Service @Service
public class AliPayServiceImpl implements AliPayService { public class AliPayServiceImpl implements AliPayService {
......
...@@ -7,6 +7,7 @@ import cn.wisenergy.model.app.*; ...@@ -7,6 +7,7 @@ import cn.wisenergy.model.app.*;
import cn.wisenergy.model.enums.CardStatus; import cn.wisenergy.model.enums.CardStatus;
import cn.wisenergy.model.enums.OperationTypeEnum; import cn.wisenergy.model.enums.OperationTypeEnum;
import cn.wisenergy.model.enums.PayType; import cn.wisenergy.model.enums.PayType;
import cn.wisenergy.model.enums.SchemeTypeEnums;
import cn.wisenergy.model.vo.AddLimitVo; import cn.wisenergy.model.vo.AddLimitVo;
import cn.wisenergy.model.vo.UserInfoVo; import cn.wisenergy.model.vo.UserInfoVo;
import cn.wisenergy.service.app.UserLimitService; import cn.wisenergy.service.app.UserLimitService;
...@@ -166,13 +167,13 @@ public class VolunteerManager { ...@@ -166,13 +167,13 @@ public class VolunteerManager {
payRecord.setUserId(addLimitVo.getUserId()); payRecord.setUserId(addLimitVo.getUserId());
payRecord.setTradeNo(addLimitVo.getTradeNo()); payRecord.setTradeNo(addLimitVo.getTradeNo());
QueryWrapper<PayRecord> queryWrapper = new QueryWrapper<>(); QueryWrapper<PayRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("trade_no",payRecord.getTradeNo()); queryWrapper.eq("trade_no", payRecord.getTradeNo());
PayRecord byTradeNo = payRecordMapper.selectOne(queryWrapper); PayRecord byTradeNo = payRecordMapper.selectOne(queryWrapper);
int pay =0; int pay = 0;
if(null!=byTradeNo){ if (null != byTradeNo) {
pay = payRecordMapper.updateById(payRecord); pay = payRecordMapper.updateById(payRecord);
}else{ } else {
pay = payRecordMapper.add(payRecord); pay = payRecordMapper.add(payRecord);
} }
if (pay == 0) { if (pay == 0) {
return false; return false;
...@@ -317,7 +318,7 @@ public class VolunteerManager { ...@@ -317,7 +318,7 @@ public class VolunteerManager {
* @return true or false * @return true or false
*/ */
@Transactional(rollbackFor = Exception.class) @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客户信息 //添加vip客户信息
//1、更新用户信息 //1、更新用户信息
...@@ -355,7 +356,7 @@ public class VolunteerManager { ...@@ -355,7 +356,7 @@ public class VolunteerManager {
int add = staffUserVipMapper.add(staffUserVip); int add = staffUserVipMapper.add(staffUserVip);
//判断数据是否添加成功 //判断数据是否添加成功
if (add==0) { if (add == 0) {
return false; return false;
} }
return true; return true;
...@@ -403,6 +404,10 @@ public class VolunteerManager { ...@@ -403,6 +404,10 @@ public class VolunteerManager {
for (Volunteer volunteer : list) { for (Volunteer volunteer : list) {
volunteer.setSchemeId(schemeInfo.getId()); volunteer.setSchemeId(schemeInfo.getId());
volunteer.setType(schemeInfo.getType()); 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); boolean bool = volunteerService.saveBatch(list);
if (!bool) { if (!bool) {
...@@ -528,6 +533,6 @@ public class VolunteerManager { ...@@ -528,6 +533,6 @@ public class VolunteerManager {
UserInfoVo userInfoVo = new UserInfoVo(); UserInfoVo userInfoVo = new UserInfoVo();
userInfoVo.setUserId(userInfo.getId()); userInfoVo.setUserId(userInfo.getId());
userInfoVo.setPhone(userInfo.getPhone()); userInfoVo.setPhone(userInfo.getPhone());
return R.ok(0,userInfoVo); return R.ok(0, userInfoVo);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment