Accept Merge Request #105: (dev-xwt -> dev-test)

Merge Request: 管理端不允许将订单转给其他站点骑手

Created By: @夏文涛
Accepted By: @夏文涛
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/105?initial=true

src/main/java/com/sqx/modules/app/service/UserService.java

@@ -41,7 +41,6 @@ public interface UserService extends IService<UserEntity> {
     /**
      * 根据手机号和用户类型查询用户
      * @param phone  手机号
-     * @param type  用户类型
      * @return
      */
     UserEntity queryByPhoneAndType(String phone);

src/main/java/com/sqx/modules/errand/controller/TbIndentController.java

@@ -137,11 +137,25 @@ public class TbIndentController {
                 return Result.error("商家配送不允许转单！");
             }
         }
+
         if (!"3".equals(indent.getIndentState()) && !"4".equals(indent.getIndentState())) {
             throw new SqxException("订单状态发生变更，请刷新后重试！");
         }
 
+        UserEntity indentuserEntity = userService.selectUserById(indent.getRiderUserId());
+        if(indentuserEntity == null){
+            throw new SqxException("订单骑手已失效，无法发起转单！");
+        }
+
         UserEntity userEntity = userService.selectUserById(riderUserId);
+        if(userEntity == null){
+            throw new SqxException("被转单骑手已失效，无法发起转单！");
+        }
+
+        if(userEntity.getRiderStationId().intValue() != indentuserEntity.getRiderStationId().intValue()){
+            throw new SqxException("无法选择其他站点骑手进行转单操作！");
+        }
+
         CommonInfo one1 = commonInfoService.findOne(273);
         Double cashDeposit = Double.parseDouble(one1.getValue());
         if(userEntity.getCashDeposit().doubleValue()<cashDeposit){