Merge branch 'gaohu-smile-0915-three' of...

Merge branch 'gaohu-smile-0915-three' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into gaohu-smile-0915-three

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

@@ -86,7 +86,7 @@ public class SmileUserController extends BaseController {
     @ApiOperation(value = "根据uid修改用户状态 0：正常，1：黑名单")
     @ResponseBody
     @ApiOperationSupport(order = 1)
-    public AjaxResult updateUserStateById(SaveUserStateParam saveUserStateParam) {
+    public AjaxResult updateUserStateById(@RequestBody SaveUserStateParam saveUserStateParam) {
         return iSmileUserService.updateUserStateById(saveUserStateParam.getUid(), saveUserStateParam.getState());
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userList/list.html

@@ -130,6 +130,7 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="goDetail(\'' + row.uid + '\')"><i class="fa fa-edit"></i>查看</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="updateUserStateById(\'' + row.uid + '\',\'' + 1 + '\')"><i class="fa fa-edit"></i>加入黑名单</a> ');
                         return actions.join('');
                     }
                 }]
@@ -142,6 +143,24 @@
         var url = ctx+'local/smileDetail?id=' + id;
         $.modal.openTab("用户详情", url);
     }
+
+    /*加入黑名单*/
+    function updateUserStateById(uid,state) {
+        let postData = {
+            uid: uid,
+            state: state
+        }
+        $.ajax({
+            type: 'post',
+            url: ctx + 'smile/user/updateUserStateByUid',
+            headers: {"Content-Type": "application/json;charset=UTF-8"},
+            data: JSON.stringify(postData),
+            success: function (e) {
+                // alert(e.msg)
+                location.reload();
+            }
+        });
+    }
     // var updateFlag = [[${@permission.hasPermi('sweet:integralActivity:create')}]];
     // var isOnlineFlag = [[${@permission.hasPermi('sweet:integralActivity:isOnline')}]];
     // var drawListFlag = [[${@permission.hasPermi('sweet:integralActivityDraw:list')}]];

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

@@ -110,9 +110,16 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         lambdaQueryWrapper.eq(SmileOrganization::getId, smileOrganization.getId());
         lambdaQueryWrapper.eq(SmileOrganization::getDelTag, 0);
         SmileOrganization oleOrganization = smileOrganizationMapper.selectOne(lambdaQueryWrapper);
-        smileOrganizationMapper.updateById(smileOrganization);
         //修改总代与原总代不同
-        if (!oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
+        if (!StringUtils.isEmpty(smileOrganization.getAgentId()) && !oleOrganization.getAgentId().equals(smileOrganization.getAgentId())) {
+            //判断该uid是否为总代
+            LambdaQueryWrapper<SmileOrganization> organizationQueryWrapper = new LambdaQueryWrapper<>();
+            organizationQueryWrapper.eq(SmileOrganization::getAgentId, smileOrganization.getAgentId());
+            organizationQueryWrapper.eq(SmileOrganization::getDelTag, 0);
+            List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectList(organizationQueryWrapper);
+            if (smileOrganizations != null && smileOrganizations.size() > 0) {
+                return AjaxResult.warn("该成员为其他组织总代！");
+            }
             //查询所有原总代的普代成员
             LambdaQueryWrapper<SmileUser> smileUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
             smileUserLambdaQueryWrapper.eq(SmileUser::getAgentId, oleOrganization.getAgentId());
@@ -134,6 +141,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
                 smileUserMapper.updateById(smileUser);
             });
         }
+        smileOrganizationMapper.updateById(smileOrganization);
         return AjaxResult.success();
     }
 

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileUser.java

@@ -96,7 +96,7 @@ public class SmileUser implements Serializable {
     private String wechat;
 
     /**
-     * 代理类型（0：未审核，1：总代，2：普代，3：未认证）
+     * 代理类型（0：未审核，1：总代，2：普代，3：未认证,5：特邀代理）
      */
     private Integer type;
 

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -45,7 +45,7 @@
     <select id="selectUserList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileUser">
         select * from smile_user
         <where>
-            del_tag = 0 AND type in (1,2,5)
+            del_tag = 0 AND type in (1,2,5) and state = 0
             <if test="phone!='' and phone !=null">
                 AND phone Like concat('%',#{phone},'%')
             </if>