提交 新增两个job 邀请折扣 已接但变成已完成

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

@@ -41,7 +41,7 @@ public class DbArticleVo {
     /**
      * 创建人
      */
-    @ExcelProperty(value = "创建人")
+    //@ExcelProperty(value = "创建人")
     private String createUser;
 
     /**
@@ -53,7 +53,7 @@ public class DbArticleVo {
     /**
      * 修改人
      */
-    @ExcelProperty(value = "修改人")
+    //@ExcelProperty(value = "修改人")
     private String modifyUser;
 
     /**

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

@@ -76,10 +76,12 @@ public class DbOrderVo {
     /**
      * 支付金额
      */
+    @ExcelProperty(value = "支付金额")
     private BigDecimal payAmount;
     /**
      * 退款金额
      */
+    @ExcelProperty(value = "退款金额")
     private BigDecimal refundAmount;
     /**
      * 备注说明
@@ -100,17 +102,18 @@ public class DbOrderVo {
     /**
      * 驳回理由
      */
+    @ExcelProperty(value = "驳回理由")
     private String reasonsForRejection;
     /**
      * 创建人
      */
-    @ExcelProperty(value = "创建人")
+    //@ExcelProperty(value = "创建人")
     private String createUser;
 
     /**
      * 修改人
      */
-    @ExcelProperty(value = "修改人")
+    //@ExcelProperty(value = "修改人")
     private String modifyUser;
 
     /**

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

@@ -14,6 +14,7 @@ import com.yongqi.xinrenli.domain.vo.ReportFormsVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 订单Mapper接口
@@ -39,4 +40,5 @@ public interface DbOrderMapper extends BaseMapperPlus<DbOrderMapper, DbOrder, Db
     Integer unpaidJob();
 
     void completedJob();
+
 }

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

@@ -45,6 +45,7 @@ public class DbArticleServiceImpl implements IDbArticleService {
     private final DbUserCommentMapper commentMapper;
 
     private final DbFileMapper fileMapper;
+
     /**
      * 查询文章
      */
@@ -86,9 +87,9 @@ public class DbArticleServiceImpl implements IDbArticleService {
         });
 
         for (DbArticleVo article : result.getRecords()) {
-            String n =article.getContent();
-            n = n.replace("<p>","");
-            n = n.replace("</p>","");
+            String n = article.getContent();
+            n = n.replace("<p>", "");
+            n = n.replace("</p>", "");
             article.setContent(n);
         }
 
