feat: 增加上门取件结束时间；

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/BizWaybillOrder.java

@@ -394,7 +394,15 @@ public class BizWaybillOrder extends BaseEntity
         return sendStartTime;
     }
 
-    public void setPickupTime(Date pickupTime) 
+    public Date getSendEndTime() {
+        return sendEndTime;
+    }
+
+    public void setSendEndTime(Date sendEndTime) {
+        this.sendEndTime = sendEndTime;
+    }
+
+    public void setPickupTime(Date pickupTime)
     {
         this.pickupTime = pickupTime;
     }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/JDLogisticsService.java

@@ -76,7 +76,7 @@ public class JDLogisticsService  implements LogisticsService {
             requestDTO.setOrderOrigin(getOrderOrigin(bizWaybillOrder.getProductCode()));
             requestDTO.setCustomerCode(sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_CUSTOMERCODE));
             requestDTO.setPickupStartTime(bizWaybillOrder.getSendStartTime().getTime());
-            requestDTO.setPickupEndTime(bizWaybillOrder.getSendStartTime().getTime());
+            requestDTO.setPickupEndTime(bizWaybillOrder.getSendEndTime().getTime());
 
             CommonProductInfo productInfo = new CommonProductInfo();
             productInfo.setProductCode(bizWaybillOrder.getProductCode());
@@ -141,7 +141,7 @@ public class JDLogisticsService  implements LogisticsService {
             requestDTO.setCustomerCode(sysConfigService.selectConfigByKey(SysConfigConstants.JD_LOGISTICS_CUSTOMERCODE));
             requestDTO.setSettleType(3);
             requestDTO.setPickupStartTime(bizWaybillOrder.getSendStartTime().getTime());
-            requestDTO.setPickupEndTime(bizWaybillOrder.getSendStartTime().getTime());
+            requestDTO.setPickupEndTime(bizWaybillOrder.getSendEndTime().getTime());
             requestDTO.setPickupType(1);
 
             //产品信息