Merge branch 'feature/eccs-upgrade' of lvjian/eccs into feature/eccs-upgrade

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbInveMngController.java

@@ -118,20 +118,6 @@ public class OWbInveMngController extends BaseController
     @PostMapping("/pullInveMng")
     public AjaxResult pullInveMng(PullInveQueryVO queryVO)
     {
-        logger.debug("前端请求参数 => {}", queryVO);
-        // 获取当前的用户
-        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        SysUser user = loginUser.getUser();
-
-        boolean allRole = RoleUtils.isAllRole(user);
-        logger.info("当前用户 {} 是否有所有权限 => {}", user.getUserName(), allRole);
-
-        // 根据当前登录用户部门查询所属商户
-        SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
-        // 获取当前商户号
-        String merchSn = sysDept.getMerchSn();
-        queryVO.setMerchId(merchSn);
-
         return oWbInveMngService.pullInveMng(queryVO);
     }
 

eccs-biz/src/main/java/com/emato/biz/controller/warehouse/OWbMerchShopInveController.java

@@ -117,15 +117,6 @@ public class OWbMerchShopInveController extends BaseController
     @PostMapping("/pullStoreInveMng")
     public AjaxResult pullStoreInveMng(PullInveQueryVO queryVO)
     {
-        // 获取当前的用户
-        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        SysUser user = loginUser.getUser();
-        // 根据当前登录用户部门查询所属商户
-        SysDept sysDept = sysDeptService.selectDeptById(user.getDeptId());
-        // 获取当前商户号
-        String merchSn = sysDept.getMerchSn();
-        queryVO.setMerchId(merchSn);
-
         return oWbMerchShopInveService.pullShopInve(queryVO);
     }
 

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbInveMngServiceImpl.java

