no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WorkerGoodsVO.java

@@ -43,8 +43,8 @@ public class WorkerGoodsVO {
     @ApiModelProperty(value = "商品小类")
     private String categoryName;
 
-    @ApiModelProperty(value = "商品代码")
-    private String goodsCode;
+//    @ApiModelProperty(value = "商品代码")
+//    private String goodsCode;
 
     @ApiModelProperty(value = "是否小件")
     private IsEnum isSmall;

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminRoleLogic.java

@@ -41,6 +41,8 @@ public class AdminRoleLogic {
         Integer type = adminRoleService.getById(adminUser.getRoleId()).getType();
         if("admin".equals(adminUser.getUserName())){
             type = RoleTypeEnum.ADMIN.getCode();
+        } else if (type == RoleTypeEnum.COMPANY.getCode()) {
+            type = RoleTypeEnum.ADMIN.getCode();
         }
 
         return adminRoleService.lambdaQuery()

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/stock/WorkerStockLogic.java

@@ -124,12 +124,21 @@ public class WorkerStockLogic {
             throw new RemoteServiceException("平台账号禁止操作");
         }
 
+        if (CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()) && adminUser.getAdminWebsitIds().size() > 1) {
+            throw new RemoteServiceException("账号绑定多网点编号，无法导入");
+        }
+
         List<WorkerStockDTO> workerStockDTOS = new ArrayList<>();
         final DateTime curDate = DateUtil.date();
         final String idStr = IdWorker.getIdStr();
 
         String tipsGoodsName = websitGoodsTypeEnum.getKey().equals(WebsitGoodsTypeEnum.M.getKey()) ? "辅材" : "配件";
 
+        final AdminWebsit websit = adminWebsitService.lambdaQuery()
+                .eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .eq(AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds().get(0))
+                .one();
+
         for (int i = 0; i < datas.size(); i++) {
             List<String> row = (List<String>) datas.get(i);
             CommonUtils.initList(row, 10);
@@ -169,6 +178,8 @@ public class WorkerStockLogic {
                 WorkerStockDTO workerStockDTO = new WorkerStockDTO();
                 workerStockDTO.setCompanyWechatId(adminUser.getCompanyWechatId());
                 workerStockDTO.setCompanyWechatName(adminUser.getCompanyName());
+                workerStockDTO.setWebsitId(websit.getWebsitId());
+                workerStockDTO.setWebsitName(websit.getName());
                 workerStockDTO.setIdentity(user.getIdCard());
                 workerStockDTO.setWorkerId(user.getWorkerNumber());
                 workerStockDTO.setWorkerName(user.getNickName());

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -234,8 +234,16 @@
         left join websit_goods_category c on b.parent_category_id = c.category_id
         left join websit_goods_category d on b.goods_category_id = d.category_id
         left join user e on e.worker_number = a.worker_id
-          ${ex.query}
-          and a.goods_type='M'
+        ${ex.query}
+        and a.goods_type='M'
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
+        </if>
         order by a.id desc
     </select>
 
@@ -542,6 +550,14 @@
           ${ex.selected}
         FROM user_wait a
         ${ex.query}
+        <if test="ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
+            AND (
+            a.websit_id IN
+            <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
+        </if>
         ${ex.orderBy}
     </select>