Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/dto/TransportDemandExport.java

@@ -20,8 +20,6 @@ public class TransportDemandExport implements Serializable {
     @Serial
     private static final long serialVersionUID = -7951209824419422786L;
 
-    @ExcelProperty(value = "序号" )
-    private String serialNumber;
 
     @ExcelProperty(value = "状态")
     private String statusLabel;

sckw-modules/sckw-order/src/main/java/com/sckw/order/model/dto/WantBuyExport.java

@@ -20,10 +20,6 @@ public class WantBuyExport implements Serializable {
     @Serial
     private static final long serialVersionUID = 7225805024416842861L;
 
-
-    @ExcelProperty(value = "序号" )
-    private String serialNumber;
-
     @ExcelProperty(value = "状态")
     private String statusLabel;
 

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTransportDemandService.java

@@ -37,7 +37,6 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -381,13 +380,16 @@ public class KwoTransportDemandService {
                     new HashMap<>() : dict.get(DictTypeEnum.TRANSPORT_DEMAND_STATUS.getType());
         }
         List<TransportDemandExport> result = Lists.newArrayList();
-        AtomicInteger i = new AtomicInteger(1);
         demands.forEach(e -> {
             TransportDemandExport export = BeanUtils.copyProperties(e, TransportDemandExport.class);
+            String loadAreaName = Objects.nonNull(e.getLoadAreaName()) ? e.getLoadAreaName() : "";
+            String loadDetailAddress = Objects.nonNull(e.getLoadDetailAddress()) ? e.getLoadDetailAddress() : "";
+            String unloadAreaName = Objects.nonNull(e.getUnloadAreaName()) ? e.getUnloadAreaName() : "";
+            String unloadDetailAddress = Objects.nonNull(e.getUnloadDetailAddress()) ? e.getUnloadDetailAddress() : "";
             export.setGoodsTypeLabel(productNameMap.get(e.getGoodsType()))
                     .setStatusLabel(statusMap.get(String.valueOf(e.getStatus())))
-                    .setLoadAddress(e.getLoadAreaName() + e.getLoadDetailAddress()).setSerialNumber(String.valueOf(i.getAndIncrement()))
-                    .setUnloadAddress(e.getUnloadAreaName() + e.getUnloadDetailAddress())
+                    .setLoadAddress(loadAreaName + loadDetailAddress)
+                    .setUnloadAddress(unloadAreaName + unloadDetailAddress)
                     .setDeadline(Objects.isNull(e.getDeadline()) ? null : DateUtils.format(e.getDeadline(), DateUtils.DATE_PATTERN))
                     .setCreateTime(DateUtil.getDateTime(e.getCreateTime()))
                     .setUpdateTime(DateUtil.getDateTime(e.getUpdateTime()))
@@ -533,11 +535,15 @@ public class KwoTransportDemandService {
         List<TransportDemandSquaresListRes> result = Lists.newArrayList();
         list.forEach(e -> {
             TransportDemandSquaresListRes res = BeanUtils.copyProperties(e, TransportDemandSquaresListRes.class);
+            String loadAreaName = Objects.nonNull(e.getLoadAreaName()) ? e.getLoadAreaName() : "";
+            String loadDetailAddress = Objects.nonNull(e.getLoadDetailAddress()) ? e.getLoadDetailAddress() : "";
+            String unloadAreaName = Objects.nonNull(e.getUnloadAreaName()) ? e.getUnloadAreaName() : "";
+            String unloadDetailAddress = Objects.nonNull(e.getUnloadDetailAddress()) ? e.getUnloadDetailAddress() : "";
             EntCacheResDto ent = entMap.get(e.getEntId());
             res.setGoodsTypeLabel(productNameMap.get(e.getGoodsType()))
                     .setTradingLabel(tradeMap.get(e.getTrading()))
-                    .setLoadAddress(e.getLoadAreaName() + e.getLoadDetailAddress())
-                    .setUnloadAddress(e.getUnloadAreaName() + e.getUnloadDetailAddress())
+                    .setLoadAddress(loadAreaName + loadDetailAddress)
+                    .setUnloadAddress(unloadAreaName + unloadDetailAddress)
                     .setCreateTime(DateUtils.format(e.getCreateTime()))
                     .setDemandUnit(Objects.nonNull(ent) ? ent.getFirmName() : null);
             result.add(res);

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwpWantBuyService.java

@@ -37,7 +37,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -572,14 +571,12 @@ public class KwpWantBuyService {
                     new HashMap<>() : dict.get(DictTypeEnum.WANT_BUY_STATUS.getType());
         }
         List<WantBuyExport> result = new ArrayList<>();
-        AtomicInteger i = new AtomicInteger(1);
         wantBuyDto.forEach(e -> {
             WantBuyExport export = BeanUtils.copyProperties(e, WantBuyExport.class);
             List<String> tradings = e.getWantBuyTradings().stream()
                     .map(wantBuyTradingRes -> tradeMap.get(wantBuyTradingRes.getTrading()))
                     .collect(Collectors.toList());
-            export.setSerialNumber(String.valueOf(i.getAndIncrement()))
-                    .setStatusLabel(statusMap.get(String.valueOf(e.getStatus())))
+            export.setStatusLabel(statusMap.get(String.valueOf(e.getStatus())))
                     .setEntName(Objects.nonNull(entMap.get(e.getEntId())) ? entMap.get(e.getEntId()).getFirmName() : null)
                     .setTradings(String.join(Global.COMMA, tradings))
                     .setGoodsTypeLabel(productNameMap.get(e.getGoodsType()))

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/GoodsListExport.java

@@ -21,9 +21,6 @@ public class GoodsListExport implements Serializable {
     @Serial
     private static final long serialVersionUID = 6833195135537265912L;
 
-    @ExcelProperty(value = "序号" )
-    private String serialNumber;
-
     @ExcelProperty(value = "上架状态")
     private String statusLabel;
 

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -53,7 +53,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -582,11 +581,9 @@ public class KwpGoodsService {
     public List<GoodsListExport> getExportResults(List<KwpGoods> list) {
         List<GoodsList> goodsLists = buildGoodLists(list);
         List<GoodsListExport> result = new ArrayList<>(list.size());
-        AtomicInteger i = new AtomicInteger(1);
         goodsLists.forEach(e -> {
             GoodsListExport export = BeanUtils.copyProperties(e, GoodsListExport.class);
-            export.setSerialNumber(String.valueOf(i.getAndIncrement()))
-                    .setAmount(Objects.isNull(e.getAmount()) ? null : String.valueOf(e.getAmount()))
+            export.setAmount(Objects.isNull(e.getAmount()) ? null : String.valueOf(e.getAmount()))
                     .setHighestPrice(Objects.isNull(e.getHighestPrice()) ? null : String.valueOf(e.getHighestPrice()))
                     .setLowestPrice(Objects.isNull(e.getLowestPrice()) ? null : String.valueOf(e.getLowestPrice()))
                     .setAddedTime(Objects.isNull(e.getAddedTime()) ? null : DateUtil.getDateTime(e.getAddedTime()))

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwOrderService.java

@@ -31,7 +31,6 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -449,7 +448,6 @@ public class KwOrderService {
             tradeMap = new HashMap<>();
         }
         List<TradeOrderListExport> list = new ArrayList<>();
-        AtomicInteger i = new AtomicInteger(1);
         orders.forEach(e -> {
             Double waitEntrustAmount = getWaitEntrustAmount(e.getAmount(), e.getEntrustAmount());
             String loadCityName = Objects.isNull(e.getLoadCityName()) ? "" : e.getLoadCityName();
@@ -457,8 +455,7 @@ public class KwOrderService {
             String unloadCityName = Objects.isNull(e.getUnloadCityName()) ? "" : e.getUnloadCityName();
             String unloadDetailAddress = Objects.isNull(e.getUnloadDetailAddress()) ? "" : e.getUnloadDetailAddress();
             TradeOrderListExport export = BeanUtils.copyProperties(e, TradeOrderListExport.class);
-            export.setSerialNumber(String.valueOf(i.getAndIncrement()))
-                    .setStatus(statusMap.get(String.valueOf(e.getStatus())))
+            export.setStatus(statusMap.get(String.valueOf(e.getStatus())))
                     .setUnitPrice(String.valueOf(setScale(e.getUnitPrice())))
                     .setAmount(String.valueOf(setScale(e.getAmount())))
                     .setPrice(String.valueOf(setScale(e.getPrice())))

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/TradeOrderListExport.java

@@ -20,9 +20,6 @@ public class TradeOrderListExport implements Serializable {
     @Serial
     private static final long serialVersionUID = -5895230502149598364L;
 
-    @ExcelProperty(value = "序号" )
-    private String serialNumber;
-
     @ExcelProperty(value = "状态" )
     private String status;
 
@@ -50,6 +47,9 @@ public class TradeOrderListExport implements Serializable {
     @ExcelProperty(value = "订单金额")
     private String price;
 
+    @ExcelProperty(value = "税率/%")
+    private String goodsTaxRate;
+
     @ExcelProperty(value = "已分配运输量")
     private String entrustAmount;
 

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/vo/OrderListRes.java

@@ -126,6 +126,8 @@ public class OrderListRes {
      */
     private String goodsSpec;
 
+    private String goodsTaxRate;
+
     /**
      * 商品缩略图
      */