打卡查询店铺时，根据当前位置查询店铺/全国查询（前200条）

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/PromotionStoreDaoImpl.java

@@ -57,7 +57,7 @@ public class PromotionStoreDaoImpl implements PromotionStoreDao {
     @Override
     public List<PromotionStoreDto> findList(PromotionStoreWrapper promotionStoreWrapper) {
         LambdaQueryWrapper<PromotionStoreDO> qw = buildWrapper(promotionStoreWrapper);
-        qw.select(PromotionStoreDO::getStoreName,PromotionStoreDO::getId);
+        qw.select(PromotionStoreDO::getStoreName,PromotionStoreDO::getId).last("limit 200");
 
         List<PromotionStoreDO> promotionStoreDOS = promotionStoreMapper.selectList(qw);
         return transitionDtos(promotionStoreDOS);
@@ -97,9 +97,18 @@ public class PromotionStoreDaoImpl implements PromotionStoreDao {
 
     private LambdaQueryWrapper<PromotionStoreDO> buildWrapper(PromotionStoreWrapper promotionStoreWrapper){
         LambdaQueryWrapper<PromotionStoreDO> lqw = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(promotionStoreWrapper.getProvince())){
+            lqw.eq(PromotionStoreDO::getProvince,promotionStoreWrapper.getProvince());
+        }
+        if (StringUtils.isNotBlank(promotionStoreWrapper.getCity())){
+            lqw.eq(PromotionStoreDO::getCity,promotionStoreWrapper.getCity());
+        }
         if (StringUtils.isNotBlank(promotionStoreWrapper.getArea())){
             lqw.eq(PromotionStoreDO::getArea,promotionStoreWrapper.getArea());
         }
+        if (StringUtils.isNotBlank(promotionStoreWrapper.getStoreNameLike())){
+            lqw.like(PromotionStoreDO::getStoreName,promotionStoreWrapper.getStoreNameLike());
+        }
         return lqw;
     }
 

src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/PromotionStoreWrapper.java

@@ -16,13 +16,9 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class PromotionStoreWrapper {
     Long id;
-
-    /**
-     * 区域
-     * 例：顺义区
-     */
+    private String province;
+    private String city;
     private String area;
-
     private String storeNameLike;
     private String storeName;
 }

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/vo/PromotionStoreVo.java

@@ -15,10 +15,8 @@ import lombok.experimental.Accessors;
 @AllArgsConstructor
 @Accessors(chain = true)
 public class PromotionStoreVo {
-    /**
-     * 区域
-     * 例：顺义区
-     */
+    private String province;
+    private String city;
     private String area;
 
     private String storeNameLike;

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/PromotionStoreQueryServiceImpl.java

@@ -26,7 +26,16 @@ public class PromotionStoreQueryServiceImpl implements PromotionStoreQueryServic
     public List<PromotionStoreDto> findStoreList(PromotionStoreVo promotionStoreVo) {
         PromotionStoreWrapper promotionStoreWrapper = new PromotionStoreWrapper();
         promotionStoreWrapper.setStoreNameLike(promotionStoreVo.getStoreNameLike());
-        promotionStoreWrapper.setArea("全国".equals(promotionStoreVo.getArea()) ? "" : promotionStoreVo.getArea());
+
+        if ("全国".equals(promotionStoreVo.getArea())){
+            promotionStoreWrapper.setProvince("");
+            promotionStoreWrapper.setCity("");
+            promotionStoreWrapper.setArea("");
+        }else {
+            promotionStoreWrapper.setProvince(promotionStoreVo.getProvince());
+            promotionStoreWrapper.setCity(promotionStoreVo.getCity());
+            promotionStoreWrapper.setArea(promotionStoreVo.getArea());
+        }
 
         return promotionStoreDao.findList(promotionStoreWrapper);
     }