fix：“修复海外子账号查询不到订单明细问题“

src/main/java/com/szwl/controller/TCoinOrderController.java

@@ -49,14 +49,19 @@ import java.util.List;
 @RestController
 @RequestMapping("/tCoinOrder")
 public class TCoinOrderController {
+
     @Resource
     SzwlFeign szwlFeign;
+
     @Autowired
     EsTCoinOrderService esTCoinOrderService;
+
     @Autowired
     TCoinOrderService coinOrderService;
+
     @Autowired
     TOrderDetailsService orderDetailsService;
+
     @Autowired
     TNameDictionaryService nameDictionaryService;
 //    @Resource
@@ -99,7 +104,7 @@ public class TCoinOrderController {
         LambdaQueryWrapper<TCoinOrder> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TCoinOrder::getSn, sn);
         List<TCoinOrder> coinOrders = coinOrderService.list(queryWrapper);
-        if (coinOrders.size() > 0) {
+        if (!coinOrders.isEmpty()) {
             try {
                 esTCoinOrderService.insertData(coinOrders.get(0));
             } catch (Exception e) {

src/main/java/com/szwl/controller/TOrderController.java

@@ -368,10 +368,6 @@ public class TOrderController {
         if (type.equals("1")) {
             LambdaQueryWrapper<TCoinOrder> query = Wrappers.lambdaQuery();
             if (!username.equals("sysMgtAcc")) {
-                // 如果为账户
-                if (admin.getType() > 2) {
-                    username = null;
-                }
                 if (StringUtils.isNotEmpty(username)) {
                     ResponseModel<TAdmin> adminByUsername = szwlFeign.getAdminByUsername(username);
                     TAdmin data = adminByUsername.getData();
@@ -394,14 +390,17 @@ public class TOrderController {
                             }
                         }
                     }
+
                 } else {
                     //adminType="all"时，代表查全部下级  子账户没有这个权限  公司人员默认查所有人
                     if (StringUtils.isNotEmpty(adminType)) {
                         if (admin.getIsAdmined() && admin.getType() > 1) {
-                            if ("all".equals(adminType)) {
-                                //查找所有下级
-                                List<Long> admidIdList = R.getDataIfSuccess(szwlFeign.getAdminIdList(authId));
-                                query.in(TCoinOrder::getAdminId, admidIdList);
+                            if (admin.getType() > 1) {
+                                if (adminType.equals("all")) {
+                                    //查找所有下级
+                                    List<Long> admidIdList = R.getDataIfSuccess(szwlFeign.getAdminIdList(authId));
+                                    query.in(TCoinOrder::getAdminId, admidIdList);
+                                }
                             }
                         } else {
                             if (admin.getType() > 1) {
@@ -430,7 +429,7 @@ public class TOrderController {
                                 //商家 子账户
                                 //登录账户为子账户 不查下级 只查对应机器的订单
                                 TAdminEquipment adminEquipment = R.getDataIfSuccess(szwlFeign.getClientIdList(String.valueOf(admin.getParentId())));
-                                if ("0".equals(adminEquipment.getType())) {
+                                if (adminEquipment.getType().equals("0")) {
                                     //全部机器
                                     TAdmin upAdmin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(admin.getParentId())));
                                     query.eq(TCoinOrder::getAdminId, upAdmin.getId());