FIX: 修改物流

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyMoneyLogsServiceImpl.java

@@ -2,10 +2,14 @@ package com.fs.company.service.impl;
 
 import java.math.BigDecimal;
 import java.util.List;
+
+import cn.hutool.core.util.ObjectUtil;
 import com.fs.common.utils.DateUtils;
 import com.fs.company.param.CompanyMoneyLogsParam;
 import com.fs.company.param.CompanyStoreOrderMoneyLogsListParam;
 import com.fs.company.vo.*;
+import com.fs.live.domain.LiveOrder;
+import com.fs.live.mapper.LiveOrderMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.company.mapper.CompanyMoneyLogsMapper;
@@ -24,6 +28,9 @@ public class CompanyMoneyLogsServiceImpl implements ICompanyMoneyLogsService
     @Autowired
     private CompanyMoneyLogsMapper companyMoneyLogsMapper;
 
+    @Autowired
+    private LiveOrderMapper liveOrderMapper;
+
     /**
      * 查询企业账户记录
      *
@@ -119,17 +126,47 @@ public class CompanyMoneyLogsServiceImpl implements ICompanyMoneyLogsService
 
     @Override
     public List<CompanyMoneyLogsExportVO> selectCompanyMoneyLogsExportVOList(CompanyMoneyLogs companyMoneyLogs) {
-        return companyMoneyLogsMapper.selectCompanyMoneyLogsExportVOList(companyMoneyLogs);
+        List<CompanyMoneyLogsExportVO> companyMoneyLogsExportVOS = companyMoneyLogsMapper.selectCompanyMoneyLogsExportVOList(companyMoneyLogs);
+        for (CompanyMoneyLogsExportVO item : companyMoneyLogsExportVOS) {
+            // 如果是直播订单
+            if(ObjectUtil.equal(item.getType(),1)) {
+                String orderCode = liveOrderMapper.selectLiveOrderCodeByOrderId(item.getBusinessId());
+                if(ObjectUtil.isNotNull(orderCode)) {
+                    item.setOrderCode(orderCode);
+                }
+            }
+        }
+        return companyMoneyLogsExportVOS;
     }
 
     @Override
     public List<CompanyMoneyLogsExport1VO> selectCompanyMoneyLogsExport1VOList(CompanyMoneyLogs companyMoneyLogs) {
-        return companyMoneyLogsMapper.selectCompanyMoneyLogsExport1VOList(companyMoneyLogs);
+        List<CompanyMoneyLogsExport1VO> companyMoneyLogsExport1VOS = companyMoneyLogsMapper.selectCompanyMoneyLogsExport1VOList(companyMoneyLogs);
+        for (CompanyMoneyLogsExport1VO item : companyMoneyLogsExport1VOS) {
+            // 如果是直播订单
+            if(ObjectUtil.equal(item.getType(),1)) {
+                String orderCode = liveOrderMapper.selectLiveOrderCodeByOrderId(item.getBusinessId());
+                if(ObjectUtil.isNotNull(orderCode)) {
+                    item.setOrderCode(orderCode);
+                }
+            }
+        }
+        return companyMoneyLogsExport1VOS;
     }
 
     @Override
     public List<CompanyMoneyLogsExport2VO> selectCompanyMoneyLogsExport2VOList(CompanyMoneyLogs companyMoneyLogs) {
-        return companyMoneyLogsMapper.selectCompanyMoneyLogsExport2VOList(companyMoneyLogs);
+        List<CompanyMoneyLogsExport2VO> companyMoneyLogsExport2VOS = companyMoneyLogsMapper.selectCompanyMoneyLogsExport2VOList(companyMoneyLogs);
+        for (CompanyMoneyLogsExport2VO item : companyMoneyLogsExport2VOS) {
+            // 如果是直播订单
+            if(ObjectUtil.equal(item.getType(),1)) {
+                String orderCode = liveOrderMapper.selectLiveOrderCodeByOrderId(item.getBusinessId());
+                if(ObjectUtil.isNotNull(orderCode)) {
+                    item.setOrderCode(orderCode);
+                }
+            }
+        }
+        return companyMoneyLogsExport2VOS;
     }
 
     @Override

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -328,6 +328,7 @@ public class CompanyServiceImpl implements ICompanyService
                 log.setBalance(company.getMoney());
                 log.setCreateTime(new Date());
                 log.setBusinessId(order.getOrderId().toString());
+                log.setType(1);
                 moneyLogsMapper.insertCompanyMoneyLogs(log);
             }
         }

fs-service-system/src/main/java/com/fs/company/vo/CompanyMoneyLogsExport1VO.java

@@ -85,6 +85,8 @@ public class CompanyMoneyLogsExport1VO implements Serializable
     @Excel(name = "快递结算日期")
     private String deliveryPayTime;
 
+    private Integer type;
+
 
 
 

fs-service-system/src/main/java/com/fs/company/vo/CompanyMoneyLogsExport2VO.java

@@ -32,6 +32,9 @@ public class CompanyMoneyLogsExport2VO implements Serializable
     @Excel(name = "公司",width =30)
     private String companyName;
 
+    @Excel(name = "订单号",width = 30)
+    private String orderCode;
+
     @Excel(name = "部门",width =43)
     private String deptName;
 
@@ -55,4 +58,6 @@ public class CompanyMoneyLogsExport2VO implements Serializable
     @Excel(name = "支付方式")
     private String payTypeCode;
 
+    private Integer type;
+
 }

fs-service-system/src/main/java/com/fs/company/vo/CompanyMoneyLogsExportVO.java

@@ -53,4 +53,6 @@ public class CompanyMoneyLogsExportVO implements Serializable
     @Excel(name = "支付方式")
     private String payTypeCode;
 
+    private Integer type;
+
 }

fs-service-system/src/main/java/com/fs/live/mapper/LiveOrderMapper.java

@@ -26,6 +26,9 @@ public interface LiveOrderMapper {
      */
     LiveOrder selectLiveOrderByOrderId(String orderId);
 
+    @Select("select order_code from live_order where order_id=#{orderId}")
+    String selectLiveOrderCodeByOrderId(@Param("orderId") String orderId);
+
     /**
      * 查询订单列表
      *

fs-service-system/src/main/resources/mapper/company/CompanyMoneyLogsMapper.xml

@@ -84,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="logsType != null">logs_type,</if>
             <if test="businessId != null">business_id,</if>
+            <if test="type != null">type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyId != null">#{companyId},</if>
@@ -92,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="logsType != null">#{logsType},</if>
-            <if test="businessId != null">#{businessId},</if>
+            <if test="type != null">#{type},</if>
          </trim>
     </insert>