需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CommonMapper.java

@@ -50,6 +50,8 @@ public interface CommonMapper {
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<WebsitVO> websitList(
+            @Param("rice") Integer rice,
+            @Param("websitName") String websitName,
             @Param("lng") String lng,
             @Param("lat") String lat,
             @Param("websitIds") List<String> websitIds,

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -238,9 +238,11 @@ public class UserController {
             @RequestParam(required = false) List<String> examineStatus,
             @ApiParam(value = "增值服务ID",required = false) @RequestParam(required = false) String increId,
             @ApiParam(value = "经度",required = false) @RequestParam(required = false) String lng,
-            @ApiParam(value = "纬度",required = false) @RequestParam(required = false) String lat
+            @ApiParam(value = "纬度",required = false) @RequestParam(required = false) String lat,
+            @ApiParam(value = "单位米，距离",required = false) @RequestParam(required = false) Integer rice,
+            @ApiParam(value = "网点名称",required = false) @RequestParam(required = false) String websitName
     ){
-        List<AdminWebsitApplyBean> adminWebsitApplyBeans = userLogic.websitList(isAll,increId,isIncre,lng,lat,examineStatus);
+        List<AdminWebsitApplyBean> adminWebsitApplyBeans = userLogic.websitList(rice,websitName,isAll,increId,isIncre,lng,lat,examineStatus);
         return ResponseHelper.success(adminWebsitApplyBeans);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1164,7 +1164,7 @@ public class UserLogic {
      *
      * @return
      */
-    public List<AdminWebsitApplyBean> websitList(Boolean isAll, String increId, Boolean isIncre, String lng, String lat,List<String> examineStatus) {
+    public List<AdminWebsitApplyBean> websitList(Integer rice,String websitName,Boolean isAll, String increId, Boolean isIncre, String lng, String lat,List<String> examineStatus) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
 //        List<AdminWebsit> list = adminWebsitService.lambdaQuery()
 //                .eq(AdminWebsit::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
@@ -1219,7 +1219,7 @@ public class UserLogic {
 
         }
 
-        List<WebsitVO> list = commonMapper.websitList(lng, lat, websitIds,websitIdsQuchu, isIncre, currentCompanyWechat.getCompanyWechatId());
+        List<WebsitVO> list = commonMapper.websitList(rice,websitName,lng, lat, websitIds,websitIdsQuchu, isIncre, currentCompanyWechat.getCompanyWechatId());
 
         List<AdminWebsitApplyBean> adminWebsitApplyBeans = BeanUtil.copyToList(list, AdminWebsitApplyBean.class);
         for (AdminWebsitApplyBean bean : adminWebsitApplyBeans) {

mall-miniapp-service/src/main/resources/mapper/CommonMapper.xml

@@ -79,6 +79,9 @@
             <if test="isIncre != null">
                 and a.is_incre = #{isIncre}
             </if>
+        <if test="websitName != null and websitName != ''">
+            AND a.name LIKE  CONCAT('%', #{websitName},'%')
+        </if>
             <if test="websitIds != null and websitIds.size > 0">
                 AND a.websit_id IN
                 <foreach item="item" index="index" collection="websitIds" open="(" separator="," close=")">
@@ -94,7 +97,7 @@
 
             and a.company_wechat_id = #{companyWechatId}
         <if test="websitIdsQuchu != null and websitIdsQuchu.size > 0 and lng != '0'.toString() and lat != '0'.toString()">
-            HAVING distance &lt; 50000
+            HAVING distance &lt; #{rice}
         </if>
         ORDER BY distance
     </select>