feat: 新增登录角色推荐，删除多余地址地址保留湖南省

guzijian
1 parent 90b99676
Showing 6 changed files with 97 additions and 34 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageUserController.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/LoginVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarUserService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-ui/src/views/gar/order/index.vue
trash-ui/src/views/gar/user/index.vue
@@ -15,6 +15,7 @@ import com.trash.garbage.pojo.domain.GarAddress;
 import com.trash.garbage.pojo.domain.GarUser;
 import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
+import com.trash.garbage.pojo.vo.LoginVo;
 import com.trash.garbage.service.GarUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -41,7 +42,7 @@ public class GarbageUserController {
      * @return
      */
     @PostMapping("/login")
-    public Result<String> login(@RequestBody LoginDto user) {
+    public Result<LoginVo> login(@RequestBody LoginDto user) {
         return Result.OK(garUserService.login(user));
     }
  
+package com.trash.garbage.pojo.vo;
+
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@ToString
+@EqualsAndHashCode
+public class LoginVo {
+    private String token;
+    private Boolean companyFlag;
+    private String parentCompanyName;
+    private String transportCompanyName;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public Boolean getCompanyFlag() {
+        return companyFlag;
+    }
+
+    public void setCompanyFlag(Boolean companyFlag) {
+        this.companyFlag = companyFlag;
+    }
+
+    public String getParentCompanyName() {
+        return parentCompanyName;
+    }
+
+    public void setParentCompanyName(String parentCompanyName) {
+        this.parentCompanyName = parentCompanyName;
+    }
+
+    public String getTransportCompanyName() {
+        return transportCompanyName;
+    }
+
+    public void setTransportCompanyName(String transportCompanyName) {
+        this.transportCompanyName = transportCompanyName;
+    }
+}
@@ -7,6 +7,7 @@ import com.trash.garbage.pojo.domain.GarUser;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
+import com.trash.garbage.pojo.vo.LoginVo;
  
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -18,7 +19,7 @@ import java.util.List;
 */
 public interface GarUserService extends IService<GarUser> {
  
-    String login(LoginDto user);
+    LoginVo login(LoginDto user);
  
     String sendVerify(String tel) throws ClientException;
  
 package com.trash.garbage.service.impl;
  
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
@@ -15,6 +16,10 @@ import com.trash.common.core.domain.model.LoginUser;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.StringUtils;
+import com.trash.driver.domain.vo.DriverVo;
+import com.trash.driver.service.IDriverService;
+import com.trash.enterprise.domain.TransportationEnterprise;
+import com.trash.enterprise.service.ITransportationEnterpriseService;
 import com.trash.framework.web.service.TokenService;
 import com.trash.garbage.config.WxConfig;
 import com.trash.garbage.custom.BizException;
@@ -22,9 +27,11 @@ import com.trash.garbage.global.GlobalRedisProperties;
 import com.trash.garbage.global.GlobalStatus;
 import com.trash.garbage.global.ResultCode;
 import com.trash.garbage.pojo.domain.GarAddress;
+import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.domain.GarUser;
 import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
+import com.trash.garbage.pojo.vo.LoginVo;
 import com.trash.garbage.service.GarAddressService;
 import com.trash.garbage.service.GarUserService;
 import com.trash.garbage.mapper.GarUserMapper;
@@ -60,6 +67,12 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Autowired
     private GarAddressService garAddressService;
  
+    @Autowired
+    private IDriverService driverService;
+
+    @Autowired
+    private ITransportationEnterpriseService enterpriseService;
+
  
     @Resource
     private RedisCache redisCache;
@@ -69,7 +82,9 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
  
  
     @Override
-    public String login(LoginDto loginDto) {
+    public LoginVo login(LoginDto loginDto) {
+        LoginVo vo = new LoginVo();
+
         if (Objects.isNull(loginDto)) {
             throw new UsernameNotFoundException("当前用户不存在!");
         }
@@ -120,7 +135,22 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         String token = JwtUtils.createToken(nUser.getGarUserId(), nUser.getGarUserTel());
         loginUser.setToken(token);
         tokenService.refreshToken(loginUser);
-        return token;
+        vo.setToken(token);
+        loginDto.getTel();
+        DriverVo driver = new DriverVo();
+        driver.setPhoneNo(loginDto.getTel());
+        List<DriverVo> driverList = driverService.selectDriverList(driver);
+        if (CollectionUtil.isEmpty(driverList)) {
+            vo.setCompanyFlag(false);
+            return vo;
+        }
+        DriverVo driverVo = driverList.get(0);
+        TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId());
+        TransportationEnterprise parentEnterprise = enterpriseService.selectTransportationEnterpriseById(enterprise.getParentId());
+        vo.setTransportCompanyName(enterprise.getName());
+        vo.setParentCompanyName(parentEnterprise.getName());
+        vo.setCompanyFlag(true);
+        return vo;
     }
  
     @Override
@@ -50,7 +50,6 @@
       </el-table-column>
       <el-table-column label="约定时间" width="180" align="center" prop="garOrderAgreementTime" />
       <el-table-column label="备注" align="center" prop="garRemark" />
-      <el-table-column label="取消原因" width="200px" align="center" prop="garReason" />
       <el-table-column label="是否取消" align="center" prop="garCancelFlag">
         <template slot-scope="scope">
           {{ computedCancelFlagString(scope.row.garCancelFlag).toString() }}
@@ -109,15 +108,14 @@
             type="date" value-format="yyyy-MM-dd" placeholder="选择订单创建时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注" prop="garRemark">
-          <el-input :disabled="true" v-model="form.garRemark" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="车子类型" prop="garOrderCarType">
+          <el-input :disabled="true" v-model="form.garOrderCarType" placeholder="请输入车子类型" />
         </el-form-item>
-
         <el-form-item label="车子数量" prop="garOrderCarNumber">
           <el-input :disabled="true" v-model="form.garOrderCarNumber" placeholder="请输入车子数量" />
         </el-form-item>
-        <el-form-item label="车子类型" prop="garOrderCarType">
-          <el-input :disabled="true" v-model="form.garOrderCarType" placeholder="请输入车子类型" />
+        <el-form-item label="备注" prop="garRemark">
+          <el-input :disabled="true" v-model="form.garRemark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item v-if="form.currentImages" label="现场图片" prop="currentImages">
           <el-image style="width: 100px; height: 100px" :src="form.currentImages[0]"
@@ -138,7 +136,6 @@
           <el-form-item label="派单负责人电话" prop="garOrderHandlerTel">
             <el-input v-model="form.garOrderHandleTel" placeholder="派单负责人电话" />
           </el-form-item>
-
           <el-form-item v-if="form.putOnImages" label="现场图片" prop="putOnImages">
             <el-image style="width: 100px; height: 100px" :src="form.putOnImages[0]" :preview-src-list="form.putOnImages">
             </el-image>
@@ -183,6 +180,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否显示弹出层
+      openEvaluate: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -290,8 +289,7 @@ export default {
         garHandlerEvaluateFlag: null
       };
       this.resetForm("form");
-    }
-    ,
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -15,16 +15,6 @@
           <el-option label="管理负责人" value="管理负责人" />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="garCreateTime">
-        <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.garCreateTime" type="date"
-          value-format="yyyy-MM-dd" placeholder="选择创建时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="修改时间" prop="garUpdateTime">
-        <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.garUpdateTime" type="date"
-          value-format="yyyy-MM-dd" placeholder="选择修改时间">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -32,12 +22,6 @@
     </el-form>
  
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['GarUser:GarUser:remove']">删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
  
@@ -57,13 +41,12 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="garRemark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column fixed="right" label="操作" width="200px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['GarUser:GarUser:remove']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="queryEvaluate(scope.row)"
+            v-hasPermi="['garbage:order:edit']">过往评价</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
  
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -158,6 +141,11 @@ export default {
     this.getList();
   },
   methods: {
+
+    queryEvaluate(row) {
+      this.open = true;
+      console.log(row);
+    },
     /** 查询建筑垃圾-用户列表 */
     getList() {
       this.loading = true;