2

src/main/java/com/fdkankan/manage/controller/CaseController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.manage.common.ResultCode;
@@ -48,6 +49,7 @@ public class CaseController {
         }
         caseEntity.setCreateTime(null);
         caseEntity.setUpdateTime(null);
+        caseEntity.setSysUserId(Integer.valueOf((String)StpUtil.getLoginId()));
         caseService.saveOrUpdate(caseEntity);
         return ResultData.ok();
     }

src/main/java/com/fdkankan/manage/entity/Case.java

@@ -84,4 +84,7 @@ public class Case implements Serializable {
     @TableField("language")
     private String language;
 
+    @TableField("sys_user_id")
+    private Integer sysUserId;
+
 }

src/main/java/com/fdkankan/manage/service/impl/CaseServiceImpl.java

@@ -6,10 +6,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.manage.entity.Case;
+import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.mapper.ICaseMapper;
 import com.fdkankan.manage.service.ICaseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.vo.request.CaseParam;
+import com.fdkankan.manage.vo.response.CaseVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +34,8 @@ import java.util.List;
 public class CaseServiceImpl extends ServiceImpl<ICaseMapper, Case> implements ICaseService {
 
 
+    @Autowired
+    ISysUserService sysUserService;
 
     @Override
     public Object pageList(CaseParam param) {
@@ -54,6 +59,21 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, Case> implements I
         wrapper.orderByDesc(Case::getCreateTime);
         Page<Case> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
 
-        return PageInfo.PageInfo(page);
+        List<CaseVo> voList = new ArrayList<>();
+        for (Case record : page.getRecords()) {
+            CaseVo vo = new CaseVo();
+            BeanUtils.copyProperties(record,vo);
+            SysUser sysuser = sysUserService.getById(record.getSysUserId());
+            if(sysuser != null){
+                vo.setSysUserName(sysuser.getNickName());
+            }
+            voList.add(vo);
+        }
+
+        Page<CaseVo> pageVo = new Page<>(param.getPageNum(), param.getPageSize());
+        pageVo.setRecords(voList);
+        pageVo.setTotal(page.getTotal());
+
+        return PageInfo.PageInfo(pageVo);
     }
 }

src/main/java/com/fdkankan/manage/service/impl/DataService.java

@@ -62,11 +62,11 @@ public class DataService implements IDataService {
     public OrderTotalVo orderTotal() {
         Long preMonthPowCount = dataMapper.preMonthAddCount("t_increment_order",2);
         Long preMonthDownCount = dataMapper.preMonthAddCount("t_download_order",2);
-       // Long preMonthPartCount = dataMapper.preMonthAddCount("t_increment_order",1);
+        Long preMonthPartCount = dataMapper.preMonthAddCount("t_order",3);
         OrderTotalVo totalVo = new OrderTotalVo();
         totalVo.setPreMonThPowCount(preMonthPowCount);
         totalVo.setPreMonThDownCount(preMonthDownCount);
-        totalVo.setPreMonThPartCount(0L);
+        totalVo.setPreMonThPartCount(preMonthPartCount);
 
         return totalVo;
     }

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -449,11 +449,14 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         wrapper2.lt(ScenePlus::getCreateTime,startTime);
         List<ScenePlus> list = scenePlusService.list(wrapper2);
         List<Long> plusIds = list.stream().map(ScenePlus::getId).collect(Collectors.toList());
+        long count = 0L;
+        if(plusIds.size() >0){
+            LambdaQueryWrapper<ScenePlusExt> wrapper3 = new LambdaQueryWrapper<>();
+            wrapper3.in(ScenePlusExt::getPlusId,plusIds);
+            wrapper3.eq(ScenePlusExt::getIsObj,1);
+            count = scenePlusExtService.count(wrapper3);
 
-        LambdaQueryWrapper<ScenePlusExt> wrapper3 = new LambdaQueryWrapper<>();
-        wrapper3.in(ScenePlusExt::getPlusId,plusIds);
-        wrapper3.eq(ScenePlusExt::getIsObj,1);
-        long count = scenePlusExtService.count(wrapper3);
+        }
         return this.count(wrapper) + count;
     }
 }

src/main/java/com/fdkankan/manage/vo/response/CaseVo.java

@@ -0,0 +1,9 @@
+package com.fdkankan.manage.vo.response;
+
+import com.fdkankan.manage.entity.Case;
+import lombok.Data;
+
+@Data
+public class CaseVo extends Case {
+    private String sysUserName;
+}

src/main/resources/mapper/manage/DataMapper.xml

@@ -58,11 +58,17 @@
         <if test="type == 2">
             and pay_status = 1
         </if>
+        <if test="type == 3">
+            and payment_status = 'paid'
+        </if>
     </sql>
     <sql id="tbWhereSql">
         <if test="tb == 't_increment_order' || tb == 't_download_order'">
             and pay_status = 1
         </if>
+        <if test="tb == 't_order' ">
+            and payment_status = 'paid'
+        </if>
     </sql>
 
     <select id="totalUserCount" resultType="java.lang.Long">