fix：“优化订单分析查询功能"

src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -82,7 +82,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     SzwlFeign szwlFeign;
 
     @Autowired
-    private RefundSendRecordService refundSendRecordService;
+    RefundSendRecordService refundSendRecordService;
 
     private static final String appid = "07784f5fedb508046c841b391005b7de";
 
@@ -673,9 +673,14 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdminVo(String.valueOf(orderStatistics.getAdminId())));
             if (StringUtils.isNotEmpty(param.getPacketType()) && param.getPacketType().equals("0")) {
                 // 按商户分组
-                TArea area = areaService.getById(admin.getAreaId());
-                if (area != null) {
-                    orderDaoChu.setAddress(area.getFullName());
+                if (StringUtils.isNotEmpty(admin.getIfForeign()) && "1".equals(admin.getIfForeign())) {
+                    String fullName = R.getDataIfSuccess(szwlFeign.getForeignArea(admin.getAreaId()));
+                    orderDaoChu.setAddress(fullName);
+                } else {
+                    TArea area = areaService.getById(admin.getAreaId());
+                    if (area != null) {
+                        orderDaoChu.setAddress(area.getFullName());
+                    }
                 }
                 String equipmentTotal = R.getDataIfSuccess(szwlFeign.getEquipmentTotal(String.valueOf(orderStatistics.getAdminId())));
                 orderDaoChu.setEquipmentTotal(equipmentTotal);
@@ -766,9 +771,14 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdminVo(String.valueOf(orderStatisticsYear.getAdminId())));
             if (StringUtils.isNotEmpty(param.getPacketType()) && param.getPacketType().equals("0")) {
                 // 按商户分组
-                TArea area = areaService.getById(admin.getAreaId());
-                if (area != null) {
-                    orderDaoChu.setAddress(area.getFullName());
+                if (StringUtils.isNotEmpty(admin.getIfForeign()) && "1".equals(admin.getIfForeign())) {
+                    String fullName = R.getDataIfSuccess(szwlFeign.getForeignArea(admin.getAreaId()));
+                    orderDaoChu.setAddress(fullName);
+                } else {
+                    TArea area = areaService.getById(admin.getAreaId());
+                    if (area != null) {
+                        orderDaoChu.setAddress(area.getFullName());
+                    }
                 }
                 String equipmentTotal = R.getDataIfSuccess(szwlFeign.getEquipmentTotal(String.valueOf(orderStatisticsYear.getAdminId())));
                 orderDaoChu.setEquipmentTotal(equipmentTotal);
@@ -952,9 +962,14 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 orderDaoChuDTO.setName(admin.getName());
                 if (!StringUtils.isEmpty(param.getPacketType()) && param.getPacketType().equals("0")) {
                     //商户为单位
-                    TArea area = areaService.getById(admin.getAreaId());
-                    if (area != null) {
-                        orderDaoChuDTO.setAddress(area.getFullName());
+                    if (StringUtils.isNotEmpty(admin.getIfForeign()) && "1".equals(admin.getIfForeign())) {
+                        String fullName = R.getDataIfSuccess(szwlFeign.getForeignArea(admin.getAreaId()));
+                        orderDaoChuDTO.setAddress(fullName);
+                    } else {
+                        TArea area = areaService.getById(admin.getAreaId());
+                        if (area != null) {
+                            orderDaoChuDTO.setAddress(area.getFullName());
+                        }
                     }
                     String equipmentTotal = R.getDataIfSuccess(szwlFeign.getEquipmentTotal(adminId1));
                     orderDaoChuDTO.setEquipmentTotal(equipmentTotal);
@@ -1239,6 +1254,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         List<StatisticsAdminTarget> adminTargetList = new ArrayList<>();
         for (OrderDaoChuDTO orderDaoChuDTO : dataList) {
             StatisticsAdminTarget target = new StatisticsAdminTarget();
+            target.setAddress(orderDaoChuDTO.getAddress());
             target.setUsername(orderDaoChuDTO.getUsername());
             target.setName(orderDaoChuDTO.getName());
             target.setPhone(orderDaoChuDTO.getPhone());
@@ -1348,9 +1364,14 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 orderDaoChuDTO.setName(admin.getName());
                 if (!StringUtils.isEmpty(param.getPacketType()) && param.getPacketType().equals("0")) {
                     //商户为单位
-                    TArea area = areaService.getById(admin.getAreaId());
-                    if (area != null) {
-                        orderDaoChuDTO.setAddress(area.getFullName());
+                    if (StringUtils.isNotEmpty(admin.getIfForeign()) && "1".equals(admin.getIfForeign())) {
+                        String fullName = R.getDataIfSuccess(szwlFeign.getForeignArea(admin.getAreaId()));
+                        orderDaoChuDTO.setAddress(fullName);
+                    } else {
+                        TArea area = areaService.getById(admin.getAreaId());
+                        if (area != null) {
+                            orderDaoChuDTO.setAddress(area.getFullName());
+                        }
                     }
                     String equipmentTotal = R.getDataIfSuccess(szwlFeign.getEquipmentTotal(adminId1));
                     orderDaoChuDTO.setEquipmentTotal(equipmentTotal);
@@ -1420,9 +1441,14 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdminVo(String.valueOf(orderStatisticsYear.getAdminId())));
             // 按商户分组
             String equipmentTotal = R.getDataIfSuccess(szwlFeign.getEquipmentTotal(String.valueOf(orderStatisticsYear.getAdminId())));
-            TArea area = areaService.getById(admin.getAreaId());
-            if (area != null) {
-                target.setAddress(area.getFullName());
+            if (StringUtils.isNotEmpty(admin.getIfForeign()) && "1".equals(admin.getIfForeign())) {
+                String fullName = R.getDataIfSuccess(szwlFeign.getForeignArea(admin.getAreaId()));
+                target.setAddress(fullName);
+            } else {
+                TArea area = areaService.getById(admin.getAreaId());
+                if (area != null) {
+                    target.setAddress(area.getFullName());
+                }
             }
             target.setUsername(admin.getUsername());
             target.setName(admin.getName());
@@ -1441,9 +1467,14 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             StatisticsAdminTarget target = new StatisticsAdminTarget();
             TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdminVo(String.valueOf(orderStatisticsMonth.getAdminId())));
             // 按商户分组
-            TArea area = areaService.getById(admin.getAreaId());
-            if (area != null) {
-                target.setAddress(area.getFullName());
+            if (StringUtils.isNotEmpty(admin.getIfForeign()) && "1".equals(admin.getIfForeign())) {
+                String fullName = R.getDataIfSuccess(szwlFeign.getForeignArea(admin.getAreaId()));
+                target.setAddress(fullName);
+            } else {
+                TArea area = areaService.getById(admin.getAreaId());
+                if (area != null) {
+                    target.setAddress(area.getFullName());
+                }
             }
             String equipmentTotal = R.getDataIfSuccess(szwlFeign.getEquipmentTotal(String.valueOf(orderStatisticsMonth.getAdminId())));
             target.setUsername(admin.getUsername());