xdd vor 3 Wochen
Ursprung
Commit
356c5fa0eb

+ 19 - 0
fs-admin/src/main/java/com/fs/his/controller/RechargeTemplateController.java

@@ -3,12 +3,18 @@ package com.fs.his.controller;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.core.redis.RedisCache;
+import com.fs.his.param.FsCouponListUParam;
+import com.fs.his.service.IFsCouponService;
+import com.fs.his.service.IFsUserCouponService;
+import com.fs.his.vo.FsCouponListUVO;
 import com.fs.recharge.domain.RechargeTemplate;
 import com.fs.recharge.param.RechargeParam;
 import com.fs.recharge.param.RechargeTemplateQuery;
 import com.fs.recharge.service.RechargeTemplateService;
 import com.fs.recharge.vo.RechargeTemplateVO;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -29,6 +35,8 @@ public class RechargeTemplateController extends BaseController {
 
     @Autowired
     private RechargeTemplateService rechargeTemplateService;
+    @Autowired
+    private IFsCouponService couponService;
 
     @ApiOperation("获取可用的充值模板列表")
     @PostMapping("/list")
@@ -80,4 +88,15 @@ public class RechargeTemplateController extends BaseController {
         boolean success = rechargeTemplateService.updateStatus(id, status);
         return R.ok();
     }
+
+
+    @ApiOperation("获取优惠券列表")
+    @GetMapping("/getCouponList")
+    public R getCouponList(FsCouponListUParam param)
+    {
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        List<FsCouponListUVO> list=couponService.selectFsCouponListUVO(param);
+        PageInfo<FsCouponListUVO> listPageInfo=new PageInfo<>(list);
+        return R.ok().put("data",listPageInfo);
+    }
 }

+ 61 - 0
fs-service/src/main/java/com/fs/complaint/domain/FsComplaint.java

@@ -0,0 +1,61 @@
+package com.fs.complaint.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * 投诉表实体类
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FsComplaint {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 投诉单号
+     */
+    private String complaintNo;
+
+    /**
+     * 投诉分类ID
+     */
+    private Long categoryId;
+
+    /**
+     * 投诉内容
+     */
+    private String content;
+
+    /**
+     * 联系手机号
+     */
+    private String contactPhone;
+
+    /**
+     * 联系邮箱
+     */
+    private String contactEmail;
+
+    /**
+     * 状态:1-待处理,2-处理中,3-已完成,4-已关闭
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+}

+ 51 - 0
fs-service/src/main/java/com/fs/complaint/domain/FsComplaintAttachment.java

@@ -0,0 +1,51 @@
+package com.fs.complaint.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * 投诉附件表实体类
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FsComplaintAttachment {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 投诉ID
+     */
+    private Long complaintId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
+    /**
+     * 文件大小(字节)
+     */
+    private Long fileSize;
+
+    /**
+     * 文件类型
+     */
+    private String fileType;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+}

+ 51 - 0
fs-service/src/main/java/com/fs/complaint/domain/FsComplaintCategory.java

@@ -0,0 +1,51 @@
+package com.fs.complaint.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * 投诉分类表实体类
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FsComplaintCategory {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 分类编码
+     */
+    private String categoryCode;
+
+    /**
+     * 排序
+     */
+    private Integer sortOrder;
+
+    /**
+     * 状态:1-启用,0-禁用
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+}

+ 29 - 0
fs-service/src/main/java/com/fs/complaint/dto/SubmitComplaintDTO.java

@@ -0,0 +1,29 @@
+package com.fs.complaint.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class SubmitComplaintDTO implements Serializable {
+    /**
+     * 投诉类型
+     */
+    private List<Long> type;
+
+    /**
+     * 投诉类型
+     */
+    private String content;
+
+    /**
+     * 凭证列表
+     */
+    private List<String> url;
+
+    /**
+     * 联系方式
+     */
+    private String contact;
+}

+ 45 - 0
fs-service/src/main/java/com/fs/complaint/mapper/FsComplaintAttachmentMapper.java

