hjp преди 2 седмици
родител
ревизия
ca9b849eb4

+ 5 - 2
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -864,7 +864,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
             SmsSingleSender ssender = new SmsSingleSender(Integer.valueOf(clientId), clientSecret);
             switch (state) {
                 case "register":
-                    result = ssender.send(0, "86", phone, "【" + name.getValue() + "】验证码: " + code + ",此验证码可用于登录或注册,10分钟内有效,如非您本人操作,可忽略本条消息", "", "");
+                    // FIXME: 2025/5/20 0020 
+//                    result = ssender.send(0, "86", phone, "【" + name.getValue() + "】验证码: " + code + ",此验证码可用于登录或注册,10分钟内有效,如非您本人操作,可忽略本条消息", "", "");
                     break;
                 case "forget":
                     result = ssender.send(0, "86", phone, "【" + name.getValue() + "】验证码: " + code + ",您正在执行找回密码操作,10分钟内有效,如非您本人操作,可忽略本条消息", "", "");
@@ -879,7 +880,9 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 
 
             System.out.println(result);
-            if (result.result == 0) {
+            // FIXME: 2025/5/20 0020
+//            if (result.result == 0) {
+            if (true) {
                 Msg byPhone = msgDao.findByPhone(phone);
                 if (byPhone != null) {
                     byPhone.setCode(String.valueOf(code));

+ 50 - 0
src/main/java/com/sqx/modules/appeal/controller/AppealController.java

@@ -0,0 +1,50 @@
+package com.sqx.modules.appeal.controller;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.app.annotation.Login;
+import com.sqx.modules.appeal.entity.Appeal;
+import com.sqx.modules.appeal.service.AppealService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@Api(value = "用户-申诉", tags = {"用户-申诉"})
+@RequestMapping("/app/appeal")
+public class AppealController {
+
+    @Resource
+    private AppealService appealService;
+
+    @Login
+    @GetMapping("/getAppeal")
+    @ApiOperation("获取申诉记录")
+    public Result getAppeal(@RequestAttribute("userId")Long userId, Integer page, Integer limit, Appeal appeal, String startTime, String endTime){
+        return Result.success().put("data",appealService.getAppealPage(page,limit,userId, appeal,startTime,endTime));
+    }
+
+    @Login
+    @PostMapping("/insertAppeal")
+    @ApiOperation("新增申诉")
+    public Result insertAppeal(@RequestAttribute("userId")Long userId, Appeal appeal){
+        appeal.setProcess(2);
+        appeal.setUserId(userId);
+        return appealService.insertAppeal(appeal);
+    }
+
+    @Login
+    @PostMapping("/updateAppeal")
+    @ApiOperation("修改申诉")
+    public Result updateAppeal(@RequestAttribute("userId")Long userId, Appeal appeal){
+        appeal.setUserId(userId);
+        return appealService.updateAppeal(appeal);
+    }
+
+    @PostMapping("/deleteAppeal")
+    @ApiOperation("删除申诉")
+    public Result deleteAppeal(Long id){
+        return appealService.deleteAppeal(id);
+    }
+}

+ 16 - 0
src/main/java/com/sqx/modules/appeal/dao/AppealDao.java

@@ -0,0 +1,16 @@
+package com.sqx.modules.appeal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sqx.modules.appeal.entity.Appeal;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+@Mapper
+public interface AppealDao extends BaseMapper<Appeal> {
+
+    IPage<Appeal> getAppealPage(Page<Map<String, Object>> page, @Param("userId") Long userId, @Param("appeal") Appeal appeal, @Param("startTime") String startTime, @Param("endTime") String endTime);
+}

+ 47 - 0
src/main/java/com/sqx/modules/appeal/entity/Appeal.java

@@ -0,0 +1,47 @@
+package com.sqx.modules.appeal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+@Data
+public class Appeal {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    /**
+     * 申诉id
+     */
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 申诉内容
+     */
+    private String reason;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+
+    /**
+     * 0-驳回,1-申诉
+     */
+    private Integer process;
+
+    /**
+     * 信用记录id
+     */
+    private Long recordId;
+
+    /**
+     * 驳回原因
+     */
+    private String rejection;
+}

+ 17 - 0
src/main/java/com/sqx/modules/appeal/service/AppealService.java

@@ -0,0 +1,17 @@
+package com.sqx.modules.appeal.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.common.utils.PageUtils;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.appeal.entity.Appeal;
+
+public interface AppealService extends IService<Appeal> {
+
+    PageUtils getAppealPage(Integer page, Integer limit, Long userId, Appeal appeal, String startTime, String endTime);
+
+    Result insertAppeal(Appeal appeal);
+
+    Result updateAppeal(Appeal appeal);
+
+    Result deleteAppeal(Long id);
+}

+ 49 - 0
src/main/java/com/sqx/modules/appeal/service/impl/AppealServiceImpl.java

@@ -0,0 +1,49 @@
+package com.sqx.modules.appeal.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.common.utils.DateUtils;
+import com.sqx.common.utils.PageUtils;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.appeal.dao.AppealDao;
+import com.sqx.modules.appeal.entity.Appeal;
+import com.sqx.modules.appeal.service.AppealService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class AppealServiceImpl extends ServiceImpl<AppealDao, Appeal> implements AppealService {
+    @Resource
+    private AppealDao appealDao;
+
+
+    @Override
+    public PageUtils getAppealPage(Integer page, Integer limit, Long userId, Appeal appeal, String startTime, String endTime) {
+        Page<Map<String, Object>> pages = new Page<>(page, limit);
+        return new PageUtils(appealDao.getAppealPage(pages,userId, appeal,startTime,endTime));
+    }
+
+    @Override
+    public Result insertAppeal(Appeal appeal) {
+        appeal.setCreateTime(DateUtils.format(new Date()));
+        appealDao.insert(appeal);
+        return Result.success();
+    }
+
+    @Override
+    public Result updateAppeal(Appeal appeal) {
+        baseMapper.updateById(appeal);
+        return Result.success();
+    }
+
+    @Override
+    public Result deleteAppeal(Long id) {
+        baseMapper.deleteById(id);
+        return Result.success();
+    }
+}

+ 21 - 0
src/main/resources/mapper/appeal/AppealDao.xml

@@ -0,0 +1,21 @@
+<?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="com.sqx.modules.appeal.dao.AppealDao">
+
+    <select id="getAppealPage" resultType="com.sqx.modules.appeal.entity.Appeal">
+        select * from appeal
+        where 1=1
+        <if test="userId!=null">
+            and  user_id=#{userId}
+        </if>
+        <if test="appeal.process !=null">
+            and process = #{appeal.process}
+        </if>
+        <if test="startTime!=null and startTime!=''and endTime!=null and endTime!='' ">
+            and str_to_date(create_time, '%Y-%m-%d') between str_to_date(#{startTime}, '%Y-%m-%d') AND
+            str_to_date(#{endTime}, '%Y-%m-%d')
+        </if>
+        order by create_time desc
+    </select>
+</mapper>