Accept Merge Request #107: (dev-lzl -> dev-test)

Merge Request: 修改骑手查看可接订单

Created By: @刘子麟
Accepted By: @刘子麟
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/107?initial=true

src/main/java/com/sqx/modules/errand/dto/WaitForAcceptOrderQueryDTO.java

@@ -41,5 +41,6 @@ public class WaitForAcceptOrderQueryDTO extends PageQuery {
     private Double distances;
 
     @ApiModelProperty(value = "接单城市", hidden = true)
+    @NotNull(message = "接单城市不能为空")
     private String city;
 }

src/main/java/com/sqx/modules/errand/service/impl/TbIndentServiceImpl.java

@@ -575,8 +575,8 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
             queryDTO.setDistances(Double.valueOf(one.getValue()));
             indent = baseMapper.findNewIndentByDistances(pages, queryDTO);
         } else {
-            String city = getCurrentCityByLngAndLat(queryDTO.getRiderLng(), queryDTO.getRiderLat());
-            queryDTO.setCity(city);
+//            String city = getCurrentCityByLngAndLat(queryDTO.getRiderLng(), queryDTO.getRiderLat());
+//            queryDTO.setCity(city);
 
             indent = baseMapper.findNewIndentByCity(pages, queryDTO);
         }
@@ -599,8 +599,8 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
             queryDTO.setDistances(Double.valueOf(one.getValue()));
             indent = baseMapper.findNewIndentByDistancesGroupByShop(pages, queryDTO);
         } else {
-            String city = getCurrentCityByLngAndLat(queryDTO.getRiderLng(), queryDTO.getRiderLat());
-            queryDTO.setCity(city);
+//            String city = getCurrentCityByLngAndLat(queryDTO.getRiderLng(), queryDTO.getRiderLat());
+//            queryDTO.setCity(city);
 
             indent = baseMapper.findNewIndentByCityGroupByShop(pages, queryDTO);
         }
@@ -656,6 +656,7 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
                     city = addressComponent.getString("city");
                 }
             }
+
         } catch (Exception e) {
             throw new SqxException("获取当前用户位置失败，失败原因：【" + e.getMessage() + "】");
         }

src/main/resources/application.yml

@@ -21,7 +21,7 @@ spring:
     allow-circular-references: true
   # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: prod
   # jackson时间格式化
   jackson:
     time-zone: GMT+8