修复仓库申请机具接口

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

@@ -105,8 +105,7 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
 
         Long userId = SecurityUtils.getUser().getId();
         //订单号
-        Snowflake snowflake = IdUtil.getSnowflake(1, userId);
-        long orderSn = snowflake.nextId();
+        String orderSn = IdUtil.getSnowflakeNextIdStr();
 
         KxsMachineApply order = new KxsMachineApply();
         BeanUtils.copyProperties(param, order);
@@ -290,8 +289,7 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
         //虚拟仓库ID
         Integer whsId = ParamResolver.getInteger("GD_VHOST_STORE_ID", 8664);
         //订单号
-        Snowflake snowflake = IdUtil.getSnowflake(1, userId);
-        long orderSn = snowflake.nextId();
+        String orderSn = IdUtil.getSnowflakeNextIdStr();
 
         KxsMachineApply order = new KxsMachineApply();
         BeanUtils.copyProperties(param, order);

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

@@ -206,8 +206,7 @@ public class KxsMachineRecycleServiceImpl extends ServiceImpl<KxsMachineRecycleM
         }
         BeanUtils.copyProperties(param, machineRecycle);
         //订单号
-        Snowflake snowflake = IdUtil.getSnowflake(1, userId);
-        long orderSn = snowflake.nextId();
+        String orderSn = IdUtil.getSnowflakeNextIdStr();
         machineRecycle.setOrderSn("JJHS" + orderSn);
 
         machineRecycle.setUserId(userId.intValue());

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

@@ -99,8 +99,7 @@ public class KxsWarehouseMachineApplyServiceImpl extends ServiceImpl<KxsWarehous
         }
 
         //订单号
-        Snowflake snowflake = IdUtil.getSnowflake(1, userId);
-        long orderSn = snowflake.nextId();
+        String orderSn = IdUtil.getSnowflakeNextIdStr();
 
         KxsWarehouseMachineApply kxsWarehouseMachineApply = new KxsWarehouseMachineApply();
         kxsWarehouseMachineApply.setUserId(userId.intValue());

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

@@ -75,8 +75,8 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
     @Override
     public List<StoreListVO> userStoreList(Integer reqType) {
         Long userId = SecurityUtils.getUser().getId();
-        List<StoreListVO> storeListVOS = baseMapper.userStoreList(userId);
-        for (StoreListVO storeListVO : storeListVOS) {
+        List<StoreListVO> storeList = baseMapper.userStoreList(userId);
+        for (StoreListVO storeListVO : storeList) {
             if(reqType == 0){
                 //待发货
                 Long unSendCount = kxsMachineApplyMapper.selectCount(Wrappers.<KxsMachineApply>lambdaQuery()
@@ -94,7 +94,7 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
                 storeListVO.setPrePosNum(preMachineCount.intValue());
             }
         }
-        return storeListVOS;
+        return storeList;
     }
 
     @Override

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsWarehouseMapper.xml

@@ -60,6 +60,7 @@
         from kxs_warehouse
         where user_id = #{userId}
           and del_flag = 0
+          and brand_id > 0
           and  warehouse_type < 2
     </select>