修改bug+国内站修改

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/admin/AdminEnquiryController.java

@@ -20,14 +20,17 @@ import com.slodon.b2b2c.model.member.advich.MemberEnquiryTrackModel;
 import com.slodon.b2b2c.model.seller.StoreModel;
 import com.slodon.b2b2c.model.seller.StoreNameModel;
 import com.slodon.b2b2c.model.seller.VendorModel;
+import com.slodon.b2b2c.model.seller.VendorResourcesModel;
 import com.slodon.b2b2c.model.system.AdminModel;
 import com.slodon.b2b2c.model.system.SystemResourceModel;
 import com.slodon.b2b2c.seller.example.StoreExample;
 import com.slodon.b2b2c.seller.example.StoreNameExample;
 import com.slodon.b2b2c.seller.example.VendorExample;
+import com.slodon.b2b2c.seller.example.VendorResourcesExample;
 import com.slodon.b2b2c.seller.pojo.Store;
 import com.slodon.b2b2c.seller.pojo.StoreName;
 import com.slodon.b2b2c.seller.pojo.Vendor;
+import com.slodon.b2b2c.seller.pojo.VendorResources;
 import com.slodon.b2b2c.system.example.AdminExample;
 import com.slodon.b2b2c.system.example.SystemResourceExample;
 import com.slodon.b2b2c.system.pojo.Admin;
@@ -84,6 +87,9 @@ public class AdminEnquiryController extends BaseController {
     @Resource
     private SystemResourceModel systemResourceModel;
 
+    @Resource
+    private VendorResourcesModel vendorResourcesModel;
+
     /**
      * 询盘管理列表
      *
@@ -146,12 +152,19 @@ public class AdminEnquiryController extends BaseController {
         } else {
             VendorExample vendorExample = new VendorExample();
             vendorExample.setStoreId(storeId);
-            vendorExample.setIsStoreAdmin(VendorConst.IS_STORE_ADMIN_1);
             vendorExample.setIsAllowLogin(VendorConst.IS_ALLOW_LOGIN);
             List<Vendor> vendorList = vendorModel.getVendorList(vendorExample, null);
             vendorList.forEach(vendor -> {
-                EnquiryVendorVO vo = new EnquiryVendorVO(vendor);
-                vos.add(vo);
+                //查询角色资源对应表,获取该角色拥有的资源列表
+                VendorResourcesExample resourceExample = new VendorResourcesExample();
+                resourceExample.setRoleId(vendor.getRolesId());
+                resourceExample.setGrade(AdminConst.RESOURCE_GRADE_3);
+                resourceExample.setContent("询盘管理");
+                resourceExample.setOrderBy("resource_id asc");
+                List<VendorResources> resourceRoleList = vendorResourcesModel.getVendorResourcesList(resourceExample, null);
+                if (!CollectionUtils.isEmpty(resourceRoleList)) {
+                    vos.add(new EnquiryVendorVO(vendor));
+                }
             });
         }
         return SldResponse.success(new PageVO<>(vos, null));

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerStoreController.java

@@ -3,6 +3,7 @@ package com.slodon.b2b2c.controller.seller.seller;
 import com.slodon.b2b2c.aop.VendorLogger;
 import com.slodon.b2b2c.core.constant.StoreConst;
 import com.slodon.b2b2c.core.controller.BaseController;
+import com.slodon.b2b2c.core.exception.MallException;
 import com.slodon.b2b2c.core.response.JsonResult;
 import com.slodon.b2b2c.core.response.SldResponse;
 import com.slodon.b2b2c.core.util.AssertUtil;
@@ -260,7 +261,7 @@ public class SellerStoreController extends BaseController {
         } else {
             store = storeSiteInfoModel.getStoreByStoreIdAndWebSite(vendor.getStoreId(), webSite);
             if (store.getStoreId() == null) {
-                AssertUtil.notNull(store, "未获取到店铺信息");
+                throw new MallException("未获取到店铺信息");
             }
         }
         return SldResponse.success(store.getBusinessState());