字段调整，bug修复

hx-jushuitan/src/main/java/com/fjhx/jushuitan/entity/jst/dto/JstOrderInfoSelectDto.java

@@ -19,6 +19,6 @@ public class JstOrderInfoSelectDto extends BaseSelectDto {
     private Date endTime;
     /**内部订单号**/
     private String oid;
-    /**平台订单状态**/
-    private String shopStatus;
+    /**订单状态**/
+    private String status;
 }

hx-jushuitan/src/main/java/com/fjhx/jushuitan/entity/jst/vo/JstOrderInfoVo.java

@@ -5,6 +5,7 @@ import com.fjhx.jushuitan.entity.jst.po.JstOrderInfo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -18,4 +19,5 @@ import java.util.List;
 public class JstOrderInfoVo extends JstOrderInfo {
     List<JstOrderDetailVo> items;
     List<JstOrderPayInfoVo> pays;
+    Date payDate;
 }

hx-jushuitan/src/main/java/com/fjhx/jushuitan/service/jst/impl/JstOrderInfoServiceImpl.java

@@ -5,11 +5,13 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.fjhx.jushuitan.entity.jst.po.JstOrderDetail;
 import com.fjhx.jushuitan.entity.jst.po.JstOrderInfo;
+import com.fjhx.jushuitan.entity.jst.po.JstOrderPayInfo;
 import com.fjhx.jushuitan.entity.jst.vo.JstOrderDetailVo;
 import com.fjhx.jushuitan.mapper.jst.JstOrderInfoMapper;
 import com.fjhx.jushuitan.service.jst.JstOrderDetailService;
 import com.fjhx.jushuitan.service.jst.JstOrderInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.jushuitan.service.jst.JstOrderPayInfoService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.jushuitan.entity.jst.vo.JstOrderInfoVo;
@@ -34,6 +36,8 @@ import java.util.Optional;
 public class JstOrderInfoServiceImpl extends ServiceImpl<JstOrderInfoMapper, JstOrderInfo> implements JstOrderInfoService {
     @Resource
     JstOrderDetailService jstOrderDetailService;
+    @Resource
+    JstOrderPayInfoService jstOrderPayInfoService;
 
     @Override
     public List<JstOrderInfoVo> getList(JstOrderInfoSelectDto dto) {
@@ -53,9 +57,18 @@ public class JstOrderInfoServiceImpl extends ServiceImpl<JstOrderInfoMapper, Jst
             wrapper.le("joi", JstOrderInfo::getCreated, DateUtil.endOfDay(dto.getEndTime()));
         }
         wrapper.like("joi", JstOrderInfo::getOid, dto.getOid());
-        wrapper.eq("joi", JstOrderInfo::getShopStatus, dto.getShopStatus());
+        wrapper.eq("joi", JstOrderInfo::getStatus, dto.getStatus());
         wrapper.orderByDesc("joi", JstOrderInfo::getId);
         Page<JstOrderInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<JstOrderInfoVo> records = page.getRecords();
+        if (CollectionUtil.isNotEmpty(records)){
+            records.forEach(item ->
+                jstOrderPayInfoService.lambdaQuery().eq(JstOrderPayInfo::getOrderId, item.getId()).list().stream().findFirst().ifPresent(jstOrderPayInfo ->
+                        item.setPayDate(jstOrderPayInfo.getPayDate())
+                )
+            );
+        }
+        page.setRecords(records);
         return page;
     }