Merge branch 'feature/mall_product'

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java

@@ -181,14 +181,15 @@ public class PromoterServiceImpl implements PromoterService {
         if (CollUtil.isEmpty(importUsers)) {
             throw exception(PROMOTER_IMPORT_LIST_IS_EMPTY);
         }
+        PromoterImportRespVO respVO = PromoterImportRespVO.builder().createUsernames(new ArrayList<>())
+                .updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
         Set<String> collect = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toSet());
         List<MemberUserDO> list = memberUserService.getByMobileList(collect);
         if (!CollectionUtils.isEmpty(list)) {
             List<String> collect1 = list.stream().map(MemberUserDO::getMobile).collect(Collectors.toList());
-            throw new ServiceException(200, "电话号码:" + collect1 + "重复");
+            respVO.getFailureUsernames().put("电话号码:" + collect1, "重复");
         }
-        PromoterImportRespVO respVO = PromoterImportRespVO.builder().createUsernames(new ArrayList<>())
-                .updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
+
         List<DeptRespDTO> deptRespDTOList = deptApi.getDeptList();
         Map<String, DeptRespDTO> nameList = deptRespDTOList.stream().collect(toMap(DeptRespDTO::getParentOrganizationName, value -> value, (value1, value2) -> value1));
         importUsers.forEach(importUser -> {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java

@@ -154,15 +154,6 @@ public class DeptServiceImpl implements DeptService {
         deptProducer.sendDeptRefreshMessage();
     }
 
-    public static void main(String[] args) {
-        String words = "创盈云>测试删除1";
-
-        System.out.println("原始字符串是'" + words + "'");
-
-        System.out.println("replace(\"r's\",\"is\")结果：" + words.replace("测试删除1", "测试删除"));
-
-    }
-
     @Override
     public void deleteDept(Long id) {
         // 校验是否存在

yudao-ui-admin/src/views/system/tenant/index.vue

@@ -71,7 +71,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" @click="handleLook(scope.row)"
-                     v-hasPermi="['system:tenant:update']">查看
+                     v-hasPermi="['system:tenant:look']">查看
           </el-button>
           <el-button size="mini" type="text" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:tenant:update']">编辑
@@ -85,7 +85,7 @@
           >
             <canvas :id="`id-${scope.row.id}`" width="120" height="120"></canvas>
             <el-button slot="reference" size="mini" type="text" @click="handleQRCode(scope.row)"
-                       v-hasPermi="['system:tenant:delete']">推广码
+                       v-hasPermi="['system:tenant:qrcode']">推广码
             </el-button>
           </el-popover>
           <el-dropdown  @command="(command) => handleCommand(command, scope.$index, scope.row)"
@@ -93,13 +93,13 @@
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleDisabled" size="mini" type="text" icon="el-icon-video-pause"
-                                v-hasPermi="['system:tenant:delete']">禁用</el-dropdown-item>
+                                v-hasPermi="['system:tenant:disable']">禁用</el-dropdown-item>
               <el-dropdown-item command="handleCommission" size="mini" type="text" icon="el-icon-set-up"
-                                v-hasPermi="['system:tenant:delete']">提成设置</el-dropdown-item>
+                                v-hasPermi="['system:tenant:commission']">提成设置</el-dropdown-item>
               <el-dropdown-item command="handleNotice" size="mini" type="text" icon="el-icon-chat-round"
-                                v-hasPermi="['system:tenant:delete']">通知公告</el-dropdown-item>
+                                v-hasPermi="['system:tenant:notice']">通知公告</el-dropdown-item>
               <el-dropdown-item command="handleBanner" size="mini" type="text" icon="el-icon-picture-outline"
-                                v-hasPermi="['system:tenant:delete']">轮播图</el-dropdown-item>
+                                v-hasPermi="['system:tenant:banner']">轮播图</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>

yudao-ui-app/pages.json

@@ -204,6 +204,12 @@
 						"navigationBarTitleText": "用户协议"
 					}
 				},
+        {
+        	"path": "wechat/index",
+        	"style": {
+        		"navigationBarTitleText": "关注公众号"
+        	}
+        },
 				{
 					"path": "web_page/index",
 					"style": {

yudao-ui-app/pages/user/index.vue

@@ -104,9 +104,12 @@
               <u-cell title="热线电话" value="400-8009935" isLink @click="callPhone">
                 <u-icon slot="icon" size="45" name="/static/images/user_icon3.png"></u-icon>
               </u-cell>
-              <u-cell title="在线客服" value="8:30-17:30" :value="tenantInfo.serviceTime" isLink @click="kefuClick">
+              <u-cell title="在线客服" :value="tenantInfo.serviceTime" isLink @click="kefuClick">
                 <u-icon slot="icon" size="45" name="/static/images/user_icon4.png"></u-icon>
               </u-cell>
+              <u-cell title="扫码关注公众号" isLink @click="jumpPage('/pages/users/wechat/index')">
+                <u-icon slot="icon" name="weixin-fill" size="45"></u-icon>
+              </u-cell>
             </u-cell-group>
           </view>
           <view class="uni-p-b-98"></view>
@@ -378,7 +381,7 @@
     left: 0;
     top: 0;
     width: 100%;
-    height: 616rpx;
+    height: 100%;
     background: linear-gradient(0deg, #F94B78 0%, #FFD35C 100%);
     opacity: 0.18;
     z-index: 0

yudao-ui-app/pages/users/wechat/index.vue

@@ -0,0 +1,36 @@
+<template>
+  <view class="wechat-wrap">
+    <u-navbar autoBack title="关注公众号"></u-navbar>
+    <view class="bg"></view>
+    <image src="@/static/images/qrcod.jpg" mode="widthFix" style="width: 400rpx;"></image>
+  </view>
+</template>
+
+<script>
+
+</script>
+
+<style lang="scss" scoped>
+  page,
+  body {
+    height: 100%;
+  }
+
+  .bg {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: linear-gradient(0deg, #F94B78 0%, #FFD35C 100%);
+    opacity: 0.18;
+    z-index: 0
+  }
+
+  .wechat-wrap {
+    width: 100%;
+    min-height: 100%;
+    padding: 260rpx 20rpx 0 20rpx;
+    text-align: center;
+  }
+</style>