fix:pc订单技师数据权限,新增技师初步审核bug

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TOrderController.java

@@ -3,7 +3,9 @@ package com.ylx.web.controller.massage;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.annotation.Log;
+import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
+import com.ylx.common.core.domain.model.LoginUser;
 import com.ylx.common.enums.BusinessType;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.StringUtils;
@@ -34,7 +36,7 @@ import java.util.Optional;
 @Slf4j
 @Api(tags = {"订单管理"})
 @RequestMapping("api/order/v1")
-public class TOrderController {
+public class TOrderController extends BaseController {
     @Resource
     private TOrderService orderService;
 
@@ -294,6 +296,17 @@ public class TOrderController {
         return R.ok(all);
     }
 
+    @Log(title = "PC获取订单信息", businessType = BusinessType.OTHER)
+    @ApiOperation("PC订单信息")
+    @RequestMapping(value = "pc/getOrder", method = RequestMethod.GET)
+    public R getPcOrder(Page<TOrder> page, TOrder param) {
+
+        LoginUser loginUser = this.getLoginUser();
+        param.setDeptId(loginUser.getDeptId().toString());
+        Page<TOrder> all = orderService.getAll(page, param);
+        return R.ok(all);
+    }
+
     @Log(title = "微信获取订单信息", businessType = BusinessType.EXPORT)
     @ApiOperation("导出")
     @PostMapping(value = "wx/export")

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TJs.java

@@ -251,11 +251,11 @@ public class TJs implements Serializable {
     private LocalDateTime dtCreateTime;
 
     @TableField("name")
-    @ApiModelProperty("地址详细")
+    @ApiModelProperty("地址name")
     private String name;
 
     @TableField("address")
-    @ApiModelProperty("创建时间")
+    @ApiModelProperty("地址详细")
     private String address;
 
     @TableField("reason_refusal")

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TJsServiceImpl.java

@@ -84,7 +84,7 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
         if (cjs != null) {
             throw new ServiceException("请勿重复申请");
         }
-        cacheAddress(js);
+//        cacheAddress(js);
         initialization(js);
         return this.save(js);
     }

nightFragrance-massage/src/main/resources/mapper/massage/TOrderMapper.xml

@@ -188,7 +188,7 @@
             <if test="param.cJsId != null and param.cJsId != ''">
                 and t_order.c_js_id = #{ param.cJsId }
             </if>
-            <if test="param.deptId != null and param.deptId != '' and param.deptId !=100">
+            <if test="param.deptId != null and param.deptId != '' and param.deptId != 100">
                 and t_order.dept_id = #{ param.deptId }
             </if>
             <if test="param.cOpenId != null and param.cOpenId != ''">