前台接口

src/main/java/io/renren/modules/admin/attenders/service/AttendersService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.utils.PageUtils;
import io.renren.modules.admin.attenders.entity.AttendersEntity;
import java.util.List;
import java.util.Map;
/**
@@ -21,5 +22,7 @@ public interface AttendersService extends IService<AttendersEntity> {
	 * 删除用户(逻辑删除)
	 */
	void delete(Long[] ids);
	List<AttendersEntity> selectByMap(Map<String, Object> uMap);
}

src/main/java/io/renren/modules/admin/attenders/service/impl/AttendersServiceImpl.java

@@ -3,6 +3,8 @@ package io.renren.modules.admin.attenders.service.impl;
import org.springframework.stereotype.Service;
import java.util.Map;
import java.util.Arrays;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,4 +33,8 @@ public class AttendersServiceImpl extends ServiceImpl<AttendersDao, AttendersEnt
    public void delete(Long[] ids) {
        baseMapper.deleteBatchIds(Arrays.asList(ids));
    }
    public List<AttendersEntity> selectByMap(Map<String, Object> uMap) {
        return baseMapper.selectByMap(uMap);
    }
}

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

@@ -13,5 +13,5 @@ import org.apache.ibatis.annotations.Mapper;
 */
@Mapper
public interface PaymentDao extends BaseMapper<PaymentEntity> {
	
}

src/main/java/io/renren/modules/admin/payment/entity/PaymentEntity.java

@@ -33,6 +33,10 @@ public class PaymentEntity implements Serializable {
	 * 公司id
	 */
	private Long companyId;
	/**
	 * 公司id
	 */
	private Long meetingId;
	/**
	 * 参会人员id
	 */

src/main/java/io/renren/modules/admin/typesoffee/entity/TypesOfFeeEntity.java

@@ -32,7 +32,7 @@ public class TypesOfFeeEntity implements Serializable {
	/**
	 * 费用类型
	 */
	private String type;
	private String name;
	/**
	 * 金额
	 */

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

@@ -1,20 +0,0 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.modules.app.annotation.Login;
import io.renren.modules.app.annotation.LoginUser;
import io.renren.modules.app.entity.UserEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * OrderController
 */
public class OrderController {
    
    
}

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

@@ -1,15 +1,8 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.modules.app.annotation.Login;
import io.renren.modules.app.annotation.LoginUser;
import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -19,10 +12,19 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.renren.common.utils.R;
import io.renren.modules.app.annotation.Login;
import io.renren.modules.app.annotation.LoginUser;
import io.renren.modules.app.entity.UserEntity;
import io.renren.modules.app.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
 * APP测试接口
 * 用户接口
 *
 * @author Mark sunlightcs@gmail.com
 * @author huwhois sunlightcs@gmail.com
 */
@RestController
@RequestMapping("/app/user")
@@ -32,7 +34,7 @@ public class UserController {
    private UserService userService;
    @Login
    @GetMapping("/userInfo")
    @GetMapping("/info")
    @ApiOperation("获取用户信息")
    public R userInfo(@LoginUser UserEntity user){
        return R.ok().put("user", user);
@@ -51,4 +53,19 @@ public class UserController {
        return R.ok();
    }
    /**
     * 订单列表
     */
    @Login
    @GetMapping("/orderlist")
    @ApiOperation("获取订单列表")
    public R orderList(@RequestAttribute("userId") Integer userId){
        System.out.println(userId);
        Long memberId = Long.valueOf(userId);        
        List<Map<String, Object>> orderList = userService.queryOrderList(memberId);        
        return R.ok().put("orderList", orderList);
    }
}

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

@@ -8,9 +8,13 @@
package io.renren.modules.app.dao;
import java.util.List;
import java.util.Map;
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;
/**
 * 用户
@@ -19,5 +23,6 @@ import org.apache.ibatis.annotations.Mapper;
 */
@Mapper
public interface UserDao extends BaseMapper<UserEntity> {
    @Select("select p.order_id, p.attenders as attendersId, (select a.name from attenders as a where a.id=p.attenders) as attendersName,  (select a.organization from attenders as a where a.id=p.attenders) as organization, (select tf.name from types_of_fee as tf where tf.id=p.pay_type) as typeName, p.pay_time, (select m.name_cn from meeting as m where m.id=p.meeting_id) as meetingName from payment as p where p.attenders in  (select a.id from attenders as a where a.member_id=#{member_id});")
    List<Map<String, Object>> queryOrderList(Long memberId);
}

src/main/java/io/renren/modules/app/entity/OrderEntity.java

@@ -1,80 +0,0 @@
package io.renren.modules.app.entity;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 
 * 
 * @author huwhois
 * @email huwhois@163.com
 * @date 2020-03-06 11:27:30
 */
@Data
public class OrderEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * 缴费信息id
	 */
	private Long id;
	/**
	 * 订单编号
	 */
	private Long orderId;
	/**
	 * 公司id
	 */
	private Long companyId;
	/**
	 * 参会人员id
	 */
	private Long attenderId;
	/**
	 * 缴费时间
	 */
	private Date payTime;
	/**
	 * 缴费方式
	 */
	private Integer payType;
	/**
	 * 缴费项目
	 */
	private String payOption;
	/**
	 * 金额
	 */
	private BigDecimal money;
	/**
	 * 发票抬头
	 */
	private String taxTitle;
	/**
	 * 纳税人税号
	 */
	private String taxNumber;
	/**
	 * 地址 电话
	 */
	private String addrPhone;
	/**
	 * 开户行及账号
	 */
	private String bankAddrAccount;
	/**
	 * 邮寄地址
	 */
	private String taxAddress;
	/**
	 * 创建时间
	 */
	private Date createTime;
	/**
	 * 是否被删除 状态  0：正常   1：删除
	 */
	private Integer isDel;
}

src/main/java/io/renren/modules/app/entity/UserEntity.java

@@ -54,7 +54,7 @@ public class UserEntity implements Serializable {
	/**
	 * 姓名
	 */
	@NotBlank(message="姓名不能为空", groups = {AddGroup.class, UpdateGroup.class})
	@NotBlank(message="姓名不能为空", groups = UpdateGroup.class)
	private String truename;
	/**
	 * 性别

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

@@ -8,6 +8,8 @@
package io.renren.modules.app.service;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.modules.app.entity.UserEntity;
@@ -34,4 +36,10 @@ public interface UserService extends IService<UserEntity> {
	 * @param user
	 */
	public void saveUser(UserEntity user);
	/**
	 * 根据用户id 获取订单信息
	 * @param memberId
	 */
	public List<Map<String, Object>> queryOrderList(Long memberId);
}

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

@@ -9,6 +9,8 @@
package io.renren.modules.app.service.impl;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -55,5 +57,10 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
		user.setPassword(new Sha256Hash(user.getPassword(), salt).toHex());
		user.setSalt(salt);
		this.save(user); 
    }
	}
	@Override
	public List<Map<String, Object>> queryOrderList(Long memberId) {
		return baseMapper.queryOrderList(memberId);
	}
}

src/main/java/io/renren/modules/sys/controller/SysMenuController.java

@@ -55,6 +55,22 @@ public class SysMenuController extends AbstractController {
		return R.ok().put("meetingMenuList", meetingMenuList).put("noMeetingMenuList", noMeetingMenuList).put("permissions", permissions);
	}
	@GetMapping("/nomeetingnav")
	public R nomeetingnav() {
		Long meetingMenuId = 76L;
		List<SysMenuEntity> meetingMenuList = sysMenuService.getUserMenuList(getUserId(), meetingMenuId);
		Set<String> permissions = shiroService.getUserPermissions(getUserId());
		return R.ok().put("menuList", meetingMenuList).put("permissions", permissions);
	}
	@GetMapping("/meetingnav")
	public R meetingnav() {
		Long meetingMenuId = 76L;
		List<SysMenuEntity> noMeetingMenuList = sysMenuService.getUserNotParentIdMenuList(getUserId(), meetingMenuId);
		Set<String> permissions = shiroService.getUserPermissions(getUserId());
		return R.ok().put("menuList", noMeetingMenuList).put("permissions", permissions);
	}
	/**
	 * 所有菜单列表
	 */