所有接口基本完成

dfbe3eb3 · kaevom · 6856d847 · dfbe3eb3 · dfbe3eb3 · dfbe3eb3
Commit dfbe3eb3 authored Apr 06, 2023 by kaevom
11 changed files
--- a/yongqi-admin/src/main/java/com/yongqi/web/controller/system/SysLoginController.java
+++ b/yongqi-admin/src/main/java/com/yongqi/web/controller/system/SysLoginController.java
@@ -15,6 +15,8 @@ import com.yongqi.system.domain.vo.RouterVo;
 import com.yongqi.system.service.ISysMenuService;
 import com.yongqi.system.service.ISysUserService;
 import com.yongqi.system.service.SysLoginService;
+import com.yongqi.xinrenli.domain.vo.DbWxUserVo;
+import com.yongqi.xinrenli.service.IDbWxUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -37,6 +39,7 @@ public class SysLoginController {
    private final SysLoginService loginService;
    private final ISysMenuService menuService;
    private final ISysUserService userService;
+    private final IDbWxUserService wxUserService;
    /**
     * 登录方法
@@ -118,7 +121,7 @@ public class SysLoginController {
    @GetMapping("getInfo")
    public R<Map<String, Object>> getInfo() {
        LoginUser loginUser = LoginHelper.getLoginUser();
-        SysUser user = userService.selectUserById(loginUser.getUserId());
+        DbWxUserVo user = wxUserService.queryById(loginUser.getUserId());
        Map<String, Object> ajax = new HashMap<>();
        ajax.put("user", user);
        ajax.put("roles", loginUser.getRolePermission());

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbFileController.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbFileController.java
@@ -3,10 +3,7 @@ package com.yongqi.xinrenli.controller;
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
-import java.util.List;
-import java.util.Arrays;
-import java.util.UUID;
 import lombok.RequiredArgsConstructor;
@@ -118,7 +115,7 @@ public class DbFileController extends BaseController {
    @SaCheckPermission("xinrenli:file:upload")
    @Log(title = "文件", businessType = BusinessType.DELETE)
    @PostMapping("/upload")
-    public String upload(MultipartFile file, HttpServletRequest req) {
+    public R upload(MultipartFile file, HttpServletRequest req) {
        if(!file.isEmpty()){
            String uploadPath = "C:\\uploadFile";
            // 如果目录不存在则创建
@@ -131,20 +128,21 @@ public class DbFileController extends BaseController {
            //重新随机生成名字
            String filename = UUID.randomUUID().toString() +suffixName;
            File localFile = new File(uploadPath+"\\"+filename);
+            String url = "http://xinrenli.nyinhong.com/image/"+filename;
            try {
                file.transferTo(localFile); //把上传的文件保存至本地
                /**
                 * 这里应该把filename保存到数据库,供前端访问时使用
                 */
-                return localFile.getPath();//上传成功，返回保存的文件地址
+                Map<String, Object> map = new HashMap<>();
+                map.put("url",url);
+                return R.ok(map);//上传成功，返回保存的文件地址
            }catch (IOException e){
                e.printStackTrace();
-                System.out.println("上传失败");
+                return R.fail("上传失败");
-                return "";
            }
        }else{
-            System.out.println("文件为空");
+            return R.fail("文件为空");
-            return "";
        }
    }

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java
 package com.yongqi.xinrenli.controller;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