@@ -0,0 +1,45 @@
+package com.fs.complaint.mapper;
+
+import com.fs.complaint.domain.FsComplaintAttachment;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+/**
+ * 投诉附件表数据访问层
+ */
+@Mapper
+public interface FsComplaintAttachmentMapper {
+
+    /**
+     * 根据ID查询附件信息
+     */
+    @Select("SELECT * FROM fs_complaint_attachment WHERE id = #{id}")
+    FsComplaintAttachment selectById(Long id);
+
+    /**
+     * 根据投诉ID查询附件列表
+     */
+    @Select("SELECT * FROM fs_complaint_attachment WHERE complaint_id = #{complaintId}")
+    List<FsComplaintAttachment> selectByComplaintId(Long complaintId);
+
+    /**
+     * 插入附件信息
+     */
+    @Insert("INSERT INTO fs_complaint_attachment(complaint_id, file_name, file_path, file_size, file_type) " +
+            "VALUES(#{complaintId}, #{fileName}, #{filePath}, #{fileSize}, #{fileType})")
+    @Options(useGeneratedKeys = true, keyProperty = "id")
+    int insert(FsComplaintAttachment attachment);
+
+    /**
+     * 根据ID删除附件信息
+     */
+    @Update("DELETE FROM fs_complaint_attachment WHERE id = #{id}")
+    int deleteById(Long id);
+
+    /**
+     * 根据投诉ID删除附件信息
+     */
+    @Update("DELETE FROM fs_complaint_attachment WHERE complaint_id = #{complaintId}")
+    int deleteByComplaintId(Long complaintId);
+}

+ 52 - 0
fs-service/src/main/java/com/fs/complaint/mapper/FsComplaintCategoryMapper.java

@@ -0,0 +1,52 @@
+package com.fs.complaint.mapper;
+
+import com.fs.complaint.domain.FsComplaintCategory;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+/**
+ * 投诉分类表数据访问层
+ */
+@Mapper
+public interface FsComplaintCategoryMapper {
+
+    /**
+     * 根据ID查询分类信息
+     */
+    @Select("SELECT * FROM fs_complaint_category WHERE id = #{id}")
+    FsComplaintCategory selectById(Long id);
+
+    /**
+     * 查询所有启用的分类列表
+     */
+    @Select("SELECT * FROM fs_complaint_category WHERE status = 1 ORDER BY sort_order ASC")
+    List<FsComplaintCategory> selectAllEnabled();
+
+    /**
+     * 查询所有分类列表
+     */
+    @Select("SELECT * FROM fs_complaint_category ORDER BY sort_order ASC")
+    List<FsComplaintCategory> selectAll();
+
+    /**
+     * 插入分类信息
+     */
+    @Insert("INSERT INTO fs_complaint_category(category_name, category_code, sort_order, status) " +
+            "VALUES(#{categoryName}, #{categoryCode}, #{sortOrder}, #{status})")
+    @Options(useGeneratedKeys = true, keyProperty = "id")
+    int insert(FsComplaintCategory category);
+
+    /**
+     * 更新分类信息
+     */
+    @Update("UPDATE fs_complaint_category SET category_name = #{categoryName}, category_code = #{categoryCode}, " +
+            "sort_order = #{sortOrder}, status = #{status} WHERE id = #{id}")
+    int update(FsComplaintCategory category);
+
+    /**
+     * 根据ID删除分类信息
+     */
+    @Update("DELETE FROM fs_complaint_category WHERE id = #{id}")
+    int deleteById(Long id);
+}

+ 53 - 0
fs-service/src/main/java/com/fs/complaint/mapper/FsComplaintMapper.java

