广告接口定义

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AdvertisingMapper.java → wisenergy-mapper/src/main/java/cn/wisenergy/mapper/BannerMapper.java

 package cn.wisenergy.mapper;
 
-import cn.wisenergy.model.app.Advertising;
+import cn.wisenergy.model.app.Banner;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
-public interface AdvertisingMapper extends BaseMapper<Advertising> {
+import java.util.List;
+import java.util.Map;
+
+public interface BannerMapper extends BaseMapper<Banner> {
     /**
      * 添加广告
      *
      * @param advertising 广告信息
      * @return 广告信息
      */
-    Advertising add(Advertising advertising);
+    Banner add(Banner advertising);
 
     /**
      * 编辑广告
@@ -19,7 +22,7 @@ public interface AdvertisingMapper extends BaseMapper<Advertising> {
      * @param advertising 广告信息
      * @return 结果
      */
-    int edit(Advertising advertising);
+    int edit(Banner advertising);
 
     /**
      * 删除广告
@@ -28,4 +31,17 @@ public interface AdvertisingMapper extends BaseMapper<Advertising> {
      * @return 结果
      */
     int delById(@Param("id") Integer id);
+
+    /**
+     * 获取广告列表
+     * @param map 筛选参数
+     * @return 广告列表
+     */
+    List<Banner> getList(@Param("map") Map<String,Object> map);
+
+    /**
+     * 统计广告条数
+     * @return
+     */
+    int count();
 }

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/PayRecordMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface PayRecordMapper extends BaseMapper<PayRecord> {
-    PayRecord add(PayRecord payRecord);
+    int add(PayRecord payRecord);
 
     List<PayRecordShowVo> getList(Map<String,Object> map);
 

wisenergy-mapper/src/main/resources/mapper/AdvertisingMapper.xml → wisenergy-mapper/src/main/resources/mapper/BannerMapper.xml

 <?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.AdvertisingMapper">
-    <resultMap id="advertisingMap" type="cn.wisenergy.model.app.Advertising">
+<mapper namespace="cn.wisenergy.mapper.BannerMapper">
+    <resultMap id="advertisingMap" type="cn.wisenergy.model.app.Banner">
         <id column="id" property="id"/>
         <result column="company_name" property="companyName"/>
         <result column="status" property="status"/>
@@ -53,7 +53,7 @@
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
     </sql>
 
-    <insert id="add" parameterType="cn.wisenergy.model.app.Advertising" keyProperty="id" useGeneratedKeys="true">
+    <insert id="add" parameterType="cn.wisenergy.model.app.Banner" keyProperty="id" useGeneratedKeys="true">
         insert into
         <include refid="table"/>
         (<include refid="cols_exclude_id"/>)
@@ -62,7 +62,7 @@
         )
     </insert>
 
-    <update id="edit" parameterType="cn.wisenergy.model.app.Advertising">
+    <update id="edit" parameterType="cn.wisenergy.model.app.Banner">
         UPDATE
         <include refid="table"/>
         <set>
@@ -79,4 +79,25 @@
         where id = #{id}
     </delete>
 
+    <select id="getList" resultType="cn.wisenergy.model.app.Banner">
+        select
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            is_delete=0
+            limit #{startNum},#{endNum}
+            order by create_time desc
+        </where>
+    </select>
+
+    <select id="count" resultType="java.lang.Integer">
+        select count(1)
+        from
+        <include refid="table"/>
+        <where>
+            is_delete=0
+        </where>
+    </select>
+
 </mapper>

wisenergy-model/src/main/java/cn/wisenergy/model/app/Advertising.java → wisenergy-model/src/main/java/cn/wisenergy/model/app/Banner.java

@@ -14,7 +14,7 @@ import java.util.Date;
  */
 @Data
 @ApiModel(value = "Advertising")
-public class Advertising implements Serializable {
+public class Banner implements Serializable {
     private static final long serialVersionUID = 5513428780946937905L;
 
     /**

wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimit.java

@@ -4,11 +4,13 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 @Data
 @ApiModel(value = "UserLimit")
-public class UserLimit {
+public class UserLimit implements Serializable {
+    private static final long serialVersionUID = 3956830394491346594L;
     /**
      * 用户卡点id
      */

wisenergy-service/src/main/java/cn/wisenergy/service/app/AdvertisingService.java

 package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.Advertising;
+import cn.wisenergy.model.app.Banner;
 import cn.wisenergy.model.vo.AdvertisingQueryVo;
 import com.github.pagehelper.PageInfo;
 
@@ -17,7 +17,7 @@ public interface AdvertisingService {
      * @param advertising 广告信息
      * @return 广告信息
      */
-    R<Advertising> add(Advertising advertising);
+    R<Banner> add(Banner advertising);
 
     /**
      * 编辑广告
@@ -25,7 +25,7 @@ public interface AdvertisingService {
      * @param advertising 广告信息
      * @return true 成功 false 失败
      */
-    R<Boolean> edit(Advertising advertising);
+    R<Boolean> edit(Banner advertising);
 
     /**
      * 获取详情
@@ -33,7 +33,7 @@ public interface AdvertisingService {
      * @param id 广告id
      * @return 详情
      */
-    R<Advertising> getById(Integer id);
+    R<Banner> getById(Integer id);
 
     /**
      * 获取广告分页列表
@@ -41,7 +41,7 @@ public interface AdvertisingService {
      * @param advertisingQueryVo 分页参数
      * @return 分页结果集
      */
-    R<PageInfo<Advertising>> getList(AdvertisingQueryVo advertisingQueryVo);
+    R<PageInfo<Banner>> getList(AdvertisingQueryVo advertisingQueryVo);
 
     /**
      * 开始/暂停投放广告

wisenergy-service/src/main/java/cn/wisenergy/service/app/PayRecordService.java

@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.PayRecord;
 import cn.wisenergy.model.vo.PayRecordQueryVo;
 import cn.wisenergy.model.vo.PayRecordShowVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.github.pagehelper.PageInfo;
 
 /**
@@ -18,4 +19,11 @@ public interface PayRecordService {
      * @return
      */
     R<PageInfo<PayRecordShowVo>> getList(PayRecordQueryVo payRecordQueryVo);
+
+    /**
+     * 添加充值记录
+     * @param payRecord 充值记录信息
+     * @return true 成功 false 失败
+     */
+    Boolean add(PayRecord payRecord);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLimitService.java

+package cn.wisenergy.service.app;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.model.app.UserLimit;
+
+
+/**
+*@ Description: 用户查询次数接口定义
+*@ Author     : 86187
+*@ Date       : 2021/1/14 9:33
+*/
+public interface UserLimitService {
+    /**
+     * 获取用户查询次数信息
+     * @param userId 用户id
+     * @return 用户查询次数信息
+     */
+    R<UserLimit> getByUserId(Integer userId);
+}

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AdvertisingServiceImpl.java

 package cn.wisenergy.service.app.impl;
 
 import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.AdvertisingMapper;
-import cn.wisenergy.model.app.Advertising;
+import cn.wisenergy.mapper.BannerMapper;
+import cn.wisenergy.model.app.Banner;
 import cn.wisenergy.model.vo.AdvertisingQueryVo;
 import cn.wisenergy.service.app.AdvertisingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,24 +17,24 @@ import org.springframework.stereotype.Service;
 */
 @Slf4j
 @Service
-public class AdvertisingServiceImpl extends ServiceImpl<AdvertisingMapper, Advertising> implements AdvertisingService {
+public class AdvertisingServiceImpl extends ServiceImpl<BannerMapper, Banner> implements AdvertisingService {
     @Override
-    public R<Advertising> add(Advertising advertising) {
+    public R<Banner> add(Banner advertising) {
         return null;
     }
 
     @Override
-    public R<Boolean> edit(Advertising advertising) {
+    public R<Boolean> edit(Banner advertising) {
         return null;
     }
 
     @Override
-    public R<Advertising> getById(Integer id) {
+    public R<Banner> getById(Integer id) {
         return null;
     }
 
     @Override
-    public R<PageInfo<Advertising>> getList(AdvertisingQueryVo advertisingQueryVo) {
+    public R<PageInfo<Banner>> getList(AdvertisingQueryVo advertisingQueryVo) {
         return null;
     }
 

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/PayRecordServiceImpl.java

@@ -4,10 +4,8 @@ import cn.wisenergy.common.constant.CommonAttributes;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.mapper.PayRecordMapper;
 import cn.wisenergy.model.app.PayRecord;
-import cn.wisenergy.model.dto.UserInfoDto;
 import cn.wisenergy.model.vo.PayRecordQueryVo;
 import cn.wisenergy.model.vo.PayRecordShowVo;
-import cn.wisenergy.model.vo.UserQueryVo;
 import cn.wisenergy.service.app.PayRecordService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
@@ -27,9 +25,11 @@ import java.util.Map;
 @Service
 @Slf4j
 public class PayRecordServiceImpl extends ServiceImpl<PayRecordMapper, PayRecord> implements PayRecordService {
+
     @Autowired
     private PayRecordMapper payRecordMapper;
 
+
     @Override
     public R<PageInfo<PayRecordShowVo>> getList(PayRecordQueryVo queryVo) {
         log.info("volunteer-service[]PayRecordServiceImpl[]getList[]input.param.queryVo:" + queryVo);
@@ -56,6 +56,22 @@ public class PayRecordServiceImpl extends ServiceImpl<PayRecordMapper, PayRecord
         return R.ok(info);
     }
 
+    @Override
+    public Boolean add(PayRecord payRecord) {
+        log.info("volunteer-service[]PayRecordServiceImpl[]payRecord[]input.param.payRecord:" + payRecord);
+        if (null == payRecord) {
+            return false;
+        }
+
+        //保存充值记录信息
+        int count = payRecordMapper.add(payRecord);
+        if (count == 0) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * 分页处理方法
      *

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLimitServiceImpl.java

+package cn.wisenergy.service.app.impl;
+
+import cn.wisenergy.common.utils.R;
+import cn.wisenergy.mapper.UserLimitMapper;
+import cn.wisenergy.model.app.UserLimit;
+import cn.wisenergy.service.app.UserLimitService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class UserLimitServiceImpl extends ServiceImpl<UserLimitMapper, UserLimit> implements UserLimitService {
+
+
+    @Override
+    public R<UserLimit> getByUserId(Integer userId) {
+        log.info("volunteer-service[]UserLimitServiceImpl[]getByUserId[]input.param.userId:" + userId);
+        if (null == userId) {
+            return R.error("入参不能为空!");
+        }
+
+        //由用户id,获取用户查询次数信息
+        QueryWrapper<UserLimit> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId);
+        UserLimit userLimit = baseMapper.selectOne(queryWrapper);
+
+        return R.ok(userLimit);
+    }
+}

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/AccountController.java

@@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author 86187
+ */
 @Api(tags = "管理员登录")
 @RestController
 @RequestMapping("/account")
@@ -35,8 +38,7 @@ public class AccountController {
             return R.error("账号或密码为空");
         }
         //查询管理员信息
-        R<AccountDto> accountInfo1 = accountSerivce.getAccountInfo(userName, password);
         //返回数据
-        return accountInfo1;
+        return accountSerivce.getAccountInfo(userName, password);
     }
 }