fix：“优化订单分析和明细功能"

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

@@ -98,6 +98,11 @@ public class TOrderController {
 
         //判断当前账号状态
         TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(authId));
+        // 如果是营销经理类型
+        if (admin.getType() == 4) {
+            admin = R.getDataIfSuccess(szwlFeign.getAdmin(adminId));
+            username = admin.getUsername();
+        }
         if (StringUtils.isEmpty(type)) {
             if (StringUtils.isNotEmpty(admin.getIfForeign())) {
                 // 0 国内，1 海外
@@ -358,7 +363,6 @@ public class TOrderController {
             pageList.setSize(iPage.getSize());
             return R.ok(pageList);
         }
-        ;
 
         //1,海外
         if (type.equals("1")) {
@@ -679,7 +683,7 @@ public class TOrderController {
             if (admin.getId() == 2739) {
                 param.setCompanyType("1");
             }
-        } else {
+        } else if (admin.getType() < 4) {
             param.setIfForeign(isForeignUser(adminId));
             if (admin.getType() == 2) {
                 //商家

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

@@ -848,6 +848,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 // 条件：adminList
                 if (param.getAdminIds() != null && !param.getAdminIds().isEmpty()) {
                     queryWrapper.in(TOrder::getAdminId, param.getAdminIds());
+                    param.setAdminId(null);
                 }
                 // 条件：companyType
                 if (StringUtils.isNotBlank(param.getCompanyType())) {
@@ -862,7 +863,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 // 条件：支付状态
                 queryWrapper.eq(TOrder::getStatus, 1);
                 // 条件：type == 2 or type == 1
-                if ("2".equals(param.getPacketType())) {
+                if ("0".equals(param.getPacketType())) {
                     queryWrapper.groupBy(TOrder::getAdminId);
                 } else if ("1".equals(param.getPacketType())) {
                     queryWrapper.groupBy(TOrder::getClientId);
@@ -914,6 +915,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 // 条件：adminList
                 if (param.getAdminIds() != null && !param.getAdminIds().isEmpty()) {
                     queryWrapper.in(TCoinOrder::getAdminId, param.getAdminIds());
+                    param.setAdminId(null);
                 }
                 // 条件：companyType
                 if (StringUtils.isNotBlank(param.getCompanyType())) {
@@ -928,7 +930,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 // 条件：支付状态
                 queryWrapper.eq(TCoinOrder::getStatus, 1);
                 // 条件：type == 2 or type == 1
-                if ("2".equals(param.getPacketType())) {
+                if ("0".equals(param.getPacketType())) {
                     queryWrapper.groupBy(TCoinOrder::getAdminId);
                 } else if ("1".equals(param.getPacketType())) {
                     queryWrapper.groupBy(TCoinOrder::getClientId);