Sfoglia il codice sorgente

fix: "海外订单保存公司类型获取"

Ritchie 1 anno fa
parent
commit
114afff00c

+ 2 - 1
src/main/java/com/szwl/controller/TCoinOrderController.java

@@ -103,8 +103,9 @@ public class TCoinOrderController {
             return JsonMessage.error("找不到设备商家");
         }
 
+        String adminIdStr = String.valueOf(adminId);
         // 根据 adminId 获取admin信息中的公司类型
-        TAdmin byId = adminService.getById(adminId);
+        TAdmin byId = R.getDataIfSuccess(szwlFeign.getAdmin(adminIdStr));
         String companyType = byId.getCompanyType();
 
         TCoinOrder coinOrder = new TCoinOrder();

+ 2 - 2
src/main/java/com/szwl/model/bo/JsonMessage.java

@@ -135,9 +135,9 @@ public final class JsonMessage {
     public static Object optimiseObj(Object bean, String... properties) {
         Map<String, Object> map = new HashMap<>();
         if (bean == null) {
-            //TODO 前端需要null
+            // 前端需要null
             return null;
-            // TODO 前端需要空对象
+            // 前端需要空对象
 //            return map;
         }
         // 判断是否列表