..

src/main/java/io/renren/modules/admin/controller/MemberController.java

@@ -124,7 +124,7 @@ public class MemberController extends AbstractController  {
    @RequiresPermissions("admin:member:status")
    @ApiOperation("改变审核状态")
    public R status(@RequestBody Map<String, Object> params){
       System.out.println(params);      
    //    System.out.println(params);      
        Long id = Long.valueOf(params.get("id").toString());
        Integer status = Integer.valueOf(params.get("status").toString());
        // System.out.println(id);
@@ -135,7 +135,7 @@ public class MemberController extends AbstractController  {
    @PostMapping("/repassword/{id}")
    @RequiresPermissions("admin:member:repassword")
    @ApiOperation("改变审核状态")
    @ApiOperation("重置默认密码")
    public R repassword(@PathVariable("id") Long id){
        MemberEntity member = memberService.getById(id);
        member.setPassword("123456");

src/main/java/io/renren/modules/admin/controller/MoneyAccountController.java

@@ -81,7 +81,7 @@ public class MoneyAccountController {
        String accout = moneyAccount.getAccount();
        Date createTime = new Date();
        System.out.println(meetingId);
         Integer rows = moneyAccountService.addOrUpdate(meetingId, name, bank, accout, createTime);
        Integer rows = moneyAccountService.addOrUpdate(meetingId, name, bank, accout, createTime);
        return R.ok().put("rows", rows);
    }

src/main/java/io/renren/modules/admin/controller/PaymentController.java

@@ -191,4 +191,13 @@ public class PaymentController {
        ExcelUtils.exportExcel(data, response.getOutputStream());
    }
    @PostMapping("paystatus")
    @RequiresPermissions("admin:payment:update")
    public R setPayStatus(@RequestBody Map<String, Object> params) {
        Long id = Long.valueOf(params.get("id").toString());
        Integer status = Integer.valueOf(params.get("status").toString());
        paymentService.updatePayStatus(id, status);
        return R.ok();
    }
}

src/main/java/io/renren/modules/admin/controller/SignInfoController.java

@@ -26,6 +26,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -268,16 +271,41 @@ public class SignInfoController extends AbstractController {
        return R.ok();
    }
    // /**
    //  * 修改
    //  */
    // @RequestMapping("/update")
    // @RequiresPermissions("admin:signinfo:update")
    // public R update(@RequestBody SignInfoEntity signInfo){
	// 	signInfoService.updateById(signInfo);
    /**
     * 修改
     */
    @RequestMapping("/update")
    @RequiresPermissions("admin:signinfo:update")
    public R update(@RequestBody SignInfoEntity signInfo){
        SignInfoEntity formerSignInfo = signInfoService.getById(signInfo.getId());
        AttendersEntity attenders = attendersService.getById(formerSignInfo.getAId());
        MemberEntity member = memberService.getById(attenders.getMemberId());
        // MemberEntity member = new MemberEntity();
        // AttendersEntity attenders = new AttendersEntity();
        PaymentEntity payment = paymentService.getOne(new QueryWrapper<PaymentEntity>().eq("attenders_id", formerSignInfo.getAId()));
    //     return R.ok();
    // }
        Date nowTime = new Date();
        member.setId(attenders.getMemberId());
        member.setUsername(signInfo.getPhone());
        member.setTruename(signInfo.getTruename());
        member.setPhone(signInfo.getPhone());
        member.setModifyTime(nowTime);
        member.setModifyId(getUserId());
        memberService.updateById(member);
        attenders.setName(signInfo.getTruename());
        attenders.setPhone(signInfo.getPhone());
        attenders.setOrganization(signInfo.getOrganization());
        attenders.setNote(signInfo.getOrganization());
        attenders.setServicer(signInfo.getServicer());
        attendersService.updateById(attenders);
        payment.setIsPay(signInfo.getIsPay());
        payment.setMoney(signInfo.getMoney());
        paymentService.updateById(payment);
        return R.ok();
    }
    // /**
    //  * 删除

src/main/java/io/renren/modules/admin/dao/PaymentDao.java

@@ -4,6 +4,7 @@ import io.renren.modules.admin.entity.PaymentEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import java.math.BigDecimal;
import java.util.List;
@@ -35,4 +36,7 @@ public interface PaymentDao extends BaseMapper<PaymentEntity> {
    @Select("select sum(p.money) as totalMoney from attenders join payment p on attenders.id=p.attenders_id  where p.meeting_id=#{meetingId} and attenders.is_del=0 and p.is_del=0 ${where};")
    BigDecimal getTotalMoney(Long meetingId, String where);
    @Update("UPDATE payment SET `is_pay`=#{status} where id=#{id}")
    int updatePayStatus(Long id, Integer status);
}

src/main/java/io/renren/modules/admin/entity/MemberEntity.java

@@ -81,14 +81,14 @@ public class MemberEntity implements Serializable {
	 */
	@Email(message="邮箱格式不正确", groups = {AddGroup.class, UpdateGroup.class})
	private String email;
        /**
         * 办公电话
         */
        private String officephone;
        /**
         * 其他联系方式
         */
        private String otherphone;
	/**
	 * 办公电话
	 */
	private String officephone;
	/**
	 * 其他联系方式
	 */
	private String otherphone;
	/**
	 * 负责人id
	 */

src/main/java/io/renren/modules/admin/service/PaymentService.java

@@ -39,5 +39,7 @@ public interface PaymentService extends IService<PaymentEntity> {
     * @return
     */
    BigDecimal getTotalMoney(Long meetingId, String where);
	int updatePayStatus(Long id, Integer status);
}

src/main/java/io/renren/modules/admin/service/impl/PaymentServiceImpl.java

@@ -74,4 +74,9 @@ public class PaymentServiceImpl extends ServiceImpl<PaymentDao, PaymentEntity> i
    public BigDecimal getTotalMoney(Long meetingId, String where) {
        return baseMapper.getTotalMoney(meetingId, where);
    }
    @Override
    public int updatePayStatus(Long id, Integer status) {
       return baseMapper.updatePayStatus(id, status);
    }
}

src/main/java/io/renren/modules/app/controller/Meeting.java

@@ -2,7 +2,9 @@ package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.MeetingEntity;
import io.renren.modules.admin.entity.MoneyAccountEntity;
import io.renren.modules.admin.service.MeetingService;
import io.renren.modules.admin.service.MoneyAccountService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -21,6 +23,9 @@ public class Meeting {
    @Autowired
    private MeetingService meetingService;
    @Autowired
    private MoneyAccountService moneyAccountService;
    /**
     * 获取会议信息
     */
@@ -31,4 +36,13 @@ public class Meeting {
        return R.ok().put("meeting", meeting);
    }
    /**
     * 根据meetingId信息获取对公账号
     */
    @GetMapping("/accountinfo/{mid}")
    public R infoByMid(@PathVariable("mid") Long mid){
		MoneyAccountEntity moneyAccount = moneyAccountService.getOneByMeetingId(mid);
        
        return R.ok().put("moneyAccount", moneyAccount);
    }
}

src/main/java/io/renren/modules/app/controller/UserController.java

@@ -4,6 +4,8 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.shiro.crypto.hash.Sha256Hash;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -61,11 +63,31 @@ public class UserController {
    @GetMapping("/orderlist")
    @ApiOperation("获取订单列表")
    public R orderList(@RequestAttribute("userId") Integer userId){
        System.out.println(userId);
        // System.out.println(userId);
        Long memberId = Long.valueOf(userId);        
        List<Map<String, Object>> orderList = userService.queryOrderList(memberId);        
        return R.ok().put("orderList", orderList);
    }
    /**
     * 重置密码
     */
    @Login
    @PostMapping("newpassword")
    @ApiOperation("重置密码")
    public R newpassword(@RequestBody Map<String, Object> params, @LoginUser UserEntity user) {
        Long id = user.getUserId();
        String password = (String) params.get("password");
        String newpassword = (String) params.get("newpassword");
        if (StringUtils.isBlank(newpassword)) {
            return R.error("新密码不能为空");
        }
        if(!user.getPassword().equals(new Sha256Hash(password, user.getSalt()).toHex())){
			return R.error("原密码不正确");
		}
        userService.updatePassWord(id, newpassword);
        return R.ok();
    }
}

src/main/java/io/renren/modules/app/dao/UserDao.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import io.renren.modules.app.entity.UserEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
/**
 * 用户
@@ -28,4 +29,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
    @Select("select a.name as attendersName,a.meeting_id as meetingId,a.position_id as position,(select m.name_cn from meeting as m where m.id=a.meeting_id) as meetingName ,(select m.start_time from meeting as m where m.id=a.meeting_id) as startTime,(select m.end_time from meeting as m where m.id=a.meeting_id) as endTime,(select p.is_pay from payment as p where p.attenders_id = a.id) as isCheck from attenders as a where a.id = #{attendersId};")
    Map<String, Object> queryOrderInfoByAttendersId(Long attendersId);
    @Update("UPDATE member SET `password`=#{password}, `salt`=#{salt} WHERE `id`=#{id}")
    int updatePassWord(Long id, String password, String salt);
}

src/main/java/io/renren/modules/app/service/UserService.java

@@ -47,4 +47,12 @@ public interface UserService extends IService<UserEntity> {
	 * 
	 */
	Map<String, Object> queryOrderInfoByAttendersId(Long attendersId);
	/**
	 * 重置密码
	 * @param id
	 * @param password
	 * @param repassword
	 */
	int updatePassWord(Long id, String password);
}

src/main/java/io/renren/modules/app/service/impl/UserServiceImpl.java

@@ -42,7 +42,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
		//密码错误
		// if(!user.getPassword().equals(DigestUtils.sha256Hex(form.getPassword()))){
		if(!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())){
			throw new RRException("账号或密码错误1");
			throw new RRException("账号或密码错误");
		}
		return user.getUserId();
@@ -68,4 +68,12 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
	public Map<String, Object> queryOrderInfoByAttendersId(Long attendersId) {
		return baseMapper.queryOrderInfoByAttendersId(attendersId);
	}
	@Override
	public int updatePassWord(Long id, String password) {
		String salt = RandomStringUtils.randomAlphanumeric(20);
		password = new Sha256Hash(password, salt).toHex();
		return baseMapper.updatePassWord(id, password, salt);
	}
}