platform / platform-cms · Commits

Go to a project

Authored by mlge
Commit 6d2334b589cd3517ff7b1a81e4f6a75e4a73233a 1 parent f5c50d31

种草--马甲用户修改

Inline Side-by-side
Showing 4 changed files with 61 additions and 4 deletions
... ... @@ -8,6 +8,7 @@ import com.yoho.service.model.social.request.BaseReqBO;
import com.yoho.service.model.social.request.UicUserReqBO;
import com.yoho.service.model.social.response.UserInfoRspBO;
import com.yoho.service.model.social.response.UserLoginInfoRspBO;
import com.yohobuy.platform.common.enums.GrassVirtualUserGroupEnum;
import com.yohobuy.platform.common.util.DateUtil;
import com.yohobuy.platform.dal.grass.IGrassArticleDao;
import com.yohobuy.platform.dal.grass.IGrassUserAchieveDAO;
... ... @@ -143,12 +144,14 @@ public class GrassUserServiceImpl implements IGrassUserService{
uids.add(req.getUid());
}
Map<String,Object> params = new HashMap<>();
params.put("status",req.getStatus() == null || req.getStatus() == 8 ? null : req.getStatus());
params.put("nickName",req.getNickName());
params.put("uids",uids);
params.put("startTime",req.getStartTime());
params.put("endTime",req.getEndTime());
params.put("groupId", req.getGroupId() == null || req.getGroupId() == 18 ? null : req.getGroupId());
int total = virtualUserDao.countByCondition(params);
responseVO.setTotal(total);
... ... @@ -172,11 +175,21 @@ public class GrassUserServiceImpl implements IGrassUserService{
public void updateVirtualUser(GrassUserManageReq req) {
logger.info("enter updateVirtualUser req={}", req);
Integer type = req.getType() == null ? 0 : req.getType() ;
if(type == 1){//修改状态
virtualUserDao.changeStatusByUid(req.getUid(), req.getStatus());
int currentTime = (int) (System.currentTimeMillis() / 1000l);
GrassVirtualUser virtualUser = new GrassVirtualUser();
virtualUser.setUid(req.getUid());
virtualUser.setUpdateTime(currentTime);
if(type == 1){//修改状态（启用停用）
virtualUser.setStatus(req.getStatus());
virtualUserDao.updateByPrimaryKeySelective(virtualUser);
return;
}
//修改马甲基本资料
virtualUser.setGroupId(req.getGroupId());
virtualUserDao.updateByPrimaryKeySelective(virtualUser);
//修改基本信息（头像，签名等）
String url = uicUrl + "/UserInfoRest/updateUserBase";
UserBaseReqBO uicReq = new UserBaseReqBO();
... ... @@ -228,6 +241,8 @@ public class GrassUserServiceImpl implements IGrassUserService{
bo.setSignature(userAchieveMap.get(user.getUid()) == null ? "" : userAchieveMap.get(user.getUid()));
bo.setCreateTimeStr(user.getCreateTime() == null ? "" : DateUtil.getDateFormatFromInt(user.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
bo.setStatus(user.getStatus());
bo.setGroupId(user.getGroupId() == null ? 0 : user.getGroupId());
bo.setGroupName(GrassVirtualUserGroupEnum.getNameByValue(user.getGroupId() == null ? 0 : user.getGroupId()));
result.add(bo);
}
return result;
... ...
... ... @@ -2,6 +2,7 @@ package com.yohobuy.platform.grass.service.impl;
import com.yoho.core.config.ConfigReader;
import com.yohobuy.platform.common.enums.GrassUserTypeEnum;
import com.yohobuy.platform.common.enums.GrassVirtualUserGroupEnum;
import com.yohobuy.platform.dal.grass.IGrassArticleDao;
import com.yohobuy.platform.dal.grass.IGrassUserAchieveDAO;
import com.yohobuy.platform.dal.grass.IGrassUserAttentionDao;
... ... @@ -158,7 +159,7 @@ public class GrassUserVirtualImpl implements IGrassVirtualService{
int max = Integer.valueOf(s[1]);
//所有的马甲用户 status =1 并且(uid > 63769774 and uid < 63770252)
List<Integer> allVirtualUids = grassVirtualUserDao.selectVirtuals();
List<Integer> allVirtualUids = grassVirtualUserDao.selectVirtualsByGroup(GrassVirtualUserGroupEnum.COMMON.getValue());
if(CollectionUtils.isEmpty(allVirtualUids)){
logger.warn("addVirtualFans no virtual user ");
return;
... ...
... ... @@ -22,6 +22,16 @@
<tr style="height: 60px">
<td>
<span style="color:red">*</span><label>所属分组</label><br>
<input class="easyui-combobox" id="groupId" name="groupId">
</input>
<!-- <span style=" margin-left: 10px; color: red"> 图片宽高(186x170)</span>-->
</td>
</tr>
<tr style="height: 60px">
<td>
<span style="color:red">*</span><label>头像</label> <br>
<div id="imageUpload">
... ... @@ -32,7 +42,7 @@
<tr style="height: 60px">
<td>
<span style="color:red">*</span><label>马甲简介</label> <br>
<label>马甲简介</label> <br>
<textarea id="signature" name="signature" style="width: 380px;" rows="6" placeholder=""
required="true" maxlength="500"></textarea>
</td>
... ... @@ -56,6 +66,15 @@
prompt: "请输入昵称"
});
$("#groupId").combobox({
valueField: "value",
textField: "text",
required: false,
prompt: "请选择分组",
data: [ {text: "普通马甲", value: "1"},{text: "编辑马甲", value: "2"}, {text: "官方马甲", value: "3"},{text: "社区大号", value: "4"}, {text: "品牌号", value: "5"},
{text: "外部刷评论马甲", value: "6"},{text: "其他", value: "0"}]
});
$("#imageUpload").imageUpload({
width: 171,
... ... @@ -101,6 +120,8 @@
$("#signature").html(data.signature);
//图片
$("#imageUpload").imageUpload('setValue', data.headIcon);
//所属分组
$("#groupId").combobox('setValue', data.groupId);
});
... ...
... ... @@ -36,6 +36,9 @@
<input class="easyui-combobox" id="statusParam">
</input>
<input class="easyui-combobox" id="groupIdParam">
</input>
<input class="easyui-textbox" id="nickNameParam" style="width: 140px">
</input>
... ... @@ -94,6 +97,17 @@
data: [{text: "请选择状态", value: ""}, {text: "全部", value: "8"},{text: "正常", value: "1"}, {text: "停用", value: "0"}]
});
$("#groupIdParam").combobox({
valueField: "value",
textField: "text",
required: false,
prompt: "请选择分组",
data: [{text: "请选择分组", value: ""}, {text: "全部", value: "18"}, {text: "普通马甲", value: "1"},
{text: "编辑马甲", value: "2"}, {text: "官方马甲", value: "3"},{text: "社区大号", value: "4"}, {text: "品牌号", value: "5"},
{text: "外部刷评论马甲", value: "6"},{text: "其他", value: "0"}]
});
$("#searchBtn").linkbutton({
iconCls: "icon-search",
onClick: function () {
... ... @@ -109,6 +123,7 @@
uid: $("#uidParam").textbox("getValue"),
nickName:$("#nickNameParam").textbox("getValue"),
status: $("#statusParam").combobox("getValue"),
groupId: $("#groupIdParam").combobox("getValue"),
startTime: startTime,
endTime: endTime
});
... ... @@ -185,6 +200,11 @@
}
}
},{
title: "所属分组",
field: "groupName",
width: 25,
align: "left"
},
{
title: "操作",
... ...