Merge remote-tracking branch 'origin/master'

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbConfigController.java

+package com.yongqi.xinrenli.controller;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.yongqi.common.annotation.RepeatSubmit;
+import com.yongqi.common.annotation.Log;
+import com.yongqi.common.core.controller.BaseController;
+import com.yongqi.common.core.domain.PageQuery;
+import com.yongqi.common.core.domain.R;
+import com.yongqi.common.core.validate.AddGroup;
+import com.yongqi.common.core.validate.EditGroup;
+import com.yongqi.common.enums.BusinessType;
+import com.yongqi.common.utils.poi.ExcelUtil;
+import com.yongqi.xinrenli.domain.vo.DbConfigVo;
+import com.yongqi.xinrenli.domain.bo.DbConfigBo;
+import com.yongqi.xinrenli.service.IDbConfigService;
+import com.yongqi.common.core.page.TableDataInfo;
+
+/**
+ * 系统配置
+ *
+ * @author zyf
+ * @date 2023-04-21
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/xinrenli/config")
+public class DbConfigController extends BaseController {
+
+    private final IDbConfigService iDbConfigService;
+
+    /**
+     * 查询系统配置列表
+     */
+    @SaCheckPermission("xinrenli:config:list")
+    @GetMapping("/list")
+    public TableDataInfo<DbConfigVo> list(DbConfigBo bo, PageQuery pageQuery) {
+        return iDbConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出系统配置列表
+     */
+    @SaCheckPermission("xinrenli:config:export")
+    @Log(title = "系统配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DbConfigBo bo, HttpServletResponse response) {
+        List<DbConfigVo> list = iDbConfigService.queryList(bo);
+        ExcelUtil.exportExcel(list, "系统配置", DbConfigVo.class, response);
+    }
+
+    /**
+     * 获取系统配置详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("xinrenli:config:query")
+    @GetMapping("/{id}")
+    public R<DbConfigVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(iDbConfigService.queryById(id));
+    }
+
+    /**
+     * 新增系统配置
+     */
+    @SaCheckPermission("xinrenli:config:add")
+    @Log(title = "系统配置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/add")
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DbConfigBo bo) {
+        return toAjax(iDbConfigService.insertByBo(bo));
+    }
+
+    /**
+     * 修改系统配置
+     */
+    @SaCheckPermission("xinrenli:config:edit")
+    @Log(title = "系统配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/edit")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbConfigBo bo) {
+        return toAjax(iDbConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 删除系统配置
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("xinrenli:config:remove")
+    @Log(title = "系统配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("remove/")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @RequestParam Long[] ids) {
+        return toAjax(iDbConfigService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/DbConfig.java

+package com.yongqi.xinrenli.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.yongqi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 系统配置对象 db_config
+ *
+ * @author zyf
+ * @date 2023-04-21
+ */
+@Data
+@TableName("db_config")
+public class DbConfig {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 系统头像
+     */
+    private String systemHeadUrl;
+    /**
+     * 需求广场最低金额
+     */
+    private BigDecimal minAmount;
+    /**
+     * 客服热线
+     */
+    private String hotline;
+
+}

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbConfigBo.java

+package com.yongqi.xinrenli.domain.bo;
+
+import com.yongqi.common.core.domain.BaseEntity;
+import com.yongqi.common.core.validate.AddGroup;
+import com.yongqi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.math.BigDecimal;
+
+/**
+ * 系统配置业务对象 db_config
+ *
+ * @author zyf
+ * @date 2023-04-21
+ */
+
+@Data
+public class DbConfigBo {
+
+    /**
+     *
+     */
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 系统头像
+     */
+    private String systemHeadUrl;
+
+    /**
+     * 需求广场最低金额
+     */
+//    @NotNull(message = "需求广场最低金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal minAmount;
+
+    /**
+     * 客服热线
+     */
+    @NotBlank(message = "客服热线不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String hotline;
+
+
+}

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbConfigVo.java

+package com.yongqi.xinrenli.domain.vo;
+
+import java.math.BigDecimal;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yongqi.common.annotation.ExcelDictFormat;
+import com.yongqi.common.convert.ExcelDictConvert;
+import lombok.Data;
+
+
+/**
+ * 系统配置视图对象 db_config
+ *
+ * @author zyf
+ * @date 2023-04-21
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class DbConfigVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Long id;
+
+    /**
+     * 系统头像
+     */
+    @ExcelProperty(value = "系统头像")
+    private String systemHeadUrl;
+
+    /**
+     * 需求广场最低金额
+     */
+    @ExcelProperty(value = "需求广场最低金额")
+    private BigDecimal minAmount;
+
+    /**
+     * 客服热线
+     */
+    @ExcelProperty(value = "客服热线")
+    private String hotline;
+
+
+}

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbOrderVo.java

@@ -36,7 +36,7 @@ public class DbOrderVo {
     /**
      * 标题
      */
-    @ExcelProperty(value = "标题")
+    @ExcelProperty(value = "公司名称")
     private String title;
 
     /**
@@ -86,7 +86,7 @@ public class DbOrderVo {
     /**
      * 管理员备注
      */
-    @ExcelProperty(value = "退款金额")
+    @ExcelProperty(value = "管理员备注")
     private String adminRemark;
     /**
      * 备注说明
@@ -124,7 +124,7 @@ public class DbOrderVo {
     /**
      * 修改时间
      */
-    @ExcelProperty(value = "修改时间")
+//    @ExcelProperty(value = "修改时间")
     private Date modifyTime;
 
     /**

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/ReportFormsVo.java

@@ -57,4 +57,9 @@ public class ReportFormsVo {
      * 已完成和未完成总量
      */
     private Integer sum;
+
+    /**
+     * 已完成订单量（根据日期筛选的）
+     */
+    private Integer completed;
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbConfigMapper.java

+package com.yongqi.xinrenli.mapper;
+
+import com.yongqi.xinrenli.domain.DbConfig;
+import com.yongqi.xinrenli.domain.vo.DbConfigVo;
+import com.yongqi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 系统配置Mapper接口
+ *
+ * @author zyf
+ * @date 2023-04-21
+ */
+public interface DbConfigMapper extends BaseMapperPlus<DbConfigMapper, DbConfig, DbConfigVo> {
+
+}

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbConfigService.java

+package com.yongqi.xinrenli.service;
+
+import com.yongqi.xinrenli.domain.DbConfig;
+import com.yongqi.xinrenli.domain.vo.DbConfigVo;
+import com.yongqi.xinrenli.domain.bo.DbConfigBo;
+import com.yongqi.common.core.page.TableDataInfo;
+import com.yongqi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 系统配置Service接口
+ *
+ * @author zyf
+ * @date 2023-04-21
+ */
+public interface IDbConfigService {
+
+    /**
+     * 查询系统配置
+     */
+    DbConfigVo queryById(Long id);
+
+    /**
+     * 查询系统配置列表
+     */
+    TableDataInfo<DbConfigVo> queryPageList(DbConfigBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询系统配置列表
+     */
+    List<DbConfigVo> queryList(DbConfigBo bo);
+
+    /**
+     * 新增系统配置
+     */
+    Boolean insertByBo(DbConfigBo bo);
+
+    /**
+     * 修改系统配置
+     */
+    Boolean updateByBo(DbConfigBo bo);
+
+    /**
+     * 校验并批量删除系统配置信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbConfigServiceImpl.java

+package com.yongqi.xinrenli.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yongqi.common.core.page.TableDataInfo;
+import com.yongqi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yongqi.common.utils.StringUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.yongqi.xinrenli.domain.bo.DbConfigBo;
+import com.yongqi.xinrenli.domain.vo.DbConfigVo;
+import com.yongqi.xinrenli.domain.DbConfig;
+import com.yongqi.xinrenli.mapper.DbConfigMapper;
+import com.yongqi.xinrenli.service.IDbConfigService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 系统配置Service业务层处理
+ *
+ * @author zyf
+ * @date 2023-04-21
+ */
+@RequiredArgsConstructor
+@Service
+public class DbConfigServiceImpl implements IDbConfigService {
+
+    private final DbConfigMapper baseMapper;
+
+    /**
+     * 查询系统配置
+     */
+    @Override
+    public DbConfigVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询系统配置列表
+     */
+    @Override
+    public TableDataInfo<DbConfigVo> queryPageList(DbConfigBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<DbConfig> lqw = buildQueryWrapper(bo);
+        Page<DbConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询系统配置列表
+     */
+    @Override
+    public List<DbConfigVo> queryList(DbConfigBo bo) {
+        LambdaQueryWrapper<DbConfig> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<DbConfig> buildQueryWrapper(DbConfigBo bo) {
+        LambdaQueryWrapper<DbConfig> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getSystemHeadUrl()), DbConfig::getSystemHeadUrl, bo.getSystemHeadUrl());
+        lqw.eq(bo.getMinAmount() != null, DbConfig::getMinAmount, bo.getMinAmount());
+        lqw.eq(StringUtils.isNotBlank(bo.getHotline()), DbConfig::getHotline, bo.getHotline());
+        return lqw;
+    }
+
+    /**
+     * 新增系统配置
+     */
+    @Override
+    public Boolean insertByBo(DbConfigBo bo) {
+        DbConfig add = BeanUtil.toBean(bo, DbConfig.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改系统配置
+     */
+    @Override
+    public Boolean updateByBo(DbConfigBo bo) {
+        DbConfig update = BeanUtil.toBean(bo, DbConfig.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(DbConfig entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除系统配置
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbOrderServiceImpl.java

@@ -630,6 +630,11 @@ public class DbOrderServiceImpl implements IDbOrderService {
         }
         // 修改订单
         order.setRefundAmount(refundAmount);
+        if (order.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
+            order.setStatus(OrderStatusEnum.REFUNDED.getCode());
+            baseMapper.updateById(order);
+            return R.ok("退款成功");
+        }
         baseMapper.updateById(order);
         // 组装退款参数
         WxPayRefundRequest request = new WxPayRefundRequest();

yongqi-xinrenli/src/main/resources/mapper/DbConfigMapper.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="com.yongqi.xinrenli.mapper.DbConfigMapper">
+
+    <resultMap type="com.yongqi.xinrenli.domain.DbConfig" id="DbConfigResult">
+        <result property="id" column="id"/>
+        <result property="systemHeadUrl" column="system_head_url"/>
+        <result property="minAmount" column="min_amount"/>
+        <result property="hotline" column="hotline"/>
+    </resultMap>
+
+
+</mapper>

yongqi-xinrenli/src/main/resources/mapper/DbOrderMapper.xml

@@ -113,13 +113,14 @@
     <select id="reportForms" resultType="com.yongqi.xinrenli.domain.vo.ReportFormsVo">
         SELECT
             ( SELECT count(1) FROM db_order WHERE `status` = '4'
-            <if test="startTime !=null">
-               and modify_time &gt;= #{startTime}
+            <if test="startTime !=null and startTime !=''">
+               and date_format(modify_time,'%Y-%m-%d') &gt;= #{startTime}
             </if>
-            <if test="endTime != null">
-               and modify_time &lt;= #{endTime}
+            <if test="endTime != null and endTime !=''">
+               and date_format(modify_time,'%Y-%m-%d') &lt;= #{endTime}
             </if>
-            ) AS accomplish,
+            ) AS completed,
+            ( SELECT count(1) FROM db_order WHERE `status` = '4') AS accomplish,
             ( SELECT count(1) FROM db_order WHERE `status` = '1' ) AS reject,
             ( SELECT count(1) FROM db_order WHERE `status` = '6' ) AS refund,
             ( SELECT TRUNCATE ( SUM( pay_amount )/ 10000, 2 ) FROM db_order WHERE `status` = '4' ) AS money,