Commit 26afb2ba authored by licc's avatar licc

修改注册、充值、方案接口

parent dc063b1d
......@@ -14,5 +14,12 @@ public interface SchemeMapper extends BaseMapper<SchemeInfo> {
List<SchemeInfo> getList(Map<String,Object> map);
/**
* 编辑
* @param schemeInfo 编辑信息
* @return 结果
*/
int edit(SchemeInfo schemeInfo);
int count();
}
......@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
* @author 86187
*/
public interface UserLimitMapper extends BaseMapper<UserLimit> {
UserLimit add(UserLimit userLimit);
int add(UserLimit userLimit);
int edit(UserLimit userLimit);
......
......@@ -70,6 +70,17 @@
</where>
</select>
<update id="edit" parameterType="cn.wisenergy.model.app.SchemeInfo">
UPDATE
<include refid="table"/>
<set>
<include refid="updateCondition"/>
</set>
<where>
id = #{id}
</where>
</update>
<select id="count" resultType="java.lang.Integer">
select count(1)
from
......
......@@ -113,7 +113,7 @@
<if test="downGrade != null">
and lowest_mark >#{downGrade}
</if>
<if test="volunteerIds != null ">
<if test="volunteerIds != null and volunteerIds.size > 0 ">
and id NOT IN
<foreach collection="volunteerIds" index="index" item="id" separator="," open="(" close=")">
#{id}
......
......@@ -11,7 +11,8 @@ import java.util.Date;
*@ Description: 充值记录展示Vo
*@ Author : 86187
*@ Date : 2021/1/13 17:14
*/
* @author 86187
*/
@Data
@ApiModel(value = "PayRecordShowVo")
public class PayRecordShowVo implements Serializable {
......
......@@ -11,7 +11,8 @@ import com.github.pagehelper.PageInfo;
*@ Description: 充值记录接口定义
*@ Author : 86187
*@ Date : 2021/1/13 17:13
*/
* @author 86187
*/
public interface PayRecordService {
/**
* 获取用户充值列表
......
......@@ -62,6 +62,12 @@ public class UserLimitServiceImpl extends ServiceImpl<UserLimitMapper, UserLimit
}
Integer userId = addLimitVo.getUserId();
//判断用户查询次数信息是否存在
UserLimit userLimit = userLimitMapper.getByUserId(userId);
if (null == userLimit) {
return R.error("用户查询信息不存在!");
}
//1、充值卡
if (PayType.REFILL_CARD.getCode().equals(addLimitVo.getPayType())) {
if (StringUtils.isBlank(addLimitVo.getPassword())) {
......@@ -74,9 +80,6 @@ public class UserLimitServiceImpl extends ServiceImpl<UserLimitMapper, UserLimit
return R.error("充值卡信息不存在!");
}
//获取用户查询次数信息
UserLimit userLimit = userLimitMapper.getByUserId(userId);
//增加用户可用查询次数
Integer usableNumber = userLimit.getUsableLimit() + cardInfo.getLimit();
......@@ -98,9 +101,6 @@ public class UserLimitServiceImpl extends ServiceImpl<UserLimitMapper, UserLimit
//根据支付的金额,查询用户新增查询次数
Price price = priceMapper.getByMoney(addLimitVo.getPayMoney());
//获取用户查询次数信息
UserLimit userLimit = userLimitMapper.getByUserId(userId);
//增加用户可用查询次数
Integer usableNumber = userLimit.getUsableLimit() + price.getUseLimit();
......
......@@ -3,9 +3,11 @@ package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.utils.Md5Util;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.LoginRecordMapper;
import cn.wisenergy.mapper.UserLimitMapper;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.model.app.LoginRecord;
import cn.wisenergy.model.app.User;
import cn.wisenergy.model.app.UserLimit;
import cn.wisenergy.model.enums.OperationTypeEnum;
import cn.wisenergy.model.vo.UpdatePasswordVo;
import cn.wisenergy.model.vo.UserInfoVo;
......@@ -21,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* @author 86187
......@@ -40,8 +43,12 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
@Autowired
private SendSmsSerVice sendSmsSerVice;
@Autowired
private UserLimitMapper userLimitMapper;
private static final int ERROR_CODE = 500;
@Transactional(rollbackFor = Exception.class)
@Override
public R<UserInfoVo> register(UserRegisterVo userVo) {
log.info("volunteer-service[]UserLoginServiceImpl[]register[]input.param.userVo:" + userVo);
......@@ -69,7 +76,7 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
//3、给密码加密 加密规则,电话号码+明文密码
String secret = Md5Util.digestMD5(password + phone);
//3、添加用户信息
//4、添加用户信息
User userInfo = new User();
userInfo.setPhone(phone);
userInfo.setPassword(secret);
......@@ -80,20 +87,32 @@ public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> impleme
return R.error("考生注册失败!");
}
//4、保存操作记录
User user = usersMapper.getByPhone(userVo.getPhone());
//5、保存用户查询信息
UserLimit addLimit = new UserLimit();
addLimit.setUserId(userId);
addLimit.setUseLimit(0);
addLimit.setUsableLimit(0);
addLimit.setTotalLimit(0);
int limit = userLimitMapper.add(addLimit);
if (limit == 0) {
return R.error("注册添加用户查询信息失败!");
}
//6、保存操作记录
LoginRecord loginRecord = new LoginRecord();
loginRecord.setType(OperationTypeEnum.USER_REGISTER.getCode());
loginRecord.setUserId(user.getId());
loginRecord.setUserId(userInfo.getId());
String name = OperationTypeEnum.getByCode(OperationTypeEnum.USER_REGISTER.getCode());
loginRecord.setOperationName(name);
loginRecordMapper.add(loginRecord);
int record = loginRecordMapper.add(loginRecord);
if (record == 0) {
return R.error("注册保存记录失败!");
}
//5、封装返回参数
//7、封装返回参数
UserInfoVo userInfoVo = new UserInfoVo();
userInfoVo.setUserId(user.getId());
userInfoVo.setUserName(user.getUserName());
userInfoVo.setPhone(user.getPhone());
userInfoVo.setUserId(userInfo.getId());
userInfoVo.setPhone(userInfo.getPhone());
return R.ok(userInfoVo);
}
......
package cn.wisenergy.service.common;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.*;
import cn.wisenergy.model.app.*;
import cn.wisenergy.model.enums.CardStatus;
......@@ -7,10 +8,12 @@ import cn.wisenergy.model.enums.PayType;
import cn.wisenergy.model.vo.AddLimitVo;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
......@@ -56,6 +59,9 @@ public class VolunteerManager {
@Autowired
private VolunteerService volunteerService;
@Autowired
private VolunteerMapper volunteerMapper;
/**
* 更新用户查询信息并保存扣减记录
*
......@@ -216,7 +222,7 @@ public class VolunteerManager {
* @param scoreInfo 成绩信息
* @return true or false
*/
@Transactional()
@Transactional(rollbackFor = Exception.class)
public boolean updateAndUserInfo(User user, ScoreInfo scoreInfo) {
//1、更新用户信息
int count = usersMapper.edit(user);
......@@ -257,4 +263,20 @@ public class VolunteerManager {
throw new RuntimeException("保存志愿信息失败!");
}
}
@Transactional(rollbackFor = Exception.class)
public boolean deleteSchemeAndVolunteer(SchemeInfo schemeInfo, Integer schemeId, Integer size) {
//更行方案状态为删除
int sum = schemeMapper.edit(schemeInfo);
if (sum == 0) {
return false;
}
//更行志愿状态为删除
int count = volunteerMapper.updateBySchemeId(schemeId);
if (size != count) {
return false;
}
return true;
}
}
......@@ -88,4 +88,16 @@ public class SchemeController {
return schemeService.getSchemeList(queryVo);
}
@ApiOperation(value = "获取方案列表", notes = "获取方案列表", httpMethod = "DELETE")
@ApiImplicitParam(name = "schemeId", value = "方案id", dataType = "schemeId")
@DeleteMapping("/delete")
public R<Boolean> delete(Integer schemeId) {
log.info("volunteer-service[]SchemeController[]getSchemeList[]input.param.schemeId:" + schemeId);
if (null == schemeId) {
return R.error("入参为空!");
}
return schemeService.deleteById(schemeId);
}
}
......@@ -2,7 +2,6 @@ package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.app.Banner;
import cn.wisenergy.model.vo.*;
import cn.wisenergy.service.app.UserLoginService;
import io.swagger.annotations.Api;
......
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