@@ -101,7 +102,14 @@ public class DbArticleServiceImpl implements IDbArticleService {
     @Override
     public List<DbArticleVo> queryList(DbArticleBo bo) {
         LambdaQueryWrapper<DbArticle> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<DbArticleVo> list = baseMapper.selectVoList(lqw);
+        for (DbArticleVo article : list) {
+            String n = article.getContent();
+            n = n.replace("<p>", "");
+            n = n.replace("</p>", "");
+            article.setContent(n);
+        }
+        return list;
     }
 
     private LambdaQueryWrapper<DbArticle> buildQueryWrapper(DbArticleBo bo) {
@@ -128,7 +136,7 @@ public class DbArticleServiceImpl implements IDbArticleService {
             bo.setId(add.getId());
             List<DbFile> files = BeanUtil.copyToList(bo.getFileVos(), DbFile.class);
 
-            if(ObjectUtils.isNotEmpty(files)){
+            if (ObjectUtils.isNotEmpty(files)) {
                 fileMapper.delete(Wrappers.<DbFile>lambdaQuery()
                     .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode())
                     .eq(DbFile::getServiceType, FileEnumServiceType.ARTICLE.getServiceTyp())
@@ -153,11 +161,11 @@ public class DbArticleServiceImpl implements IDbArticleService {
     public Boolean updateByBo(DbArticleBo bo) {
         DbArticle update = BeanUtil.toBean(bo, DbArticle.class);
         validEntityBeforeSave(update);
-        boolean flag =baseMapper.updateById(update) > 0;
+        boolean flag = baseMapper.updateById(update) > 0;
         if (flag) {
             bo.setId(update.getId());
             List<DbFile> files = BeanUtil.copyToList(bo.getFileVos(), DbFile.class);
-            if(ObjectUtils.isNotEmpty(files)){
+            if (ObjectUtils.isNotEmpty(files)) {
                 fileMapper.delete(Wrappers.<DbFile>lambdaQuery()
                     .eq(DbFile::getDeleteStatus, DeleteStatusEnum.OK.getCode())
                     .eq(DbFile::getServiceType, FileEnumServiceType.ARTICLE.getServiceTyp())

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

@@ -112,28 +112,28 @@ public class DbOrderServiceImpl implements IDbOrderService {
         LambdaQueryWrapper<DbOrder> lqw = buildQueryWrapper(bo);
         List<DbOrderVo> list = baseMapper.selectVoList(lqw);
         list.stream().forEach(DbOrderVo -> {
-            if ("0".equals(DbOrderVo.getStatus())) {
+            if (0==DbOrderVo.getStatus()) {
                 DbOrderVo.setStatusName("已发布");
             }
-            if ("1".equals(DbOrderVo.getStatus())) {
+            if (1==DbOrderVo.getStatus()) {
                 DbOrderVo.setStatusName("已驳回");
             }
-            if ("2".equals(DbOrderVo.getStatus())) {
+            if (2==DbOrderVo.getStatus()) {
                 DbOrderVo.setStatusName("待支付");
             }
-            if ("3".equals(DbOrderVo.getStatus())) {
+            if (3==DbOrderVo.getStatus()) {
                 DbOrderVo.setStatusName("已接单");
             }
-            if ("4".equals(DbOrderVo.getStatus())) {
+            if (4==DbOrderVo.getStatus()) {
                 DbOrderVo.setStatusName("已完成");
             }
-            if ("5".equals(DbOrderVo.getStatus())) {
+            if (5==DbOrderVo.getStatus()) {
                 DbOrderVo.setStatusName("退款中");
             }
-            if ("6".equals(DbOrderVo.getStatus())) {
+            if (6==DbOrderVo.getStatus()) {
                 DbOrderVo.setStatusName("已退款");
             }
-            if ("7".equals(DbOrderVo.getStatus())) {
+            if (7==DbOrderVo.getStatus()) {
                 DbOrderVo.setStatusName("已取消");
             }
         });
@@ -298,6 +298,8 @@ public class DbOrderServiceImpl implements IDbOrderService {
         lqw.ge(DbOrder::getActualAmount, minamount);
         lqw.eq(DbOrder::getDeleteStatus, 0);
         lqw.eq(DbOrder::getStatus, 4);
+        pageQuery.setIsAsc("desc");
+        pageQuery.setOrderByColumn("modifyTime");
         Page<DbOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         result.getRecords().forEach(record -> {
             DbFileVo dbFileVo = fileMapper.selectVoOne(Wrappers.<DbFile>lambdaQuery()

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

@@ -102,7 +102,7 @@
                         FROM
                             db_order
                         WHERE
-                            `status` = '3') t1,
+                            `status` not in (0,4)) t1,
                     ( SELECT count(*) AS m FROM db_order WHERE `status` = '4' ) t2
             ) t
 
@@ -113,8 +113,8 @@
                 ( SELECT count(*) FROM db_order WHERE `status` = '1' ) AS reject,
                 ( SELECT count(*) FROM db_order WHERE `status` = '6' ) AS refund,
                 ( SELECT TRUNCATE ( SUM( actual_amount )/ 10000, 2 ) FROM db_order WHERE `status` = '4' ) AS totalMoney,
-                (SELECT count(*) AS w FROM db_order WHERE `status` = '3') AS NoAccomplish ,
-                (( SELECT count(*) FROM db_order WHERE `status` = '4' )+(SELECT count(*) AS w FROM db_order WHERE `status` IN ( 2, 6 ))) as sum
+                (SELECT count(*) AS w FROM db_order WHERE `status` not in (0,4)) AS NoAccomplish ,
+                (select count(*) from db_order) as sum
         FROM
             DUAL
     </select>
@@ -124,4 +124,5 @@
     <update id="completedJob">
         update db_order set status='4',modify_time=NOW() where status='3' and DATE_ADD(repair_time, INTERVAL 2 DAY)>=NOW()
     </update>
+
 </mapper>