Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -320,7 +320,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
             }
         }
         JSONArray jsonArray = new JSONArray();
-        jsonArray.add(dedDetailDTO);
+        if (dedDetailDTO.getCost().intValue() != 0 || dedDetailDTO.getExcessCost().intValue() != 0) {
+            jsonArray.add(dedDetailDTO);
+        }
         DedDetailDTO dedDetailDTO1 = new DedDetailDTO();
         //添加更改还车公司计算费用
         if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getBookRecordId() != null) {
@@ -359,7 +361,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
                 }
             }
         }
-        jsonArray.add(dedDetailDTO1);
+        if (dedDetailDTO1.getCost().intValue() != 0) {
+            jsonArray.add(dedDetailDTO1);
+        }
         orderPageVO.setDedDetailDTO(jsonArray.toJSONString());
     }
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BookRecordUpdateLog.java

@@ -52,4 +52,10 @@ public class BookRecordUpdateLog {
      */
     @Column(name = "create_time")
     private Date createTime;
+
+    @Transient
+    private String oldCompanyName;
+
+    @Transient
+    private String newCompanyName;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BookRecordUpdateLogBiz.java

@@ -3,7 +3,9 @@ package com.xxfc.platform.vehicle.biz;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.mapper.BookRecordUpdateLogMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
@@ -12,6 +14,9 @@ import java.util.List;
 @Service
 public class BookRecordUpdateLogBiz extends BaseBiz<BookRecordUpdateLogMapper, BookRecordUpdateLog> {
 
+    @Autowired
+    BranchCompanyBiz branchCompanyBiz;
+
     public ObjectRestResponse save(BookRecordUpdateLog bookRecordUpdateLog) {
         BookRecordUpdateLog oldValue = mapper.selectOne(bookRecordUpdateLog);
         if (oldValue != null) {
@@ -25,7 +30,18 @@ public class BookRecordUpdateLogBiz extends BaseBiz<BookRecordUpdateLogMapper, B
         Example example = new Example(BookRecordUpdateLog.class);
         example.createCriteria().andEqualTo("bookRecordId", bookRecordId);
         example.setOrderByClause("create_time desc");
-        return ObjectRestResponse.succ(selectByExample(example));
+        List<BookRecordUpdateLog> bookRecordUpdateLogs = selectByExample(example);
+        for (BookRecordUpdateLog bookRecordUpdateLog : bookRecordUpdateLogs) {
+            BranchCompany oldCompany = branchCompanyBiz.getById(bookRecordUpdateLog.getOldRetCompanyId());
+            if (oldCompany != null) {
+                bookRecordUpdateLog.setOldCompanyName(oldCompany.getName());
+            }
+            BranchCompany newCompany = branchCompanyBiz.getById(bookRecordUpdateLog.getNewRetCompanyId());
+            if (newCompany != null) {
+                bookRecordUpdateLog.setNewCompanyName(newCompany.getName());
+            }
+        }
+        return ObjectRestResponse.succ(bookRecordUpdateLogs);
     }
 
 }