@@ -83,42 +83,66 @@ public class OWbInveMngServiceImpl implements IOWbInveMngService
      */
     @Override
     public AjaxResult pullInveMng(PullInveQueryVO queryVO) {
-        // 声明页数
-        int page = 1;
-        // 处理查询参数
-        setQueryVO(queryVO, page, OmsConfig.getQuerySize());
-
-        // 声明处理数量
-        AtomicInteger rows = new AtomicInteger(0);
-        // 查询 OMS 分页数据
-        Optional<Page<OWbInveMng>> firstPageOpt =
-                OmsDataUtil.fetchOmsPageData(queryVO, OmsConfig.getQueryMngInveUrl(), OWbInveMng.class);
-
-        // 如果有数据
-        firstPageOpt.ifPresent(firstPage -> {
-            // 插入数据库
-            firstPage.getList().stream().forEach(obj -> {
-                // 插入数据库
-                wbInveMngMapper.saveOrUpdate(obj);
-                // 处理数据条数加 1
-                rows.getAndIncrement();
-            });
+        log.info("拉取库存开始 => {}", queryVO);
+        try {
+            // 声明页数
+            int page = 1;
+
+            // 获取登录用户
+            SysUser user = SecurityUtils.getLoginUser().getUser();
+            boolean allRole = RoleUtils.isAllRole(user);
+            if (!allRole) {
+                // 如果不是所有数据权限，查询商户用户表，设置拉取的商户
+                // 查询该用户属于哪个商户
+                MerchUser merchUser = merchUserMapper.selectMerchUserByUserId(user.getUserId()+"");
+                if (Objects.isNull(merchUser)) {
+                    // 如果用户没有绑定商户就返回空数据
+                    return AjaxResult.success("没有库存可以拉取!");
+                }
+                // 设置商户
+                queryVO.setMerchId(merchUser.getMerchSn());
+            }
+
+            // 处理查询参数
+            setQueryVO(queryVO, page, OmsConfig.getQuerySize());
+
+            // 声明处理数量
+            AtomicInteger rows = new AtomicInteger(0);
+            // 查询 OMS 分页数据
+            Optional<Page<OWbInveMng>> firstPageOpt =
+                    OmsDataUtil.fetchOmsPageData(queryVO, OmsConfig.getQueryMngInveUrl(), OWbInveMng.class);
 
-            for(int pageNum = page + 1; pageNum <= firstPage.getTotalPage(); pageNum++) {
-                log.debug("当前拉取的页数 => {}", pageNum);
-                queryVO.setPage(pageNum);
-                // 分页拉取远程数据
-                Optional<Page<OWbInveMng>> pageOpt = OmsDataUtil.fetchOmsPageData(queryVO, OmsConfig.getQueryMngInveUrl(), OWbInveMng.class);
-                pageOpt.get().getList().forEach(obj -> {
+            // 如果有数据
+            firstPageOpt.ifPresent(firstPage -> {
+                // 插入数据库
+                firstPage.getList().stream().forEach(obj -> {
+                    // 插入数据库
                     wbInveMngMapper.saveOrUpdate(obj);
+                    // 处理数据条数加 1
                     rows.getAndIncrement();
                 });
-            }
 
-        });
+                for(int pageNum = page + 1; pageNum <= firstPage.getTotalPage(); pageNum++) {
+                    log.debug("当前拉取的页数 => {}", pageNum);
+                    queryVO.setPage(pageNum);
+                    // 分页拉取远程数据
+                    Optional<Page<OWbInveMng>> pageOpt = OmsDataUtil.fetchOmsPageData(queryVO, OmsConfig.getQueryMngInveUrl(), OWbInveMng.class);
+                    pageOpt.get().getList().forEach(obj -> {
+                        wbInveMngMapper.saveOrUpdate(obj);
+                        rows.getAndIncrement();
+                    });
+                }
 
-        log.debug("拉取库存成功，拉取数据条数 => {}", rows.get());
-        return AjaxResult.success("拉取库存成功!");
+            });
+
+            log.debug("拉取库存成功，拉取数据条数 => {}", rows.get());
+            return AjaxResult.success("拉取库存成功!");
+        } catch(ServiceException se){
+            throw se;
+        } catch (Exception e) {
+            log.error("拉取库存异常 => ", e);
+            return AjaxResult.error("拉取库存异常!");
+        }
     }
 
     /**

eccs-biz/src/main/java/com/emato/biz/service/impl/OWbMerchShopInveServiceImpl.java

@@ -70,46 +70,68 @@ public class OWbMerchShopInveServiceImpl implements IOWbMerchShopInveService
      */
     @Override
     public AjaxResult pullShopInve(PullInveQueryVO queryVO) {
-        log.debug("queryVO => {}", queryVO);
+        log.info("拉取门店库存开始 => {}", queryVO);
+        try {
+            // 声明页数
+            int page = 1;
+
+            // 获取登录用户
+            SysUser user = SecurityUtils.getLoginUser().getUser();
+            boolean allRole = RoleUtils.isAllRole(user);
+            if (!allRole) {
+                // 如果不是所有数据权限，查询商户用户表，设置拉取的商户
+                // 查询该用户属于哪个商户
+                MerchUser merchUser = merchUserMapper.selectMerchUserByUserId(user.getUserId()+"");
+                if (Objects.isNull(merchUser)) {
+                    // 如果用户没有绑定商户就返回空数据
+                    return AjaxResult.success("没有库存可以拉取!");
+                }
+                // 设置商户
+                queryVO.setMerchId(merchUser.getMerchSn());
+            }
 
-        // 声明页数
-        int page = 1;
-        // 处理查询参数
-        setQueryVO(queryVO, page, OmsConfig.getQuerySize());
-
-        // 处理数量
-        AtomicInteger rows = new AtomicInteger(0);
-        // 查询 OMS 分页数据
-        Optional<Page<OWbMerchShopInve>> firstPageOpt =
-                OmsDataUtil.fetchOmsPageData(queryVO, OmsConfig.getQueryShopMngInveUrl(), OWbMerchShopInve.class);
-
-        // 如果有数据
-        firstPageOpt.ifPresent(firstPage -> {
-            // 如果有数据，开始批量处理
-            firstPage.getList().forEach(obj -> log.debug("拉取的 sku => {}", obj.getSku()));
-            // 插入数据库
-            firstPage.getList().stream().forEach(obj -> {
-                // 插入数据库
-                //wbMerchShopInveMapper.saveOrUpdate(obj);
-                // 处理数据条数加 1
-                rows.getAndIncrement();
-            });
+            // 处理查询参数
+            setQueryVO(queryVO, page, OmsConfig.getQuerySize());
+
+            // 处理数量
+            AtomicInteger rows = new AtomicInteger(0);
+            // 查询 OMS 分页数据
+            Optional<Page<OWbMerchShopInve>> firstPageOpt =
+                    OmsDataUtil.fetchOmsPageData(queryVO, OmsConfig.getQueryShopMngInveUrl(), OWbMerchShopInve.class);
 
-            /*for(int pageNum = page+1; pageNum <= firstPage.getTotalPage(); pageNum++) {
-                log.debug("当前拉取的页数 => {}", pageNum);
-                queryVO.setPage(pageNum);
-                // 分页拉取远程数据
-                Optional<Page<OWbMerchShopInve>> pageOpt = OmsDataUtil.fetchOmsPageData(queryVO, OmsConfig.getQueryShopMngInveUrl(), OWbMerchShopInve.class);
-                pageOpt.get().getList().forEach(obj -> {
-                    wbMerchShopInveMapper.saveOrUpdate(obj);
+            // 如果有数据
+            firstPageOpt.ifPresent(firstPage -> {
+                // 如果有数据，开始批量处理
+                firstPage.getList().forEach(obj -> log.debug("拉取的 sku => {}", obj.getSku()));
+                // 插入数据库
+                firstPage.getList().stream().forEach(obj -> {
+                    // 插入数据库
+                    //wbMerchShopInveMapper.saveOrUpdate(obj);
+                    // 处理数据条数加 1
                     rows.getAndIncrement();
                 });
-            }*/
 
-        });
+                for(int pageNum = page+1; pageNum <= firstPage.getTotalPage(); pageNum++) {
+                    log.debug("当前拉取的页数 => {}", pageNum);
+                    queryVO.setPage(pageNum);
+                    // 分页拉取远程数据
+                    Optional<Page<OWbMerchShopInve>> pageOpt = OmsDataUtil.fetchOmsPageData(queryVO, OmsConfig.getQueryShopMngInveUrl(), OWbMerchShopInve.class);
+                    pageOpt.get().getList().forEach(obj -> {
+                        wbMerchShopInveMapper.saveOrUpdate(obj);
+                        rows.getAndIncrement();
+                    });
+                }
+
+            });
 
-        log.debug("拉取门店库存成功，拉取数据条数 => {}", rows.get());
-        return AjaxResult.success("拉取门店库存成功!");
+            log.debug("拉取门店库存成功，拉取数据条数 => {}", rows.get());
+            return AjaxResult.success("拉取门店库存成功!");
+        } catch(ServiceException se) {
+            throw se;
+        } catch (Exception e) {
+            log.error("拉取门店库存异常 => ", e);
+            return AjaxResult.error("拉取库存异常!");
+        }
     }
 
     /**

eccs-biz/src/main/java/com/emato/biz/util/OmsDataUtil.java

@@ -69,7 +69,7 @@ public class OmsDataUtil {
                     .body();
         } catch (Exception e) {
             log.error("请求 OMS 异常 => ", e);
-            throw new ServiceException("请求 OMS 异常!");
+            throw new ServiceException("请求 OMS 超时!");
         }
         log.debug("OMS 响应信息 => {}", body);
 

eccs-ui/src/views/warehouse/invemng/index.vue

@@ -243,10 +243,6 @@
     <el-dialog title="拉取库存" :visible.sync="pullDialog" width="500px" append-to-body>
       <el-form ref="pullForm" :model="pullForm" :rules="rules" label-width="80px">
 
-        <el-form-item label="商户编号" prop="merchId">
-          <el-input v-model="pullForm.merchId" placeholder="请输入商户编号" />
-        </el-form-item>
-
         <el-form-item label="SKU" prop="sku">
           <el-input v-model="pullForm.sku" placeholder="请输入SKU" />
         </el-form-item>
@@ -359,7 +355,6 @@ export default {
      */
     resetPullForm() {
       this.pullForm = {
-        merchId: null,
         sku: null
       };
       this.resetForm("pullForm");