From 77d6b04e6e524561b42b153f5cc6e6051ec89158 Mon Sep 17 00:00:00 2001 From: yiyan Date: Wed, 18 Jul 2018 23:28:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=8A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ifish/action/VipAction.java | 11 +- src/main/java/com/ifish/dao/VipMemberDao.java | 1 + .../com/ifish/daoImpl/VipMemberDaoImpl.java | 1 + .../java/com/ifish/service/VipService.java | 4 +- .../com/ifish/serviceImpl/VipServiceImpl.java | 30 +- src/main/resources/log4j.properties | 1 + src/main/resources/property.properties | 3 +- .../webapp/WEB-INF/view/vip/vipMemberAdd.jsp | 289 +++++++++++------- .../WEB-INF/view/vip/vipMemberUpdate.jsp | 273 ++++++++++------- .../webapp/WEB-INF/view/vip/vipReferrer.jsp | 38 --- 10 files changed, 351 insertions(+), 300 deletions(-) diff --git a/src/main/java/com/ifish/action/VipAction.java b/src/main/java/com/ifish/action/VipAction.java index 8c3d2f2..6363967 100644 --- a/src/main/java/com/ifish/action/VipAction.java +++ b/src/main/java/com/ifish/action/VipAction.java @@ -192,13 +192,6 @@ public class VipAction { return b; } - @RequestMapping("/getMembersByReferrerId.do") - @ResponseBody - public Object getMembersByReferrerId(Integer referrerId){ - List members = this.vipService.getMembersByReferrerId(referrerId).getList(); - return members; - } - /** ====================================个人培训============================================ **/ @RequestMapping("/personal.do") @@ -305,10 +298,10 @@ public class VipAction { @RequestMapping("/memberAddOrUpdate.do") - public ModelAndView memberAddOrUpdate(VipMember vipMember, HttpServletRequest request){ + public ModelAndView memberAddOrUpdate(VipMember vipMember, VipReferrer vipReferrer,HttpServletRequest request){ SecurityContextImpl securityContextImpl = (SecurityContextImpl) request.getSession().getAttribute("SPRING_SECURITY_CONTEXT"); String companyIds = request.getParameter("companyIds"); - this.vipService.saveOrUpdateVipMember(vipMember, securityContextImpl.getAuthentication().getName(),companyIds); + this.vipService.saveOrUpdateVipMember(vipMember, vipReferrer,securityContextImpl.getAuthentication().getName(),companyIds); return new ModelAndView("vip/vipMember"); } diff --git a/src/main/java/com/ifish/dao/VipMemberDao.java b/src/main/java/com/ifish/dao/VipMemberDao.java index 60533ad..e30915a 100644 --- a/src/main/java/com/ifish/dao/VipMemberDao.java +++ b/src/main/java/com/ifish/dao/VipMemberDao.java @@ -1,6 +1,7 @@ package com.ifish.dao; import com.ifish.entity.VipMember; +import org.hibernate.Session; /** * @author: yan.y diff --git a/src/main/java/com/ifish/daoImpl/VipMemberDaoImpl.java b/src/main/java/com/ifish/daoImpl/VipMemberDaoImpl.java index d5aa6dd..b720e21 100644 --- a/src/main/java/com/ifish/daoImpl/VipMemberDaoImpl.java +++ b/src/main/java/com/ifish/daoImpl/VipMemberDaoImpl.java @@ -3,6 +3,7 @@ package com.ifish.daoImpl; import com.ifish.dao.VipMemberDao; import com.ifish.entity.VipMember; import com.ifish.hibernate.HibernateBaseDao; +import org.hibernate.Session; import org.springframework.stereotype.Repository; /** diff --git a/src/main/java/com/ifish/service/VipService.java b/src/main/java/com/ifish/service/VipService.java index c13cfbb..10ef8b6 100644 --- a/src/main/java/com/ifish/service/VipService.java +++ b/src/main/java/com/ifish/service/VipService.java @@ -39,8 +39,6 @@ public interface VipService { boolean deleteVipReferrer(VipReferrer vipReferrer,String userName); - Pagination getMembersByReferrerId(Integer referrerId); - /**=================================个人评价=================================================*/ Pagination getVipPersonalByPage(SearchFilter searchFilter); @@ -69,7 +67,7 @@ public interface VipService { Pagination getVipMemberByPage(SearchFilter searchFilter); - boolean saveOrUpdateVipMember(VipMember vipMember,String userName,String companyIds); + boolean saveOrUpdateVipMember(VipMember vipMember,VipReferrer vipReferrer,String userName,String companyIds); VipMember getVipMember(Integer memberId); diff --git a/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java b/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java index c6f9fe6..7f4270d 100644 --- a/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/VipServiceImpl.java @@ -175,23 +175,6 @@ public class VipServiceImpl implements VipService{ } - @Override - public Pagination getMembersByReferrerId(Integer referrerId) { - //查询条件 - List queryList = new ArrayList(); - //排序条件 - List orderList = new ArrayList(); - //分页 - Integer iDisplayStart = 1; - Integer iDisplayLength = 9999; - - queryList.add(Restrictions.eq("memberReferrer.referrerId",referrerId)); - queryList.add(Restrictions.eq("certificateStatus","0")); - - Pagination page = this.vipMemberDao.findByCriteria(iDisplayStart, iDisplayLength, orderList, queryList.toArray(new Criterion[queryList.size()])); - return page; - } - @Override public Pagination getVipPersonalByPage(SearchFilter searchFilter) { //查询条件 @@ -447,9 +430,18 @@ public class VipServiceImpl implements VipService{ } @Override - public boolean saveOrUpdateVipMember(VipMember vipMember, String userName,String companyIds) { + public boolean saveOrUpdateVipMember(VipMember vipMember,VipReferrer vipReferrer, String userName,String companyIds) { Integer referrerId = vipMember.getMemberReferrer().getReferrerId(); - VipReferrer vipReferrer = this.vipReferrerDao.get(referrerId); + if (referrerId != null) { + vipReferrer = this.vipReferrerDao.get(referrerId); + } else { + vipReferrer.setCreateUser(userName); + vipReferrer.setCreateTime(new Date()); + vipReferrer.setModifyUser(userName); + vipReferrer.setModifyTime(new Date()); + vipReferrer.setReferrerStatus("0"); + vipReferrer = this.vipReferrerDao.save(vipReferrer); + } Integer typeId = vipMember.getMemberType().getTypeId(); VipType vipType = this.vipTypeDao.get(typeId); vipMember.setMemberReferrer(vipReferrer); diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties index 79f6987..859bf51 100755 --- a/src/main/resources/log4j.properties +++ b/src/main/resources/log4j.properties @@ -35,3 +35,4 @@ log4j.appender.ROLLING_FILE.layout.ConversionPattern=[ifish7System][%-5p]%d - %c log4j.logger.org.springframework=INFO log4j.logger.com.ibatis=INFO log4j.logger.java.sql=INFO +#log4j.logger.org.hibernate=debug \ No newline at end of file diff --git a/src/main/resources/property.properties b/src/main/resources/property.properties index a5e67d9..ee387c0 100644 --- a/src/main/resources/property.properties +++ b/src/main/resources/property.properties @@ -19,9 +19,10 @@ path_picture4=/mydata/tmp/Img/shops #\u4FDD\u5B58\u7F16\u8F91\u5668\u7F51\u9875\u5730\u5740 ueditor_path=/mydata/tmp/ueditorHtml/ #\u4E91\u4FE1\u7231\u9C7C\u5947\u5B98\u65B9\u5E10\u53F7 -ifish_account=ifish #IM\u5B98\u65B9\u624B\u673A\u53F7 +ifish_account=ifish netease_phone=18501773036 + #FastDFS\u6587\u4EF6URL\u8BBF\u95EE\u8DEF\u5F84(\u672C\u5730\u548C\u6D4B\u8BD5\u73AF\u5883) fastDFS_url_local=http://139.196.24.156:83/ #FastDFS\u6587\u4EF6URL\u8BBF\u95EE\u8DEF\u5F84(\u6B63\u5F0F\u73AF\u5883) diff --git a/src/main/webapp/WEB-INF/view/vip/vipMemberAdd.jsp b/src/main/webapp/WEB-INF/view/vip/vipMemberAdd.jsp index 94adf12..5bef28a 100644 --- a/src/main/webapp/WEB-INF/view/vip/vipMemberAdd.jsp +++ b/src/main/webapp/WEB-INF/view/vip/vipMemberAdd.jsp @@ -21,7 +21,7 @@ format: "yyyy-mm-dd" }); //日期控件 - $('#memberBirthday').datepicker({ + $('#memberBirthday,#referrerBirthday').datepicker({ language: 'zh-CN', format: "mm-dd" }); @@ -86,10 +86,6 @@ }); $("#addVipReferrer").click(function(){ - $("#referrerId").val(""); - $("#referrerName").val(""); - $("#referrerAdmissionTime").val(""); - $("#referrerRemark").val(""); $("#referrerSubmitBtn").attr("disabled",false); $("#referrerModal").modal("show"); }); @@ -251,15 +247,50 @@ }); $("#memberSubmitBtn").click(function () { + $("#form-add").submit(); + }); + + $("#referrerSubmit").click(function () { var referrerId = $('input[type="radio"][name="memberReferrer.referrerId1"]:checked').val(); - alert(referrerId); if (referrerId != null && referrerId != 'undefined') { - $("#referrerId").val(referrerId); - $("#form-add").submit(); - } else { + $.ajax({ + "url": "<%=basePath%>page/vip/getReferrer.do", + "type": "POST", + "data": {referrerId:referrerId}, + "dataType": "json", + "cache": false, + "success": function(json){ + $("#referrerId").val(json.referrerId); + $("#referrerName").val(json.referrerName); + $("#referrerCard").val(json.referrerCard); + $("#referrerType").each(function () { + if ($(this).val() == json.referrerType.typeId) { + $(this).attr("selected",true); + } + }); + $("#referrerTel").val(json.referrerTel); + $("#referrerEmail").val(json.referrerEmail); + $("#referrerBirthday").val(json.referrerBirthday); + $("#referrerFee").val(json.referrerFee); + $("#referrerAdmissionTime").val(json.referrerAdmissionTime); + $("#referrerRemark").val(json.referrerRemark); + + $("#referrerName").attr("readonly",true); + $("#referrerCard").attr("readonly",true); + $("#referrerType").attr("disabled",true); + $("#referrerTel").attr("readonly",true); + $("#referrerEmail").attr("readonly",true); + $("#referrerBirthday").attr("readonly",true); + $("#referrerFee").attr("readonly",true); + $("#referrerAdmissionTime").attr("readonly",true); + $("#referrerRemark").attr("readonly",true); + } + }); + } else { jAlert('请选择推荐人!', '提示'); return false; - } + } + $("#referrerModal").modal("hide"); }); }); @@ -395,13 +426,13 @@ - +
法人代表 - +
@@ -410,7 +441,7 @@
法人身份证号 - +
@@ -429,13 +460,13 @@
会员编号 - +
手机 - +
@@ -444,13 +475,13 @@
QQ - +
微信 - +
@@ -459,13 +490,13 @@
邮箱 - +
成立时间 - +
@@ -474,13 +505,13 @@
入会时间 - +
到期时间 - +
@@ -489,13 +520,13 @@
联系人 - +
联系人电话 - +
@@ -504,13 +535,13 @@
联系情况 - +
官网 - +
@@ -519,13 +550,13 @@
企业情况 - +
生日 - +
@@ -534,13 +565,13 @@
单位地址 - +
企业网址 - +
@@ -549,13 +580,13 @@
需求表 - +
项目匹配 - +
@@ -564,7 +595,7 @@
会费 - +
@@ -582,7 +613,7 @@
注册资金 - +
@@ -608,6 +639,80 @@
+ +

推荐人

+
+
+
+ 推荐人姓名 + +
+
+
+
+ 推荐人类型 + +
+
+
+
+
+
+ 推荐人身份证号 + +
+
+
+
+ 推荐人手机号码 + +
+
+
+ +
+
+
+ 推荐人邮箱 + +
+
+
+
+ 推荐人生日 + +
+
+
+ +
+
+
+ 推荐人费用 + +
+
+
+
+ 入会时间 + +
+
+
+ +
+
+
+ 备注 + +
+
+
+
@@ -616,34 +721,7 @@
-
-

推荐人列表

- - - - - - - -
- - -
- - -
- - - - - - - - - - -
选择推荐人名称推荐人类型入会时间备注

单位评价证列表

@@ -665,63 +743,48 @@
+
+

推荐人

+
+
+
+ 推荐人姓名 + +
+
+
+
+ 推荐人类型 + +
+
+
+
+
+
+ 推荐人身份证号 + +
+
+
+
+ 推荐人手机号码 + +
+
+
+ +
+
+
+ 推荐人邮箱 + +
+
+
+
+ 推荐人生日 + +
+
+
+ +
+
+
+ 推荐人费用 + +
+
+
+
+ 入会时间 + " class="form-control" required="required" maxlength="20"/> +
+
+
+ +
+
+
+ 备注 + +
+
+
+
@@ -615,56 +719,49 @@
-
-

推荐人列表

- - - - +
- - -
+ + + + + + + +
+ + +
+ + +
+ + + + + + + + + + +
选择推荐人名称推荐人类型入会时间备注
+
+ + +
+ + + - - - - - - - - - - - - - - - - - -
选择推荐人名称推荐人类型入会时间备注
- - - - - - - - - - - - - - - - - - - -
选择推荐人名称推荐人类型入会时间备注
- - ${vipReferrer.referrerName}${vipReferrer.referrerType.typeName}${vipReferrer.referrerRemark}

单位评价证列表

@@ -703,64 +800,6 @@
- - -
- -
- -