仓库预发机弹窗

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/feign/RemoteKxsProductService.java

@@ -202,5 +202,5 @@ public interface RemoteKxsProductService {
 	 * @return {@link List}<{@link String}>
 	 */
 	@GetExchange("/machine/loadByPrePosBind30minute")
-	List<String> loadByPrePosBind30minute(@RequestHeader(SecurityConstants.FROM) String fromIn);
+	R<List<String>> loadByPrePosBind30minute(@RequestHeader(SecurityConstants.FROM) String fromIn);
 }

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/kxsapp/StoreController.java

@@ -7,6 +7,7 @@ import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.store.api.dto.kxsapp.store.StoreSearchListDTO;
 import com.kxs.store.api.model.KxsWarehouse;
 import com.kxs.store.api.vo.kxsapp.store.*;
+import com.kxs.store.biz.constant.enums.StoreStatusEnum;
 import com.kxs.store.biz.service.*;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -46,6 +47,7 @@ public class StoreController {
     public R isExistWhs() {
 
         return R.ok(kxsWarehouseService.count(Wrappers.<KxsWarehouse>lambdaQuery()
+                        .eq(KxsWarehouse::getWarehouseType, 2)
                 .eq(KxsWarehouse::getUserId, SecurityUtils.getUser().getId())));
     }
 

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineAdvanceServiceImpl.java

@@ -433,7 +433,8 @@ public class KxsMachineAdvanceServiceImpl extends ServiceImpl<KxsMachineAdvanceM
     @Override
     public List<String> userPrePosBindModal() {
 
-        List<String> sns = remoteKxsProductService.loadByPrePosBind30minute(SecurityConstants.FROM_IN);
+        R<List<String>> listR = remoteKxsProductService.loadByPrePosBind30minute(SecurityConstants.FROM_IN);
+        List<String> sns = listR.getData();
         if(!sns.isEmpty()){
             List<UserAdvanceListVO> advanceList = baseMapper.advanceUserList(SecurityUtils.getUser().getId());