feat:类型不选择时预约最近的门店

oddfar · Aug 19, 2023 · 8e2373c · 8e2373c
1 parent ef26997
commit 8e2373c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,4 +38,6 @@ build/
 
 ~/
 ### mac ###
-.DS_Store
+.DS_Store
+
+.flattened-pom.xml
diff --git a/campus-modular/src/main/java/com/oddfar/campus/business/controller/IUserController.java b/campus-modular/src/main/java/com/oddfar/campus/business/controller/IUserController.java
@@ -63,12 +63,15 @@ public R sendCode(String mobile, String deviceId) {
     @PreAuthorize("@ss.resourceAuth()")
     public R reservation(String mobile) {
         IUser user = iUserMapper.selectById(mobile);
-        if (user == null || StringUtils.isEmpty(user.getItemCode())) {
-            return R.error("用户不存在或配置不对");
-        } else {
-            imtService.reservation(user);
-            return R.ok();
+        if (user == null) {
+            return R.error("用户不存在");
         }
+        if (StringUtils.isEmpty(user.getItemCode())) {
+            return R.error("商品预约code为空");
+        }
+
+        imtService.reservation(user);
+        return R.ok();
     }
 
     /**

diff --git a/campus-modular/src/main/java/com/oddfar/campus/business/entity/IUser.java b/campus-modular/src/main/java/com/oddfar/campus/business/entity/IUser.java
@@ -97,7 +97,7 @@ public class IUser extends BaseEntity {
     private String randomMinute;
 
     /**
-     * 类型
+     * 类型(1：预约本市出货量最大的门店，2：预约你的位置附近门店)
      */
     private int shopType;
 

diff --git a/campus-modular/src/main/java/com/oddfar/campus/business/mapper/IUserMapper.java b/campus-modular/src/main/java/com/oddfar/campus/business/mapper/IUserMapper.java
@@ -42,11 +42,11 @@ default PageResult<IUser> selectPage(IUser iUser, Long userId) {
 
     default List<IUser> selectReservationUser() {
         return selectList(new LambdaQueryWrapperX<IUser>()
-//                .gt(IUser::getExpireTime, new Date())
-                .ne(IUser::getLat, "")
-                .ne(IUser::getLng, "")
-                .ne(IUser::getShopType, "")
-                .ne(IUser::getItemCode, "")
+//                      .gt(IUser::getExpireTime, new Date())
+                        .ne(IUser::getLat, "")
+                        .ne(IUser::getLng, "")
+                        .ne(IUser::getItemCode, "")
+                        .isNotNull(IUser::getItemCode)
 
         );
 
@@ -57,12 +57,12 @@ default List<IUser> selectReservationUser() {
      */
     default List<IUser> selectReservationUserByMinute(int minute) {
         return selectList(new LambdaQueryWrapperX<IUser>()
-                .eq(IUser::getMinute, minute)
-//                .gt(IUser::getExpireTime, new Date())
-                .ne(IUser::getLat, "")
-                .ne(IUser::getLng, "")
-                .ne(IUser::getShopType, "")
-                .ne(IUser::getItemCode, "")
+                        .eq(IUser::getMinute, minute)
+//                      .gt(IUser::getExpireTime, new Date())
+                        .ne(IUser::getLat, "")
+                        .ne(IUser::getLng, "")
+                        .ne(IUser::getItemCode, "")
+                        .isNotNull(IUser::getItemCode)
         );
     }
 

diff --git a/campus-modular/src/main/java/com/oddfar/campus/business/service/impl/IShopServiceImpl.java b/campus-modular/src/main/java/com/oddfar/campus/business/service/impl/IShopServiceImpl.java
@@ -129,7 +129,13 @@ public void refreshItem() {
 
     @Override
     public IShop selectByIShopId(String iShopId) {
-        return iShopMapper.selectOne(IShop::getIShopId,iShopId);
+        List<IShop> iShopList = iShopMapper.selectList("i_shop_id", iShopId);
+        if (iShopList != null && iShopList.size() > 0) {
+            return iShopList.get(0);
+        } else {
+            return null;
+        }
+//        return iShopMapper.selectOne(IShop::getIShopId, iShopId);
     }
 
     @Override
@@ -198,15 +204,18 @@ public String getShopId(int shopType, String itemId, String province, String cit
                 //本市没有则预约本省最近的
                 shopId = getMinDistanceShopId(list, province, lat, lng);
             }
-        }
-
-        if (shopType == 2) {
-            // 预约本省距离最近的门店
+        } else {
+            //预约本省距离最近的门店
             shopId = getMinDistanceShopId(list, province, lat, lng);
         }
 
-        if (StringUtils.isEmpty(shopId)){
+//        if (shopType == 2) {
+//            // 预约本省距离最近的门店
+//            shopId = getMinDistanceShopId(list, province, lat, lng);
+//        }
 
+        if (StringUtils.isEmpty(shopId)) {
+            throw new ServiceException("申购时根据类型获取的门店商品id为空");
         }
 
 

diff --git a/vue_campus_admin/src/views/imt/user/index.vue b/vue_campus_admin/src/views/imt/user/index.vue
@@ -651,7 +651,6 @@ export default {
         address: null,
         lat: null,
         lng: null,
-        shopType: null,
         jsonResult: null,
         createTime: null,
         minute: 5,