快递

sd-business/src/main/java/com/sd/business/service/order/impl/IssueBillServiceImpl.java

@@ -92,7 +92,7 @@ public class IssueBillServiceImpl implements IssueBillService {
         Page<IssueBillVo> page = mapper.getPage(dto.getPage(), wrapper);
         List<IssueBillVo> records = page.getRecords();
 
-        if (records.size() == 0) {
+        if (records.isEmpty()) {
             return page;
         }
 

sd-business/src/main/resources/mapper/order/IssueBillMapper.xml

@@ -5,8 +5,9 @@
     <select id="getPage" resultType="com.sd.business.entity.order.vo.IssueBillVo">
         select oi.id,
                oi.code,
-               d.name  departmentName,
-               ed.name expressDeliveryName,
+               d.name        departmentName,
+               ed.id         expressDeliveryId,
+               ed.expressage expressDeliveryName,
                oi.source_platform,
                oi.shop_name,
                oi.create_time,

sd-wln/src/main/java/com/sd/wln/service/impl/WlnStatementOfAccountImpl.java

@@ -48,7 +48,7 @@ public class WlnStatementOfAccountImpl implements WlnStatementOfAccount {
                 .ge(OrderInfo::getStatus, OrderStatusEnum.IN_PRODUCTION.getKey())
                 .isNotNull(OrderInfo::getWlnCode)
                 .isNull(OrderInfo::getStatementOfAccountId));
-        if (orderList.size() == 0) {
+        if (orderList.isEmpty()) {
             return;
         }
 
@@ -57,7 +57,7 @@ public class WlnStatementOfAccountImpl implements WlnStatementOfAccount {
 
         // 根据万里牛编号查询出库记录
         List<OutboundOrder> outboundOrderList = outboundOrderService.list(q -> q.in(OutboundOrder::getOrderWlnCode, wlnCodeList));
-        if (outboundOrderList.size() == 0) {
+        if (outboundOrderList.isEmpty()) {
             return;
         }
 
@@ -122,7 +122,7 @@ public class WlnStatementOfAccountImpl implements WlnStatementOfAccount {
         // 订单生产完成时，生产任务一键完成
         productionTaskService.completeTaskBatch(editProductionTaskList);
 
-        if (saveStatementOfAccountList.size() > 0) {
+        if (!saveStatementOfAccountList.isEmpty()) {
             statementOfAccountService.saveBatch(saveStatementOfAccountList);
         }