直播订单字段权限修改

fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java

@@ -109,6 +109,7 @@ public class LiveOrderController extends BaseController
         List<LiveOrder> list = liveOrderService.selectLiveOrderList(liveOrder);
         for (LiveOrder vo : list){
             vo.setUserPhone(ParseUtils.parsePhone(vo.getUserPhone()));
+            vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
         }
         return getDataTable(list);
     }
@@ -138,7 +139,10 @@ public class LiveOrderController extends BaseController
     @GetMapping(value = "/info/{orderId}")
     public AjaxResult getInfo(@PathVariable("orderId") String orderId)
     {
-        return AjaxResult.success(liveOrderService.selectLiveOrderByOrderId(orderId));
+        LiveOrder liveOrder = liveOrderService.selectLiveOrderByOrderId(orderId);
+        liveOrder.setUserPhone(ParseUtils.parsePhone(liveOrder.getUserPhone()));
+        liveOrder.setUserAddress(ParseUtils.parseAddress(liveOrder.getUserAddress()));
+        return AjaxResult.success(liveOrder);
     }
 
 

fs-company/src/main/java/com/fs/company/controller/live/LiveOrderController.java

@@ -193,6 +193,7 @@ public class LiveOrderController extends BaseController
         List<LiveOrder> list = liveOrderService.selectLiveOrderList(liveOrder);
         for (LiveOrder vo : list){
             vo.setUserPhone(ParseUtils.parsePhone(vo.getUserPhone()));
+            vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
         }
         return getDataTable(list);
     }
@@ -221,7 +222,12 @@ public class LiveOrderController extends BaseController
     @GetMapping(value = "/info/{orderId}")
     public AjaxResult getInfo(@PathVariable("orderId") String orderId)
     {
-        return AjaxResult.success(liveOrderService.selectLiveOrderByOrderId(orderId));
+        LiveOrder liveOrder = liveOrderService.selectLiveOrderByOrderId(orderId);
+        if (!"00".equals(SecurityUtils.getLoginUser().getUser().getUserType())) {
+            liveOrder.setUserPhone(ParseUtils.parsePhone(liveOrder.getUserPhone()));
+            liveOrder.setUserAddress(ParseUtils.parseAddress(liveOrder.getUserAddress()));
+        }
+        return AjaxResult.success(liveOrder);
     }
 
     /**

fs-service-system/src/main/java/com/fs/live/vo/LiveUserDetailExportVO.java

@@ -49,7 +49,7 @@ public class LiveUserDetailExportVO {
     private String salesName;
 
     /** 是否完课 */
-    @Excel(name = "是否完课")
+//    @Excel(name = "是否完课")
     private String isCompleted;
 
 }