Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yongqi-admin/src/main/resources/application-dev.yml
#	yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbFileController.java

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

@@ -67,6 +67,14 @@ public class DbOrderController extends BaseController {
     }
     }
 
 
     /**
     /**
+    @SaCheckPermission("xinrenli:order:listUser")
+    @GetMapping("/listUser")
+    public TableDataInfo<DbOrderVo> listUser(DbOrderBo bo, PageQuery pageQuery) {
+        LoginUser loginUser = getLoginUser();
+        bo.setUserId(loginUser.getUserId());
+        return iDbOrderService.homeList(bo, pageQuery);
+    }
+    /**
      * 用户需求广场
      * 用户需求广场
      */
      */
     @SaCheckPermission("xinrenli:order:userDemandSquare")
     @SaCheckPermission("xinrenli:order:userDemandSquare")

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 
 import java.util.Date;
 import java.util.Date;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.util.List;
 
 
 /**
 /**
  * 订单对象 db_order
  * 订单对象 db_order
@@ -117,4 +118,6 @@ public class DbOrder {
      */
      */
     private Integer deleteStatus;
     private Integer deleteStatus;
 
 
+
+
 }
 }

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

@@ -134,4 +134,5 @@ public class DbOrderBo extends BaseEntity {
      */
      */
     private List<DbFileBo> voiceList;
     private List<DbFileBo> voiceList;
 
 
+    private  List<String> statusList;
 }
 }

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

@@ -73,7 +73,14 @@ public class DbOrderVo {
      */
      */
     @ExcelProperty(value = "成交金额")
     @ExcelProperty(value = "成交金额")
     private BigDecimal actualAmount;
     private BigDecimal actualAmount;
-
+    /**
+     * 支付金额
+     */
+    private BigDecimal payAmount;
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmount;
     /**
     /**
      * 备注说明
      * 备注说明
      */
      */

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

@@ -2,6 +2,7 @@ package com.yongqi.xinrenli.service.impl;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.yongqi.common.utils.StringUtils;
 import com.yongqi.common.utils.StringUtils;
 import com.yongqi.common.core.page.TableDataInfo;
 import com.yongqi.common.core.page.TableDataInfo;
 import com.yongqi.common.core.domain.PageQuery;
 import com.yongqi.common.core.domain.PageQuery;
@@ -103,17 +104,21 @@ public class DbArticleServiceImpl implements IDbArticleService {
         boolean flag = baseMapper.insert(add) > 0;
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
         if (flag) {
             bo.setId(add.getId());
             bo.setId(add.getId());
-            fileMapper.delete(Wrappers.<DbFile>lambdaQuery()
-                .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode())
-                .eq(DbFile::getServiceType, FileEnumServiceType.ARTICLE.getServiceTyp())
-                .eq(DbFile::getServiceId, bo.getId())
-            );
             List<DbFile> files = BeanUtil.copyToList(bo.getFileVos(), DbFile.class);
             List<DbFile> files = BeanUtil.copyToList(bo.getFileVos(), DbFile.class);
-            files.forEach(file -> {
-                file.setServiceId(bo.getId());
-                file.setServiceType(FileEnumServiceType.ARTICLE.getServiceTyp());
-                file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
-            });
+
+            if(ObjectUtils.isNotEmpty(files)){
+                fileMapper.delete(Wrappers.<DbFile>lambdaQuery()
+                    .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode())
+                    .eq(DbFile::getServiceType, FileEnumServiceType.ARTICLE.getServiceTyp())
+                    .eq(DbFile::getServiceId, bo.getId())
+                );
+                files.forEach(file -> {
+                    file.setServiceId(bo.getId());
+                    file.setServiceType(FileEnumServiceType.ARTICLE.getServiceTyp());
+                    file.setDeleteStatus(DeleteStatusEnum.OK.getCode());
+                });
+            }
+
             fileMapper.insertBatch(files);
             fileMapper.insertBatch(files);
         }
         }
         return flag;
         return flag;

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

@@ -84,10 +84,10 @@ public class DbOrderServiceImpl implements IDbOrderService {
                 dbOrderVo.setPictureList(v);
                 dbOrderVo.setPictureList(v);
             }
             }
             if (k.equals("video")) {
             if (k.equals("video")) {
-                dbOrderVo.setPictureList(v);
+                dbOrderVo.setVideoList(v);
             }
             }
             if (k.equals("voice")) {
             if (k.equals("voice")) {
-                dbOrderVo.setPictureList(v);
+                dbOrderVo.setVoiceList(v);
             }
             }
         });
         });
         dbOrderVo.setFileVos(dbFileVos);
         dbOrderVo.setFileVos(dbFileVos);
@@ -318,6 +318,7 @@ public class DbOrderServiceImpl implements IDbOrderService {
         lqw.eq(StringUtils.isNotBlank(bo.getModifyUser()), DbOrder::getModifyUser, bo.getModifyUser());
         lqw.eq(StringUtils.isNotBlank(bo.getModifyUser()), DbOrder::getModifyUser, bo.getModifyUser());
         lqw.eq(bo.getModifyTime() != null, DbOrder::getModifyTime, bo.getModifyTime());
         lqw.eq(bo.getModifyTime() != null, DbOrder::getModifyTime, bo.getModifyTime());
         lqw.eq(bo.getDeleteStatus() != null, DbOrder::getDeleteStatus, bo.getDeleteStatus());
         lqw.eq(bo.getDeleteStatus() != null, DbOrder::getDeleteStatus, bo.getDeleteStatus());
+        lqw.in(bo.getStatusList() != null, DbOrder::getStatus, bo.getStatusList());
         return lqw;
         return lqw;
     }
     }
 
 
@@ -346,17 +347,16 @@ public class DbOrderServiceImpl implements IDbOrderService {
                     record.setPictureList(v);
                     record.setPictureList(v);
                 }
                 }
                 if (k.equals("video")) {
                 if (k.equals("video")) {
-                    record.setPictureList(v);
+                    record.setVideoList(v);
                 }
                 }
                 if (k.equals("voice")) {
                 if (k.equals("voice")) {
-                    record.setPictureList(v);
+                    record.setVoiceList(v);
                 }
                 }
             });
             });
             record.setFileVos(dbFileVo);
             record.setFileVos(dbFileVo);
         });
         });
         return TableDataInfo.build(result);
         return TableDataInfo.build(result);
     }
     }
-
     /**
     /**
      * 下单
      * 下单
      *
      *