Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -47,6 +47,7 @@ import com.jsowell.pile.vo.base.StationInfoVO;
 import com.jsowell.pile.vo.uniapp.InvoiceRecordVO;
 import com.jsowell.pile.vo.uniapp.*;
 import com.jsowell.pile.vo.web.*;
+import com.jsowell.thirdparty.common.CommonService;
 import com.jsowell.wxpay.response.WechatPayNotifyParameter;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
@@ -60,6 +61,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 @Service
@@ -129,6 +131,9 @@ public class OrderService {
     @Resource
     private ClearingBillInfoService clearingBillInfoService;
 
+    @Autowired
+    private CommonService commonService;
+
     @Resource
     private RedisCache redisCache;
 
@@ -722,6 +727,16 @@ public class OrderService {
         pileRemoteService.remoteStopCharging(orderBasicInfo.getPileSn(), orderBasicInfo.getConnectorCode(), orderBasicInfo.getTransactionCode());
 
         log.info("人工结算订单-end orderCode:{}", dto.getOrderCode());
+
+        // 异步推送第三方平台订单信息
+        CompletableFuture.runAsync(() -> {
+            try {
+                commonService.commonPushOrderInfo(orderBasicInfo);
+            } catch (Exception e) {
+                log.error("人工结算订单 推送第三方平台订单信息error, ", e);
+                e.printStackTrace();
+            }
+        });
         return true;
     }