@@ -85,11 +86,19 @@ public class DbOrderController extends BaseController {
    @SaCheckPermission("xinrenli:order:export")
    @Log(title = "订单", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
-    public void export(DbOrderBo bo, HttpServletResponse response) {
+    public R<Void> export(DbOrderBo bo, HttpServletResponse response) {
+        try {
            List<DbOrderVo> list = iDbOrderService.queryList(bo);
            ExcelUtil.exportExcel(list, "订单", DbOrderVo.class, response);
+        } catch (Exception e) {
+            return toAjax(false);
+        }
+        return toAjax(true);
    }
    /**
     * 获取订单详细信息
     *
@@ -110,7 +119,7 @@ public class DbOrderController extends BaseController {
    @RepeatSubmit()
    @PostMapping("/add")
    public R<Void> add(@Validated(AddGroup.class) @RequestBody DbOrderBo bo) {
-        //        LoginUser loginUser = getLoginUser();
+                LoginUser loginUser = getLoginUser();
        LoginUser user = new LoginUser();
        user.setUserId(bo.getUserId());
        return toAjax(iDbOrderService.insertByBo(bo, user));
@@ -182,7 +191,7 @@ public class DbOrderController extends BaseController {
    @Log(title = "退款", businessType = BusinessType.OTHER)
    @GetMapping("/refund")
    public R refund(@NotNull(message = "订单id不能为空") @RequestParam("orderId") Long orderId,
-                    @NotNull(message = "退款金额不能为空")@RequestParam("refundeAmount")BigDecimal refundAmount) {
+                    @NotNull(message = "退款金额不能为空")@RequestParam("refundeAmount") BigDecimal refundAmount) {
        LoginUser loginUser = LoginHelper.getLoginUser();
        return iDbOrderService.refund(orderId, refundAmount, loginUser);
    }
@@ -207,6 +216,25 @@ public class DbOrderController extends BaseController {
        return R.ok(iDbOrderService.reportForms());
    }
    /**
+     * 导出报表
+     */
+    @SaCheckPermission("xinrenli:order:exportReportForms")
+    @Log(title = "订单", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportReportForms")
+    public R<Void> exportReportForms(HttpServletResponse response) {
+        try {
+            ReportFormsVo vo = iDbOrderService.reportForms();
+            List<ReportFormsVo> list = new ArrayList<>();
+            list.add(vo);
+            ExcelUtil.exportExcel(list, "订单", ReportFormsVo.class, response);
+        } catch (Exception e) {
+            return toAjax(false);
+        }
+        return toAjax(true);
+    }
+    /**
     * 生成支付订单和发起退款接口，驳回接口
     */
    @SaCheckPermission("xinrenli:order:createPay")

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbFileBo.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbFileBo.java
@@ -75,6 +75,9 @@ public class DbFileBo extends BaseEntity {
     */
 //    @NotBlank(message = "修改人不能为空", groups = {AddGroup.class, EditGroup.class})
    private String modifyName;
+    /**
+     * 业务id
+     */
+    private String serviceId;
 }
--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbOrderBo.java
@@ -119,7 +119,7 @@ public class DbOrderBo extends BaseEntity {
     * 文件列表
     */
    @NotNull(message = "图片，视频，语音必须上传其中一个", groups = {AddGroup.class, EditGroup.class})
-    private List<DbFileBo> fileBoList;
+    private List<DbFileBo> fileVos;
 }
--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbWxUserBo.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbWxUserBo.java
@@ -33,13 +33,13 @@ public class DbWxUserBo extends BaseEntity {
    /**
     * 微信用户的唯一标识
     */
-    @NotBlank(message = "微信用户的唯一标识不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "微信用户的唯一标识不能为空", groups = {AddGroup.class})
    private String openId;
    /**
     * 是否是团长：1：是，2：否
     */
-    @NotNull(message = "是否是团长：1：是，2：否不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "是否是团长：1：是，2：否不能为空", groups = {AddGroup.class})
    private Integer headOrNot;
    /**
@@ -51,133 +51,133 @@ public class DbWxUserBo extends BaseEntity {
    /**
     * 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知
     */
-    @NotNull(message = "用户的性别，值为1时是男性，值为2时是女性，值为0时是未知不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "用户的性别，值为1时是男性，值为2时是女性，值为0时是未知不能为空", groups = {AddGroup.class})
    private Integer sex;
    /**
     * 用户个人资料填写的省份
     */
-    @NotBlank(message = "用户个人资料填写的省份不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "用户个人资料填写的省份不能为空", groups = {AddGroup.class})
    private String province;
    /**
     * 普通用户个人资料填写的城市
     */
-    @NotBlank(message = "普通用户个人资料填写的城市不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "普通用户个人资料填写的城市不能为空", groups = {AddGroup.class})
    private String city;
    /**
     * 国家，如中国为CN
     */
-    @NotBlank(message = "国家，如中国为CN不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "国家，如中国为CN不能为空", groups = {AddGroup.class})
    private String country;
    /**
     * 用户头像
     */
-    @NotBlank(message = "用户头像不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "用户头像不能为空", groups = {AddGroup.class})
    private String headImgUrl;
    /**
     * 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。
     */
-    @NotBlank(message = "只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段。不能为空", groups = {AddGroup.class})
    private String unionId;
    /**
     * 手机号
     */
-    @NotBlank(message = "手机号不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "手机号不能为空", groups = {AddGroup.class})
    private String mobile;
    /**
     * 授权手机号
     */
-    @NotBlank(message = "授权手机号不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "授权手机号不能为空", groups = {AddGroup.class})
    private String authMobile;
    /**
     * 商场编码
     */
-    @NotBlank(message = "商场编码不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "商场编码不能为空", groups = {AddGroup.class})
    private String mallCode;
    /**
     * 会员卡号
     */
-    @NotBlank(message = "会员卡号不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "会员卡号不能为空", groups = {AddGroup.class})
    private String userCode;
    /**
     *
     */
-    @NotBlank(message = "不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "不能为空", groups = {AddGroup.class})
    private String sessionKey;
    /**
     * 是否关注微信(1:关注，0：取消关注)
     */
-    @NotNull(message = "是否关注微信(1:关注，0：取消关注)不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "是否关注微信(1:关注，0：取消关注)不能为空", groups = {AddGroup.class})
    private Integer wechatSubscribe;
    /**
     * 是否取消关注(关注后又取消，和oauth取得的会员区别)(1:取消，0：未取消)
     */
-    @NotNull(message = "是否取消关注(关注后又取消，和oauth取得的会员区别)(1:取消，0：未取消)不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "是否取消关注(关注后又取消，和oauth取得的会员区别)(1:取消，0：未取消)不能为空", groups = {AddGroup.class})
    private Integer cancelSubscribe;
    /**
     * 微信原始ID
     */
-    @NotBlank(message = "微信原始ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "微信原始ID不能为空", groups = {AddGroup.class})
    private String wechatOriginalId;
    /**
     * 下单次数
     */
-    @NotNull(message = "下单次数不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "下单次数不能为空", groups = {AddGroup.class})
    private Long orderNum;
    /**
     * 累计消费
     */
-    @NotNull(message = "累计消费不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "累计消费不能为空", groups = {AddGroup.class})
    private BigDecimal cumulativeConsumption;
    /**
     * 最近消费时间
     */
-    @NotNull(message = "最近消费时间不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "最近消费时间不能为空", groups = {AddGroup.class})
    private Date lastConsumptionTime;
    /**
     * 创建人Code
     */
-    @NotBlank(message = "创建人Code不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "创建人Code不能为空", groups = {AddGroup.class})
    private String createCode;
    /**
     * 更新时间
     */
-    @NotNull(message = "更新时间不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "更新时间不能为空", groups = {AddGroup.class})
    private Date modifyTime;
    /**
     * 更新者
     */
-    @NotBlank(message = "更新者不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "更新者不能为空", groups = {AddGroup.class})
    private String modifyBy;
    /**
     * 更新者code
     */
-    @NotBlank(message = "更新者code不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotBlank(message = "更新者code不能为空", groups = {AddGroup.class})
    private String modifyCode;
    /**
     * 删除状态  0：未删除 1：删除
     */
-    @NotNull(message = "删除状态  0：未删除 1：删除不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "删除状态  0：未删除 1：删除不能为空", groups = {AddGroup.class})
    private Integer deleteFlag;

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbOrderVo.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbOrderVo.java
@@ -85,7 +85,10 @@ public class DbOrderVo {
     */
    @ExcelProperty(value = "订单状态：0 已发布；1 已驳回；2 待支付；3 已接单；4 已完成；5 退款中；6 已退款")
    private Integer status;
+    /**
+     * 驳回理由
+     */
+    private String reasonsForRejection;
    /**
     * 创建人
     */
@@ -113,5 +116,17 @@ public class DbOrderVo {
     * 文件列表
     */
    private List<DbFileVo> fileVos;
+    /**
+     * 图片列表
+     */
+    private List<DbFileVo> picture;
+    /**
+     * 视频列表
+     */
+    private List<DbFileVo> video;
+    /**
+     * 语言列表
+     */
+    private List<DbFileVo> voice;
 }
--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/ReportFormsVo.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/ReportFormsVo.java
@@ -41,14 +41,9 @@ public class ReportFormsVo {
    @ExcelProperty(value = "累计成交金额")
    private String totalMoney;
    /**
-     * 已完成订单
+     * 已完成/未完成订单对比
     */
-    @ExcelProperty(value = "已完成订单")
+    @ExcelProperty(value = "已完成/未完成订单对比")
-    private Integer doneOrder;
+    private String contrastOrder;
-    /**
-     * 未完成订单
-     */
-    @ExcelProperty(value = "未完成订单")
-    private Integer noDoneOrder;
 }
--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbFileServiceImpl.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbFileServiceImpl.java
@@ -62,6 +62,7 @@ public class DbFileServiceImpl implements IDbFileService {
        Map<String, Object> params = bo.getParams();
        LambdaQueryWrapper<DbFile> lqw = Wrappers.lambdaQuery();
        lqw.eq(StringUtils.isNotBlank(bo.getServiceType()), DbFile::getServiceType, bo.getServiceType());
+        lqw.eq(StringUtils.isNotBlank(bo.getServiceId()), DbFile::getServiceId, bo.getServiceId());
        lqw.eq(StringUtils.isNotBlank(bo.getUrl()), DbFile::getUrl, bo.getUrl());
        lqw.eq(StringUtils.isNotBlank(bo.getFileType()), DbFile::getFileType, bo.getFileType());
        lqw.eq(bo.getSort() != null, DbFile::getSort, bo.getSort());

--- a/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
+++ b/yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java
@@ -48,6 +48,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 /**
 * 订单Service业务层处理
@@ -83,6 +84,18 @@ public class DbOrderServiceImpl implements IDbOrderService {
            .eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
            .eq(DbFile::getServiceId, dbOrderVo.getId())
            .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode()));
+        Map<String, List<DbFileVo>> groupMap = dbFileVos.stream().collect(Collectors.groupingBy(u -> u.getFileType()));
+        groupMap.forEach((k, v) -> {
+            if(k.equals("picture")){
+                dbOrderVo.setPicture(v);
+            }
+            if(k.equals("video")){
+                dbOrderVo.setPicture(v);
+            }
+            if(k.equals("voice")){
+                dbOrderVo.setPicture(v);
+            }
+        });
        dbOrderVo.setFileVos(dbFileVos);
        return dbOrderVo;
    }
@@ -138,7 +151,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
        boolean flag = baseMapper.insert(add) > 0;
        if (flag) {
            bo.setId(add.getId());
-            List<DbFile> files = BeanUtil.copyToList(bo.getFileBoList(), DbFile.class);
+            List<DbFile> files = BeanUtil.copyToList(bo.getFileVos(), DbFile.class);
            files.forEach(file->{
                file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
                file.setServiceId(add.getId());
@@ -280,12 +293,23 @@ public class DbOrderServiceImpl implements IDbOrderService {
            DbFileVo dbFileVo = fileMapper.selectVoOne(Wrappers.<DbFile>lambdaQuery()
                .eq(DbFile::getServiceId, record.getId())
                .eq(DbFile::getServiceType, FileEnumServiceType.ORDER.getServiceTyp())
-                .eq(DbFile::getSort, 1)
                .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode()));
            List<DbFileVo> vos = new ArrayList<>();
            if (ObjectUtils.isNotEmpty(dbFileVo)) {
                vos.add(dbFileVo);
            }
+            Map<String, List<DbFileVo>> groupMap = vos.stream().collect(Collectors.groupingBy(u -> u.getFileType()));
+            groupMap.forEach((k, v) -> {
+                if(k.equals("picture")){
+                    record.setPicture(v);
+                }
+                if(k.equals("video")){
+                    record.setPicture(v);
+                }
+                if(k.equals("voice")){
+                    record.setPicture(v);
+                }
+            });
            record.setFileVos(vos);
        });
        return TableDataInfo.build(result);

--- a/yongqi-xinrenli/src/main/resources/mapper/DbOrderMapper.xml
+++ b/yongqi-xinrenli/src/main/resources/mapper/DbOrderMapper.xml
@@ -86,18 +86,14 @@
                ( SELECT count(*) FROM db_order WHERE `status` = '4' ) AS accomplish,
                ( SELECT count(*) FROM db_order WHERE `status` = '2' ) AS reject,
                ( SELECT count(*) FROM db_order WHERE `status` = '6' ) AS refund,
-                ( SELECT SUM( actual_amount ) FROM db_order WHERE `status` = '4' ) AS totalMoney,
+                ( SELECT CONCAT(TRUNCATE(SUM( actual_amount )/10000,2),'万元') FROM db_order WHERE `status` = '4' ) AS totalMoney,
-                t.w AS doneOrder,
+                CONCAT(t.m,'-',t.w)  AS contrastOrder
-                t.m AS noDoneOrder
        FROM
            (
                SELECT
-                                t1.w /(
+                    concat(round(t1.w/(t1.w + t2.m)*100 ,2)  ,'%') AS w,
-                                t1.w + t2.m
+                    concat(round(t2.m /(t1.w + t2.m)*100 ,2)  ,'%') AS m
-                                )* 100+ '%' AS w,
-                                t2.m /(
-                                    t1.w + t2.m
-                                    )* 100+ '%' AS m
                FROM
                    (
                        SELECT