fix:顺丰代服账号

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -732,7 +732,7 @@ public class Task {
             FsStoreOrder order1 = new FsStoreOrder();
             order1.setDeliverySn(currentOrder.getDeliverySn());
             order1.setOrderCode(currentOrder.getOrderCode());
-
+            order1.setOrderId(currentOrder.getOrderId());
             // 异步执行，使用局部变量副本
             CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
                 OrderContextHolder.setIntegralOrder(currentOrder);

fs-service/src/main/java/com/fs/erp/service/impl/DfOrderServiceImpl.java

@@ -493,7 +493,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
                     if (df == null) {
                         return null;
                     }
-                    Long dfAccountId = getSFAccountIndexIntegral(order.getOrderId());
+                    Long dfAccountId = getSFAccountIndex(order.getOrderId());
+                    if (OrderContextHolder.hasIntegralOrder())
+                        dfAccountId = getSFAccountIndexIntegral(order.getOrderId());
                     if (dfAccountId != null) {
                         Map<String, Object> orderResultQueryParam = new HashMap<>();
                         orderResultQueryParam.put("orderNumber", orderNumber);
@@ -613,7 +615,9 @@ public class DfOrderServiceImpl implements IErpOrderService {
     public void getOrderDeliveryStatus(FsStoreOrder order) {
         Map<String, Object> map = new HashMap<>();
         Long orderId = order.getOrderId();
-        Long dfAccountId = getSFAccountIndexIntegral(orderId);
+        Long dfAccountId = getSFAccountIndex(orderId);
+        if (OrderContextHolder.hasIntegralOrder())
+            dfAccountId = getSFAccountIndexIntegral(orderId);
         if (dfAccountId == null){
             log.info("代服管家 getOrderDeliveryStatus-订单id: {}", orderId);
         }