装修垃圾清运取消普通用户，只让投放点管理员登录；新增接收量字段

2c2c2c
1 parent b825e66e
Showing 7 changed files with 72 additions and 10 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderMatchAsk.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AskTransportDto.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-unit/src/main/java/com/trash/dropPointInfo/mapper/DropPointInfoMapper.java
trash-unit/src/main/java/com/trash/dropPointInfo/service/IDropPointInfoService.java
trash-unit/src/main/java/com/trash/dropPointInfo/service/impl/DropPointInfoServiceImpl.java
trash-unit/src/main/resources/mapper/unit/DropPointInfoMapper.xml
@@ -38,6 +38,7 @@ public class GarOrderMatchAsk implements Serializable {
     private String garOrderHandlerTel;
     private Double garCarryingWeight;
  
+    private Double garReceptionQuantity;
     /**
      * 
      */
@@ -213,4 +214,12 @@ public class GarOrderMatchAsk implements Serializable {
     public void setGarCarryingWeight(Double garCarryingWeight) {
         this.garCarryingWeight = garCarryingWeight;
     }
+
+    public Double getGarReceptionQuantity() {
+        return garReceptionQuantity;
+    }
+
+    public void setGarReceptionQuantity(Double garReceptionQuantity) {
+        this.garReceptionQuantity = garReceptionQuantity;
+    }
 }
 \ No newline at end of file
@@ -20,6 +20,8 @@ public class AskTransportDto {
     private String garOrderHandlerId;
     @NotNull(message = "车辆载重不能为空")
     private Double garCarryingWeight;
+    @NotNull(message = "接收量不能为空")
+    private Double garReceptionQuantity;
     @NotBlank(message = "垃圾类型不能为空")
     private String garOrderTrashType;
     @NotBlank(message = "车牌号不能为空")
@@ -132,4 +134,12 @@ public class AskTransportDto {
     public void setGarOrderContainerVolume(String garOrderContainerVolume) {
         this.garOrderContainerVolume = garOrderContainerVolume;
     }
+
+    public Double getGarReceptionQuantity() {
+        return garReceptionQuantity;
+    }
+
+    public void setGarReceptionQuantity(Double garReceptionQuantity) {
+        this.garReceptionQuantity = garReceptionQuantity;
+    }
 }
@@ -18,6 +18,8 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
  
+import com.trash.dropPointInfo.domain.DropPointInfo;
+import com.trash.dropPointInfo.service.IDropPointInfoService;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -97,6 +99,8 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Autowired
     private ITransportationEnterpriseService enterpriseService;
  
+    @Autowired
+    private IDropPointInfoService dropPointInfoService;
  
     @Resource
     private RedisCache redisCache;
@@ -134,12 +138,23 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
         GarUser nUser = this.getOne(qw);
         if (Objects.isNull(nUser)) {
-            // 不存在就创建用户
-            nUser = new GarUser();
-            nUser.setGarUserTel(loginDto.getTel());
-            nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
-            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
-            this.save(nUser);
+            // 不存在就创建用户,普通用户暂时关闭注册
+//            nUser = new GarUser();
+//            nUser.setGarUserTel(loginDto.getTel());
+//            nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
+//            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
+//            this.save(nUser);
+            //不存在，则查询是否是投放点用户
+            List<DropPointInfo> list = dropPointInfoService.selectDropPointInfoListByPhone(loginDto.getTel());
+            if (CollectionUtil.isNotEmpty(list)) {
+                nUser = new GarUser();
+                nUser.setGarUserTel(loginDto.getTel());
+                nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
+                nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
+                this.save(nUser);
+            }else{
+                throw new UsernameNotFoundException("当前用户不存在!");
+            }
         }
         LoginUser loginUser = new LoginUser();
         ArrayList<SimpleGrantedAuthority> authorities = new ArrayList<SimpleGrantedAuthority>();
@@ -28,6 +28,13 @@ public interface DropPointInfoMapper
     List<DropPointInfo> selectDropPointInfoList(DropPointInfo dropPointInfo);
  
     /**
+     *  根据管理员手机号查询投放点信息管理列表
+     * @param custodianPhone 管理员手机号
+     * @return 结果
+     */
+    List<DropPointInfo> selectDropPointInfoListByPhone(String custodianPhone);
+
+    /**
      * 新增投放点信息管理
      * 
      * @param dropPointInfo 投放点信息管理
@@ -28,6 +28,13 @@ public interface IDropPointInfoService
     List<DropPointInfo> selectDropPointInfoList(DropPointInfo dropPointInfo);
  
     /**
+     *  根据管理员手机号查询投放点信息管理列表
+     * @param custodianPhone 管理员手机号
+     * @return 结果
+     */
+    List<DropPointInfo> selectDropPointInfoListByPhone(String custodianPhone);
+
+    /**
      * 新增投放点信息管理
      * 
      * @param dropPointInfo 投放点信息管理
 package com.trash.dropPointInfo.service.impl;
  
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
  
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
@@ -63,6 +60,17 @@ public class DropPointInfoServiceImpl implements IDropPointInfoService
     }
  
     /**
+     *  根据管理员手机号查询投放点信息管理列表
+     * @param custodianPhone 管理员手机号
+     * @return 结果
+     */
+    @Override
+    public List<DropPointInfo> selectDropPointInfoListByPhone(String custodianPhone) {
+        return dropPointInfoMapper.selectDropPointInfoListByPhone(custodianPhone);
+    }
+
+
+    /**
      * 新增投放点信息管理
      * 
      * @param dropPointInfo 投放点信息管理
@@ -60,6 +60,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		</where>
 	</select>
  
+	<select id="selectDropPointInfoListByPhone" parameterType="String"
+			resultMap="DropPointInfoResult">
+		<include refid="selectDropPointInfoVo" />
+		where custodian_phone = #{custodianPhone}
+	</select>
+
 	<select id="selectDropPointInfoById" parameterType="Long"
 		resultMap="DropPointInfoResult">
 		<include refid="selectDropPointInfoVo" />