@@ -0,0 +1,53 @@
+package com.fs.complaint.mapper;
+
+import com.fs.complaint.domain.FsComplaint;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+/**
+ * 投诉表数据访问层
+ */
+@Mapper
+public interface FsComplaintMapper {
+
+    /**
+     * 根据ID查询投诉信息
+     */
+    @Select("SELECT * FROM fs_complaint WHERE id = #{id}")
+    FsComplaint selectById(Long id);
+
+    /**
+     * 根据投诉单号查询投诉信息
+     */
+    @Select("SELECT * FROM fs_complaint WHERE complaint_no = #{complaintNo}")
+    FsComplaint selectByComplaintNo(String complaintNo);
+
+    /**
+     * 分页查询投诉列表
+     */
+    @Select("SELECT * FROM fs_complaint ORDER BY create_time DESC LIMIT #{offset}, #{limit}")
+    List<FsComplaint> selectPage(@Param("offset") int offset, @Param("limit") int limit);
+
+    /**
+     * 插入投诉信息
+     */
+    @Insert("INSERT INTO fs_complaint(complaint_no, category_id, content, contact_phone, contact_email, status) " +
+            "VALUES(#{complaintNo}, #{categoryId}, #{content}, #{contactPhone}, #{contactEmail}, #{status})")
+    @Options(useGeneratedKeys = true, keyProperty = "id")
+    int insert(FsComplaint complaint);
+
+    /**
+     * 更新投诉信息
+     */
+    @Update("UPDATE fs_complaint SET category_id = #{categoryId}, content = #{content}, " +
+            "contact_phone = #{contactPhone}, contact_email = #{contactEmail}, status = #{status} " +
+            "WHERE id = #{id}")
+    int update(FsComplaint complaint);
+
+    /**
+     * 根据ID删除投诉信息
+     */
+    @Update("DELETE FROM fs_complaint WHERE id = #{id}")
+    int deleteById(Long id);
+}

+ 7 - 0
fs-service/src/main/java/com/fs/complaint/service/FsComplaintService.java

@@ -0,0 +1,7 @@
+package com.fs.complaint.service;
+
+import com.fs.complaint.dto.SubmitComplaintDTO;
+
+public interface FsComplaintService {
+    void submitComplaint(SubmitComplaintDTO dto);
+}

+ 17 - 0
fs-service/src/main/java/com/fs/complaint/service/impl/FsComplaintServiceImpl.java

@@ -0,0 +1,17 @@
+package com.fs.complaint.service.impl;
+
+import com.fs.complaint.dto.SubmitComplaintDTO;
+import com.fs.complaint.mapper.FsComplaintMapper;
+import com.fs.complaint.service.FsComplaintService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class FsComplaintServiceImpl implements FsComplaintService {
+    @Autowired
+    private FsComplaintMapper fsComplaintMapper;
+    @Override
+    public void submitComplaint(SubmitComplaintDTO dto) {
+
+    }
+}

+ 48 - 0
fs-user-app/src/main/java/com/fs/app/controller/FsComplaintController.java

@@ -0,0 +1,48 @@
+package com.fs.app.controller;
+
+import com.fs.common.core.domain.R;
+import com.fs.complaint.domain.FsComplaintCategory;
+import com.fs.complaint.dto.SubmitComplaintDTO;
+import com.fs.complaint.mapper.FsComplaintCategoryMapper;
+import com.fs.complaint.service.FsComplaintService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api("投诉接口")
+@RestController
+@RequestMapping(value="/app/complaint")
+public class FsComplaintController {
+
+    @Autowired
+    private FsComplaintCategoryMapper fsComplaintCategoryMapper;
+
+    @Autowired
+    private FsComplaintService fsComplaintService;
+    /**
+     * 获取所有投诉类型
+     * @return R
+     */
+    @GetMapping("/category")
+    public R getComplaintCategory(){
+        List<FsComplaintCategory> fsComplaintCategories = fsComplaintCategoryMapper.selectAll();
+        return R.ok().put("data", fsComplaintCategories);
+    }
+
+    /**
+     * 提交投诉
+     * @return
+     */
+    @PostMapping("/submitComplaint")
+    public R submitComplaint(SubmitComplaintDTO dto){
+        fsComplaintService.submitComplaint(dto);
+        return R.ok();
+    }
+
+
+}