Kaynağa Gözat

fix:“修复订单明细查询问题“

soobin 1 yıl önce
ebeveyn
işleme
443a32b559

+ 17 - 9
src/main/java/com/szwl/controller/TOrderController.java

@@ -230,13 +230,17 @@ public class TOrderController {
             if (StringUtils.isNotEmpty(clientId)) {
                 TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(clientId));
                 //判断机器是否属于这个登陆账号
-                if (admin.getType() > 1) {
-                    //商家
-                    if (equipment.getAdminId().toString().equals(admin.getId().toString())) {
+                if(equipment != null) {
+                    if (admin.getType() > 1) {
+                        //商家
+                        if (equipment.getAdminId().toString().equals(admin.getId().toString())) {
+                            query.eq(TOrder::getEquipmentId, equipment.getId());
+                        }
+                    } else {
                         query.eq(TOrder::getEquipmentId, equipment.getId());
                     }
                 } else {
-                    query.eq(TOrder::getEquipmentId, equipment.getId());
+                    return R.fail(ResponseCodesEnum.A0001, "设备不存在");
                 }
             }
 
@@ -465,14 +469,18 @@ public class TOrderController {
 
             if (StringUtils.isNotEmpty(clientId)) {
                 TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(clientId));
-                //判断机器是否属于这个登陆账号
-                if (admin.getType() > 1) {
-                    //商家
-                    if (equipment.getAdminId().toString().equals(admin.getId().toString())) {
+                if(equipment != null) {
+                    //判断机器是否属于这个登陆账号
+                    if (admin.getType() > 1) {
+                        //商家
+                        if (equipment.getAdminId().toString().equals(admin.getId().toString())) {
+                            query.eq(TCoinOrder::getClientId, equipment.getClientId());
+                        }
+                    } else {
                         query.eq(TCoinOrder::getClientId, equipment.getClientId());
                     }
                 } else {
-                    query.eq(TCoinOrder::getClientId, equipment.getClientId());
+                    return R.fail(ResponseCodesEnum.A0001,"设备不存在");
                 }
             }
             if (startDate != null) {