Skip to content

Y
youka-manage
Commit cdd88e7c by Java-聂换换
Options

修改权限

parent 5846cc0c
Showing with 117 additions and 2 deletions
src/main/java/com/thinkgem/jeesite/modules/youka/entity/UpgradeUserEntity.java
......@@ -23,6 +23,8 @@ public class UpgradeUserEntity extends DataEntity<UpgradeUserEntity> {
private String recommendedMobile;
private String a_userId;
public String getUserCode() {
return userCode;
}
......@@ -94,4 +96,12 @@ public class UpgradeUserEntity extends DataEntity<UpgradeUserEntity> {
public void setRecommendedMobile(String recommendedMobile) {
this.recommendedMobile = recommendedMobile;
}
public String getA_userId() {
return a_userId;
}
public void setA_userId(String a_userId) {
this.a_userId = a_userId;
}
}
src/main/java/com/thinkgem/jeesite/modules/youka/service/UpgradeUserService.java
package com.thinkgem.jeesite.modules.youka.service;
import com.thinkgem.jeesite.common.service.CrudService;
import com.thinkgem.jeesite.common.utils.StringUtils;
import com.thinkgem.jeesite.modules.sys.entity.User;
import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
import com.thinkgem.jeesite.modules.youka.dao.UpgradeUserDao;
import com.thinkgem.jeesite.modules.youka.dao.YoukaUserDao;
import com.thinkgem.jeesite.modules.youka.entity.UpgradeUserEntity;
......@@ -24,6 +27,15 @@ public class UpgradeUserService extends CrudService<UpgradeUserDao, UpgradeUser
youkaUserNew.setPassword(youkaUser.getPassword());
youkaUserNew.setRecommendedMobile(youkaUser.getRecommendedMobile());
youkaUserNew.setOrderCode(upgradeUserEntity.getOrderCode());
User user = UserUtils.getUser();
if(StringUtils.isNotBlank(youkaUser.getRecommendedPath())){
youkaUserNew.setRecommendedPath(youkaUser.getRecommendedPath().substring(0,4));
if(StringUtils.isNotBlank(user.getName()) && user.getName().contains("userId:")){
youkaUserNew.setRecommendedPath(youkaUserNew.getRecommendedPath()+","+user.getName().substring(7)+",");
}
}
youkaUserService.save(youkaUserNew);
upgradeUserEntity.setStatus("2");
......
src/main/java/com/thinkgem/jeesite/modules/youka/service/YoukaUserService.java
package com.thinkgem.jeesite.modules.youka.service;
import com.google.common.collect.Lists;
import com.thinkgem.jeesite.common.config.Global;
import com.thinkgem.jeesite.common.constant.ComCode;
import com.thinkgem.jeesite.common.persistence.Page;
......@@ -10,6 +11,10 @@ import com.thinkgem.jeesite.common.utils.MD5;
import com.thinkgem.jeesite.common.utils.StringUtils;
import com.thinkgem.jeesite.modules.cms.dao.ArticleDao;
import com.thinkgem.jeesite.modules.cms.entity.Article;
import com.thinkgem.jeesite.modules.sys.entity.Office;
import com.thinkgem.jeesite.modules.sys.entity.Role;
import com.thinkgem.jeesite.modules.sys.entity.User;
import com.thinkgem.jeesite.modules.sys.service.SystemService;
import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
import com.thinkgem.jeesite.modules.youka.dao.YoukaCardDao;
import com.thinkgem.jeesite.modules.youka.dao.YoukaUserDao;
......@@ -21,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -40,6 +46,9 @@ public class YoukaUserService extends CrudService<YoukaUserDao, YoukaUser> {
@Autowired
private YoukaCardDao youkaCardDao;
@Autowired
private SystemService systemService;
@Override
public YoukaUser get(String id){
......@@ -54,6 +63,21 @@ public class YoukaUserService extends CrudService<YoukaUserDao, YoukaUser> {
@Override
@Transactional(readOnly = false)
public void save(YoukaUser youkaUser){
if(StringUtils.isBlank(youkaUser.getBelongTo())){
youkaUser.setBelongTo("B");
}
if(StringUtils.isBlank(youkaUser.getRecommendedPath()) && "A".equals(youkaUser.getLevel())){
if("B".equals(youkaUser.getBelongTo())){
youkaUser.setRecommendedPath(",0,1,");
YoukaUser youkaUser1 = dao.get("1");
youkaUser.setRecommendedMobile(youkaUser1.getMobile());
}else if("S".equals(youkaUser.getBelongTo())){
youkaUser.setRecommendedPath(",0,2,");
YoukaUser youkaUser1 = dao.get("2");
youkaUser.setRecommendedMobile(youkaUser1.getMobile());
}
}
if(youkaUser.getId() != null && !"".equals(youkaUser.getId())){
// youkaUser.setUpdateBy(UserUtils.getUser());
youkaUser.preUpdate();
......@@ -101,7 +125,7 @@ public class YoukaUserService extends CrudService<YoukaUserDao, YoukaUser> {
youkaUser.setCode(code);
youkaUser.setAvatar(StringUtils.replace(youkaUser.getAvatar(), Global.IMAGE_SAVE_URL,""));
if(StringUtils.isBlank(youkaUser.getOrderCode())){
youkaUser.setPassword(MD5.sign(youkaUser.getPassword(), ComCode.signCode, "utf-8"));
youkaUser.setPassword(SystemService.entryptPassword(youkaUser.getPassword()));
}
dao.insert(youkaUser);
......@@ -119,6 +143,29 @@ public class YoukaUserService extends CrudService<YoukaUserDao, YoukaUser> {
youkaUserDetailDao.insert(youkaUserDetail);
}
if("A".equals(youkaUser.getLevel())){
User user = new User();
user.setCompany(new Office("1"));
user.setOffice(new Office("1"));
user.setPassword(youkaUser.getPassword());
user.setPhone(youkaUser.getMobile());
List<Role> roleList = Lists.newArrayList();
List<String> roleIdList = new ArrayList<>();
roleIdList.add("488d4edba1804b609d5017eaf8a68109");
// user.preInsert();
for (Role r : systemService.findAllRole()){
if (roleIdList.contains(r.getId())){
roleList.add(r);
}
}
user.setRoleList(roleList);
user.setName("userId_"+youkaUser.getId());
user.setLoginName(youkaUser.getMobile());
user.setLoginFlag("1");
user.setNo("121323");
// 保存用户信息
systemService.saveUser(user);
}
}
}
......
src/main/java/com/thinkgem/jeesite/modules/youka/web/YoukaUserController.java
......@@ -172,6 +172,11 @@ public class YoukaUserController extends BaseController {
@RequiresPermissions("youka:user:view")
@RequestMapping(value = {"upgradeUserlist"})
public String upgradeUserlist(UpgradeUserEntity upgradeUserEntity, HttpServletRequest request, HttpServletResponse response, Model model) {
User user = UserUtils.getUser();
if(StringUtils.isNotBlank(user.getName()) && user.getName().contains("userId:")){
upgradeUserEntity.setA_userId(user.getName().substring(7));
}
if(upgradeUserEntity == null){
upgradeUserEntity = new UpgradeUserEntity();
}
......
src/main/resources/mappings/modules/youka/UpgradeUserDao.xml
......@@ -47,6 +47,9 @@
<if test="level != null and level != ''">
AND uu.level = #{level}
</if>
<if test="a_userId != null and a_userId != ''">
AND u.recommended_path LIKE CONCAT('%,',#{a_userId},',%')
</if>
<if test="mobile != null and mobile != ''">
AND u.mobile like
<if test="category.parentIds != null and category.parentIds != ''">
......
src/main/webapp/WEB-INF/views/modules/youka/upgradeUserList.jsp
......@@ -58,7 +58,7 @@
</form:form>
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead><tr><th>序号</th><th>用户名</th><th class="sort-column login_name">用户类型</th><th class="sort-column name">提交时间</th><th>手机号</th><th>变更手机号</th><th>所属王者</th><shiro:hasPermission name="sys:user:edit"><th>操作</th></shiro:hasPermission></tr></thead>
<thead><tr><th>序号</th><th>用户名</th><th class="sort-column login_name">用户类型</th><th class="sort-column name">提交时间</th><th>手机号</th><th>变更手机号</th><th>所属王者</th><shiro:hasPermission name="youka:user:view"><th>操作</th></shiro:hasPermission></tr></thead>
<tbody>
<c:forEach items="${page.list}" var="user" varStatus="indexs">
<tr>
......
src/main/webapp/WEB-INF/views/modules/youka/userForm.jsp
......@@ -7,6 +7,17 @@
<script type="text/javascript">
$(document).ready(function() {
$("#no").focus();
$("#btnCancel232").click(function () {
var msg = "您真的确定要删除吗？\n\n请确认！";
if (confirm(msg)==true){
$("#btnCancel232").attr("href","${ctx}/youka/user/list");
console.log($("#btnCancel232").attr("href"));
return true;
}else{
return false;
}
});
$("#inputForm").validate({
......@@ -42,6 +53,32 @@
<sys:ckfinder input="nameImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
</div>
</div>
<div class="control-group">
<label class="control-label">来源:</label>
<div class="controls">
<form:select path="belongTo" cssStyle="width: 100px">
<form:option value="B">
佰邦达
</form:option>
<form:option value="S">
盛世互通
</form:option>
<%--<form:option value="B">--%>
<%--钻石会员--%>
<%--</form:option>--%>
<%--<form:option value="C">--%>
<%--黄金会员--%>
<%--</form:option>--%>
<%--<form:option value="D">--%>
<%--白银会员--%>
<%--</form:option>--%>
<%--<form:option value="E">--%>
<%--青铜会员--%>
<%--</form:option>--%>
</form:select>
</div>
</div>
<div class="control-group">
<label class="control-label">用户类型:</label>
<div class="controls">
......@@ -84,6 +121,7 @@
<div class="form-actions">
<shiro:hasPermission name="sys:user:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
<a id="btnCancel232" href="" > 测的是</a>
</div>
</form:form>
</body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment