Skip to content

D
data-server
Commit 5fc81200 authored by m1991's avatar m1991
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b16d7364 0c938fe5
Show whitespace changes
Inline Side-by-side
Showing with 413 additions and 99 deletions
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
View file @ 5fc81200
......@@ -2,15 +2,37 @@ package cn.wisenergy.mapper;
import cn.wisenergy.model.app.AccountInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.Map;
/**
* @author 86187
*/
public interface AccountMapper extends BaseMapper<AccountInfo> {
/**
* 添加
*
* @param accountInfo 账户信息
* @return 1
*/
int add(AccountInfo accountInfo);
/**
* 编辑
*
* @param accountInfo 账户信息
* @return 1
*/
int edit(AccountInfo accountInfo);
/**
* 查询管理员信息
* @param map 查询参数
* @return
* 删除
*
* @param id 主键id
* @return 1
*/
AccountInfo getAccountInfo(Map<String, Object> map);
int delById(@Param("id") Integer id);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RebateMapper.java 0 → 100644
View file @ 5fc81200
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.Rebate;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @author 86187
*/
public interface RebateMapper extends BaseMapper<Rebate> {
/**
*
* @param rebate 入参
* @return 1
*/
int add(Rebate rebate);
/**
* 编辑
* @param rebate 入参
* @return 1
*/
int edit(Rebate rebate);
/**
* 删除
* @param id 主键id
* @return 1
*/
int delById(@Param("id") Integer id);
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/TradeRecordMapper.java 0 → 100644
View file @ 5fc81200
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.TradeRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @author 86187
*/
public interface TradeRecordMapper extends BaseMapper<TradeRecord> {
/**
* 添加交易记录
* @param tradeRecord 记录信息
* @return 1
*/
int add(TradeRecord tradeRecord);
/**
* 编辑交易记录
* @param tradeRecord 记录信息
* @return 1
*/
int edit(TradeRecord tradeRecord);
/**
* 删除
* @param id 主键
* @return 1
*/
int delById(@Param("id") Integer id);
}
wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
View file @ 5fc81200
......@@ -3,16 +3,17 @@
<mapper namespace="cn.wisenergy.mapper.AccountMapper">
<resultMap id="AccountMap" type="cn.wisenergy.model.app.AccountInfo">
<id column="id" property="id"/>
<result column="user_name" property="userName"/>
<result column="password" property="password"/>
<result column="head_image" property="headImage"/>
<result column="is_delete" property="isDelete"/>
<result column="user_id" property="userId"/>
<result column="extract_money" property="extractMoney"/>
<result column="performance_month" property="performanceMonth"/>
<result column="frozen_money" property="frozenMoney"/>
<result column="performance_total" property="performanceTotal"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="table">
account
account_info
</sql>
<sql id="cols_all">
......@@ -21,41 +22,56 @@
</sql>
<sql id="cols_exclude_id">
user_name,password,head_image,is_delete,create_time,update_time
user_id,extract_money,performance_month,frozen_money,performance_total,create_time,update_time
</sql>
<sql id="vals">
#{userName},#{password},#{headImage},
#{isDelete},now(),now()
#{userId},#{extractMoney},#{performanceMonth},#{frozenMoney}, #{performanceTotal},now(),now()
</sql>
<sql id="updateCondition">
<if test="userName != null">user_name = #{userName},</if>
<if test="password != null">password =#{password},</if>
<if test="headImage != null">head_image =#{headImage},</if>
<if test="isDelete != null">is_delete = #{isDelete},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="extractMoney != null">extract_money =#{extractMoney},</if>
<if test="performanceMonth != null">performance_month =#{performanceMonth},</if>
<if test="frozenMoney != null">frozen_money =#{frozenMoney},</if>
<if test="performanceTotal != null">performance_total =#{performanceTotal},</if>
update_time =now()
</sql>
<sql id="criteria">
<if test="id != null">id = #{id}</if>
<if test="userName != null">and user_name = #{userName}</if>
<if test="password != null">and password =#{password}</if>
<if test="headImage != null">and head_image =#{headImage}</if>
<if test="isDelete != null">and is_delete = #{isDelete}</if>
<if test="userId != null">and user_id = #{userId}</if>
<if test="extractMoney != null">and extract_money =#{extractMoney}</if>
<if test="performanceMonth != null">and performance_month =#{performanceMonth}</if>
<if test="frozenMoney != null">and frozen_money =#{frozenMoney}</if>
<if test="performanceTotal != null">performance_total =#{performanceTotal}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<select id="getAccountInfo" resultMap="AccountMap" parameterType="map">
select
<include refid="cols_all"/>
from
<insert id="add" parameterType="cn.wisenergy.model.app.AccountInfo" keyProperty="id" useGeneratedKeys="true">
insert into
<include refid="table"/>
(<include refid="cols_exclude_id"/>)
value(
<include refid="vals"/>
)
</insert>
<update id="edit" parameterType="cn.wisenergy.model.app.AccountInfo">
UPDATE
<include refid="table"/>
<set>
<include refid="updateCondition"/>
</set>
<where>
user_name = #{userName}
and
is_delete=0
id = #{id}
</where>
</select>
</update>
<delete id="delById" parameterType="java.lang.Integer">
delete from
<include refid="table"/>
where id = #{id}
</delete>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/RebateMapper.xml 0 → 100644
View file @ 5fc81200
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.RebateMapper">
<resultMap id="userMap" type="cn.wisenergy.model.app.Rebate">
<id column="id" property="id"/>
<result column="user_level" property="userLevel"/>
<result column="percent" property="percent"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="table">
rebate
</sql>
<sql id="cols_all">
id,
<include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
user_level,percent,create_time,update_time
</sql>
<sql id="vals">
#{userLevel},#{percent},now(),now()
</sql>
<sql id="updateCondition">
<if test="userLevel != null">user_level = #{userLevel},</if>
<if test="percent != null">percent =#{percent},</if>
update_time =now()
</sql>
<sql id="criteria">
<if test="id != null">id = #{id}</if>
<if test="userLevel != null">and user_level = #{userLevel}</if>
<if test="percent != null">and percent =#{percent}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<insert id="add" parameterType="cn.wisenergy.model.app.Rebate" keyProperty="id" useGeneratedKeys="true">
insert into
<include refid="table"/>
(<include refid="cols_exclude_id"/>)
value(
<include refid="vals"/>
)
</insert>
<update id="edit" parameterType="cn.wisenergy.model.app.Rebate">
UPDATE
<include refid="table"/>
<set>
<include refid="updateCondition"/>
</set>
<where>
id = #{id}
</where>
</update>
<delete id="delById" parameterType="java.lang.Integer">
delete from
<include refid="table"/>
where id = #{id}
</delete>
</mapper>
wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml 0 → 100644
View file @ 5fc81200
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.TradeRecordMapper">
<resultMap id="tradeMap" type="cn.wisenergy.model.app.TradeRecord">
<id column="id" property="id"/>
<result column="user_id" property="userId"/>
<result column="trade_type" property="tradeType"/>
<result column="trade_no" property="tradeNo"/>
<result column="task_id" property="taskId"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="table">
trade_record
</sql>
<sql id="cols_all">
id,
<include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
user_id,trade_type,trade_no,task_id,create_time,update_time
</sql>
<sql id="vals">
#{userId},#{tradeType},#{tradeNo},#{taskId}, now(),now()
</sql>
<sql id="updateCondition">
<if test="userId != null">user_id = #{userId},</if>
<if test="tradeType != null">trade_type =#{tradeType},</if>
<if test="tradeNo != null">trade_no =#{tradeNo},</if>
<if test="taskId != null">task_id =#{taskId},</if>
update_time =now()
</sql>
<sql id="criteria">
<if test="id != null">id = #{id}</if>
<if test="userId != null">and user_id = #{userId}</if>
<if test="tradeType != null">and trade_type =#{tradeType}</if>
<if test="tradeNo != null">and trade_no =#{tradeNo}</if>
<if test="taskId != null">and task_id =#{taskId}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql>
<insert id="add" parameterType="cn.wisenergy.model.app.TradeRecord" keyProperty="id" useGeneratedKeys="true">
insert into
<include refid="table"/>
(<include refid="cols_exclude_id"/>)
value(
<include refid="vals"/>
)
</insert>
<update id="edit" parameterType="cn.wisenergy.model.app.TradeRecord">
UPDATE
<include refid="table"/>
<set>
<include refid="updateCondition"/>
</set>
<where>
id = #{id}
</where>
</update>
<delete id="delById" parameterType="java.lang.Integer">
delete from
<include refid="table"/>
where id = #{id}
</delete>
</mapper>
\ No newline at end of file
wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java
View file @ 5fc81200
......@@ -8,7 +8,8 @@ import java.io.Serializable;
import java.util.Date;
/**
* 管理员实体类
* 账户实体类
* @author 86187
*/
@Data
@ApiModel(value = "AccountInfo")
......@@ -16,42 +17,48 @@ public class AccountInfo implements Serializable {
private static final long serialVersionUID = 3050641578536493424L;
/**
* 管理员主键id
* 账户主键id
*/
@ApiModelProperty(name ="id",value = "管理员主键id")
@ApiModelProperty(name = "id", value = "管理员主键id")
private Integer id;
/**
* 管理员账号
* 用户id
*/
@ApiModelProperty(name = "name",value = "管理员账号")
private String userName;
@ApiModelProperty(name = "userId", value = "用户id")
private String userId;
/**
* 管理员密码
* 可提现金额
*/
@ApiModelProperty(name="password",value = "管理员密码")
private String password;
@ApiModelProperty(name = "extractMoney", value = "可提现金额")
private String extractMoney;
/**
* 头像
* 本月业绩
*/
@ApiModelProperty(name = "headImage",value = "头像")
private String headImage;
@ApiModelProperty(name = "performanceMonth", value = "本月业绩")
private String performanceMonth;
/**
* 是否删除
* 冻结金额
*/
@ApiModelProperty(name = "isDelete",value = "是否删除 0：正常 1：删除")
private Integer isDelete;
@ApiModelProperty(name = "frozenMoney", value = "冻结金额")
private Integer frozenMoney;
/**
* 累计业绩
*/
@ApiModelProperty(name = "performanceTotal", value = "累计业绩")
private Integer performanceTotal;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime",value = "创建时间")
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(name = "updateTime",value = "修改时间")
@ApiModelProperty(name = "updateTime", value = "修改时间")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/Rebate.java 0 → 100644
View file @ 5fc81200
package cn.wisenergy.model.app;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @author 86187
* @ Description: 返佣表实体类
* @ Author : 86187
* @ Date : 2021/2/22 11:05
*/
@Data
@ApiModel("Rebate")
public class Rebate implements Serializable {
/**
* 返佣id
*/
@ApiModelProperty(name = "id", value = "返佣id")
private Integer id;
/**
* 用户会员等级 0:普通用户 1：幼苗 2：青铜树 3：白银树 4：黄金树 5：农场主 6：森林之星 7:西田森合伙人
*/
@ApiModelProperty(name = "userLevel", value = "用户会员等级")
private Integer userLevel;
/**
* 等级对应的返佣比例
*/
@ApiModelProperty(name = "", value = "")
private Integer percent;
/**
* 创建时间
*/
@ApiModelProperty(name = "", value = "")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(name = "", value = "")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/app/TradeRecord.java 0 → 100644
View file @ 5fc81200
package cn.wisenergy.model.app;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @author 86187
* @ Description: 交易记录流水表
* @ Author : 86187
* @ Date : 2021/2/22 14:49
*/
@Data
@ApiModel("TradeRecord")
public class TradeRecord implements Serializable {
private static final long serialVersionUID = -8502447089897962007L;
/**
* 主键id
*/
@ApiModelProperty(name = "id", value = "主键id")
private Integer id;
/**
* 用户id
*/
@ApiModelProperty(name = "userId", value = "用户id")
private Integer userId;
/**
* 交易类型 1：提现 2：订单返佣 3：订单下单 4：月度肥料 5：培育奖 6：工资
*/
@ApiModelProperty(name = "tradeType", value = "交易类型 1：提现 2：订单返佣 3：订单下单 4：月度肥料 5：培育奖 6：工资")
private Integer tradeType;
/**
* 交易关联订单号
*/
@ApiModelProperty(name = "tradeNo", value = "交易关联订单号")
private String tradeNo;
/**
* 定时任务id
*/
@ApiModelProperty(name = "taskId", value = "定时任务id")
private Integer taskId;
/**
* 创建时间
*/
@ApiModelProperty(name = "createTime", value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(name = "updateTime", value = "更新时间")
private Date updateTime;
}
wisenergy-model/src/main/java/cn/wisenergy/model/vo/AccountLoginVo.java deleted 100644 → 0
View file @ b16d7364
package cn.wisenergy.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
@ApiModel(value = "AccountInfo")
public class AccountLoginVo implements Serializable {
private static final long serialVersionUID = -3802879442149734552L;
/**
* 管理员账号
*/
@ApiModelProperty(name = "name",value = "管理员账号")
private String userName;
/**
* 管理员密码
*/
@ApiModelProperty(name="password",value = "管理员密码")
private String password;
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @ 5fc81200
package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.model.app.User;
import cn.wisenergy.service.app.UserService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @ Description: 用户接口实现
* @ Author : 86187
* @ Date : 2021/1/6 16:11
* @author 86187
*/
@Service
@Slf4j
......
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/AccountController.java
View file @ 5fc81200
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.model.dto.AccountDto;
import cn.wisenergy.model.vo.AccountLoginVo;
import cn.wisenergy.service.app.AccountSerivce;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
/**
* @author 86187
*/
@Api(tags = "管理员登录")
@Api(tags = "账户管路")
@RestController
@RequestMapping("/account")
@Slf4j
......@@ -24,15 +17,4 @@ public class AccountController {
@Autowired
private AccountSerivce accountSerivce;
@ApiOperation(value = "管理员登录",notes = "管理员登录",httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "userName",value = "账号",required = true),
@ApiImplicitParam(name = "password",value = "密码",required = true)
})
@PostMapping("/login")
public R<AccountDto> getAccountInfo(@RequestBody AccountLoginVo accountLoginVo){
log.info("AccountController[].getAccountInfo[].input.param:accountLoginVo:"+accountLoginVo);
//返回数据
return accountSerivce.getAccountInfo(accountLoginVo);
}
}
wisenergy-web-admin/src/main/resources/application-dev.yml
View file @ 5fc81200
......@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.110.165:3306/intellir?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.110.165:3306/shop_app?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root
password: admin!@#123
password: adm4HYservice$
initial-size: 10
max-active: 100
min-idle: 10
......
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