订单详情增加操作记录日志返回

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

@@ -30,8 +30,10 @@ import com.fs.erp.service.IErpOrderService;
 import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsDfAccount;
 import com.fs.his.domain.FsStoreOrderDf;
+import com.fs.his.domain.FsStoreOrderLogs;
 import com.fs.his.domain.FsUser;
 import com.fs.his.enums.FsStoreOrderLogEnum;
+import com.fs.his.mapper.FsStoreOrderMapper;
 import com.fs.his.param.FsStoreOrderSetErpPhoneParam;
 import com.fs.his.service.IFsDfAccountService;
 import com.fs.his.service.IFsExpressService;
@@ -146,6 +148,9 @@ public class FsStoreOrderScrmController extends BaseController {
     @Value("${cloud_host.company_name}")
     private String signProjectName;
 
+    @Autowired
+    private FsStoreOrderMapper fsStoreOrderMapper;
+
     private IErpOrderService getErpService(){
         //判断是否开启erp
         IErpOrderService erpOrderService = null;
@@ -688,6 +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<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/erp/service/impl/DfOrderServiceImpl.java

@@ -41,10 +41,7 @@ import com.fs.hisStore.domain.*;
 import com.fs.hisStore.enums.OrderInfoEnum;
 import com.fs.hisStore.enums.OrderLogEnum;
 import com.fs.hisStore.enums.ShipperCodeEnum;
-import com.fs.hisStore.mapper.FsStoreOrderItemScrmMapper;
-import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
-import com.fs.hisStore.mapper.FsStoreProductAttrValueScrmMapper;
-import com.fs.hisStore.mapper.FsStoreProductScrmMapper;
+import com.fs.hisStore.mapper.*;
 import com.fs.hisStore.param.FsStoreAfterSalesParam;
 import com.fs.hisStore.service.IFsExpressScrmService;
 import com.fs.hisStore.service.IFsStoreOrderScrmService;
@@ -167,6 +164,8 @@ public class DfOrderServiceImpl implements IErpOrderService {
 
     @Autowired
     private FsStoreProductAttrValueScrmMapper fsStoreProductAttrValueMapper;
+    @Autowired
+    private FsStoreOrderLogsScrmMapper fsStoreOrderLogsScrmMapper;
 
     @Override
     public ErpOrderResponse addOrder(ErpOrder order) {

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

@@ -1196,4 +1196,7 @@ public interface FsStoreOrderMapper
     FsStoreOrderAmountStatsVo selectFsStoreOrderAmountStats(FsStoreOrderAmountStatsQueryDto queryDto);
 
     List<FsStoreOrder> selectOutTimeOrderList(@Param("unPayTime")Integer unPayTime);
+
+    @Select("SELECT * FROM fs_store_order_logs_scrm WHERE order_id =#{orderId}")
+    List<FsStoreOrderLogs> selectScrmLogsList(String orderId);
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -1109,7 +1109,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             //添加记录
             orderStatusService.create(storeOrder.getId(), OrderLogEnum.CREATE_ORDER.getValue(),
                     OrderLogEnum.CREATE_ORDER.getDesc());
-
+            fsStoreOrderLogsService.create(storeOrder.getId(), OrderLogEnum.CREATE_ORDER.getValue(),
+                    OrderLogEnum.CREATE_ORDER.getDesc());
             //加入redis，24小时自动取消
             String redisKey = String.valueOf(StrUtil.format("{}{}",
                     StoreConstants.REDIS_ORDER_OUTTIME_UNPAY, storeOrder.getId()));
@@ -1890,7 +1891,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             //添加记录
             orderStatusService.create(storeOrder.getId(), OrderLogEnum.CREATE_ORDER.getValue(),
                     OrderLogEnum.CREATE_ORDER.getDesc());
-
+            fsStoreOrderLogsService.create(storeOrder.getId(), OrderLogEnum.CREATE_ORDER.getValue(),
+                    OrderLogEnum.CREATE_ORDER.getDesc());
             //加入redis，30分钟自动取消
             String redisKey = String.valueOf(StrUtil.format("{}{}",
                     StoreConstants.REDIS_ORDER_OUTTIME_UNPAY, storeOrder.getId()));
@@ -1934,6 +1936,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             fsStoreOrderMapper.updateFsStoreOrder(order);
             orderStatusService.create(order.getId(), OrderLogEnum.FINISH_ORDER.getValue(),
                     OrderLogEnum.FINISH_ORDER.getDesc());
+            fsStoreOrderLogsService.create(order.getId(), OrderLogEnum.FINISH_ORDER.getValue(),
+                    OrderLogEnum.FINISH_ORDER.getDesc());
             //写入公司余额 条件是只有全款订单才分，非全款后台导入
             if (order.getCompanyId() != null && order.getCompanyId() > 0 && order.getPayDelivery().compareTo(new BigDecimal(0)) == 0) {
                 if (order.getTuiMoneyStatus() == null || order.getTuiMoneyStatus() != 1) {
@@ -2081,6 +2085,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         //增加状态
         orderStatusService.create(order.getId(), OrderLogEnum.PAY_ORDER_SUCCESS.getValue(),
                 OrderLogEnum.PAY_ORDER_SUCCESS.getDesc());
+        fsStoreOrderLogsService.create(order.getId(), OrderLogEnum.PAY_ORDER_SUCCESS.getValue(),
+                OrderLogEnum.PAY_ORDER_SUCCESS.getDesc());
         FsStoreOrderScrm storeOrder = new FsStoreOrderScrm();
         storeOrder.setId(order.getId());
         storeOrder.setPaid(OrderInfoEnum.PAY_STATUS_1.getValue());