1.修改恒春来顺丰虚拟号同步快递鸟

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -744,11 +744,20 @@ public class FsStoreOrderScrmController extends BaseController {
     public R getExpress(@PathVariable("id") Long id) {
         FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
         ExpressInfoDTO expressInfoDTO = null;
+        String lastFourNumber = "";
+
         if (StringUtils.isNotEmpty(order.getDeliveryId())) {
-            String lastFourNumber = "";
             if (order.getDeliverySn().equals(ShipperCodeEnum.SF.getValue()) || order.getDeliverySn().equals(ShipperCodeEnum.ZTO.getValue())) {
-                lastFourNumber = order.getUserPhone();
-                if (lastFourNumber.length() == 11) {
+                if("恒春来".equals(cloudHostProper.getCompanyName())
+                        && ObjectUtil.isNotEmpty(lastFourNumber = order.getVirtualPhone())){
+                    if (lastFourNumber.contains("-")) {
+                        lastFourNumber = lastFourNumber.length() >= 4 ? lastFourNumber.substring(lastFourNumber.length() - 4) : lastFourNumber;
+                    }else{
+                        lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
+                    }
+                }
+                // 原逻辑
+                else if ((lastFourNumber = order.getUserPhone()).length() == 11) {
                     lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
                 }
             }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -2929,9 +2929,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             if("恒春来".equals(cloudHostProper.getCompanyName())
                     && ObjectUtil.isNotEmpty(lastFourNumber = order.getVirtualPhone())){
                 if (lastFourNumber.contains("-")) {
-                    lastFourNumber = lastFourNumber.substring(0, lastFourNumber.indexOf("-"));
+                    lastFourNumber = lastFourNumber.length() >= 4 ? lastFourNumber.substring(lastFourNumber.length() - 4) : lastFourNumber;
+                }else{
+                    lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
                 }
-                lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
             }
             // 原逻辑
             else if ((lastFourNumber = order.getUserPhone()).length() == 11) {