fix:订单日志

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -683,7 +683,7 @@ public class FsStoreOrderScrmController extends BaseController {
         List<FsStoreOrderItemScrm> items = orderItemService.selectFsStoreOrderItemList(itemMap);
         FsStoreOrderStatusScrm statusMap = new FsStoreOrderStatusScrm();
         statusMap.setOrderId(order.getId());
-        List<FsStoreOrderStatusScrm> logs = orderStatusService.selectFsStoreOrderStatusList(statusMap);
+//        List<FsStoreOrderStatusScrm> logs = orderStatusService.selectFsStoreOrderStatusList(statusMap);
         List<FsStorePaymentScrm> payments=paymentService.selectFsStorePaymentByOrderId(order.getId());
         List<CompanyStoreOrderMoneyLogsVO> tuiMoneyLogs=new ArrayList<>();
         if(order.getCompanyId()!=null){
@@ -693,18 +693,18 @@ public class FsStoreOrderScrmController extends BaseController {
             tuiMoneyLogs=moneyLogsService.selectCompanyStoreOrderMoneyLogsList(moneyLogsMap);
         }
 
-        List<FsStoreOrderLogs> logsList = fsStoreOrderMapper.selectScrmLogsList(id.toString());
-        logsList.stream()
-                .map(logItem -> {
-                    FsStoreOrderStatusScrm scrm = new FsStoreOrderStatusScrm();
-                    scrm.setId(logItem.getLogsId());
-                    scrm.setOrderId(logItem.getOrderId());
-                    scrm.setChangeType(logItem.getChangeType());
-                    scrm.setChangeMessage(logItem.getChangeMessage());
-                    scrm.setChangeTime(logItem.getChangeTime());
-                    return scrm;
-                }).forEach(logs::add);
-        logs.sort(Comparator.comparing(FsStoreOrderStatusScrm::getChangeTime));
+        List<FsStoreOrderStatusScrm> logs = fsStoreOrderMapper.selectScrmLogsList(id.toString());
+//        logsList.stream()
+//                .map(logItem -> {
+//                    FsStoreOrderStatusScrm scrm = new FsStoreOrderStatusScrm();
+//                    scrm.setId(logItem.getLogsId());
+//                    scrm.setOrderId(logItem.getOrderId());
+//                    scrm.setChangeType(logItem.getChangeType());
+//                    scrm.setChangeMessage(logItem.getChangeMessage());
+//                    scrm.setChangeTime(logItem.getChangeTime());
+//                    return scrm;
+//                }).forEach(logs::add);
+//        logs.sort(Comparator.comparing(FsStoreOrderStatusScrm::getChangeTime));
         List<FsStoreOrderAuditLogVO> auditLogs = orderAuditLogService.selectStoreOrderAuditLogVOByOrderId(order.getId());
         return R.ok().put("order", order).put("items", items).put("logs", logs).put("user", user).put("payments",payments).put("tuiMoneyLogs",tuiMoneyLogs)
                 .put("auditLogs",auditLogs);

fs-service/src/main/java/com/fs/his/mapper/FsStoreOrderMapper.java

@@ -18,6 +18,7 @@ import com.fs.his.dto.FsStoreOrderAmountStatsQueryDto;
 import com.fs.his.param.*;
 import com.fs.his.vo.*;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
+import com.fs.hisStore.domain.FsStoreOrderStatusScrm;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
@@ -1197,6 +1198,6 @@ public interface FsStoreOrderMapper
 
     List<FsStoreOrder> selectOutTimeOrderList(@Param("unPayTime")Integer unPayTime);
 
-    @Select("SELECT * FROM fs_store_order_logs_scrm WHERE order_id =#{orderId}")
-    List<FsStoreOrderLogs> selectScrmLogsList(String orderId);
+//    @Select("SELECT * FROM fs_store_order_logs_scrm WHERE order_id =#{orderId} order by change_time desc")
+    List<FsStoreOrderStatusScrm> selectScrmLogsList(String orderId);
 }

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -2155,5 +2155,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFsStoreOrderVo"/>
         where is_del = 0 and status = 1 and NOW() &gt; DATE_ADD(create_time, INTERVAL ${unPayTime} MINUTE)
     </select>
+    <select id="selectScrmLogsList" resultType="com.fs.hisStore.domain.FsStoreOrderStatusScrm">
+        SELECT logs_id as id,order_id,change_type,change_time,change_message,change_time
+        FROM fs_store_order_logs_scrm
+        WHERE order_id =#{orderId} order by change_time asc
+    </select>
 
 </mapper>