更新邀请信息维护方法

src/main/java/com/uas/platform/b2bManage/controller/InviteController.java

@@ -93,15 +93,22 @@ public class InviteController extends BaseController {
     /**
      * 通过企业UU，填写的邀请用户信息，企业信息更新邀请记录
      *
-     * @param enUU 注册的企业UU
-     * @param userMessage 邀请人信息（姓名、手机、UU号等）
-     * @param enterMessage 邀请企业信息（名称、UU号、营业执照等）
+     * @param enUU 被邀请企业UU
+     * @param userName 邀请用户姓名
+     * @param userTel 邀请用户电话
+     * @param userUU 邀请用户UU
+     * @param enterName 邀请企业名
+     * @param enterUU 邀请企业UU
      * @return
+     * @throws MyException
      */
     @RequestMapping(value = "/edit", method = RequestMethod.POST)
-    public ModelMap editInvite(Long enUU, String userMessage, String enterMessage) throws MyException {
-        useLogService.appendLog(UseType.EDIT_INVITE.code(), "UU:" + enUU + ";邀请人: " + userMessage + "; 邀请企业： " + enterMessage, AgentUtils.getIp(request));
-        return inviteService.editInvite(enUU, userMessage, enterMessage);
+    public ModelMap editInvite(Long enUU, String userName, String userTel, Long userUU, String enterName, Long enterUU) throws MyException {
+        String inviteInfo = "UU： " + enUU + ";"
+                + "邀请企业： " + enterName + "(" + enterUU + ");"
+                + "邀请人: " + userName + "(tel: " + userTel + ", uu" + userUU + ")";
+        useLogService.appendLog(UseType.EDIT_INVITE.code(), inviteInfo, AgentUtils.getIp(request));
+        return inviteService.editInvite(enUU, userName, userTel, userUU, enterName, enterUU);
     }
 
     /**

src/main/java/com/uas/platform/b2bManage/dao/UserBaseInfoDao.java

@@ -33,10 +33,11 @@ public interface UserBaseInfoDao extends JpaSpecificationExecutor<UserBaseInfo>,
     List<UserBaseInfo> findByTel(String tel);
 
     /**
-     * 通过邮箱查询用户信息
+     * 通过电话和姓名查询用户信息
      *
-     * @param email 邮箱
+     * @param name 姓名
+     * @param tel 电话
      * @return
      */
-    List<UserBaseInfo> findByEmail(String email);
+    List<UserBaseInfo> findByNameAndTel(String name, String tel);
 }

src/main/java/com/uas/platform/b2bManage/model/Invite.java

@@ -57,12 +57,24 @@ public class Invite implements Serializable {
     @Column(name = "invitename")
     private String inviteEnName;
 
+    /**
+     * 邀请企业UU
+     */
+    @Column(name = "inviteuu")
+    private Long inviteUU;
+
     /**
      * 邀请用户名称
      */
     @Column(name = "inviteusername")
     private String inviteUserName;
 
+    /**
+     * 邀请用户UU
+     */
+    @Column(name = "inviteuseruu")
+    private Long inviteUserUU;
+
     /**
      * 邀请用户联系方式
      */
@@ -129,6 +141,14 @@ public class Invite implements Serializable {
         this.inviteEnName = inviteEnName;
     }
 
+    public Long getInviteUU() {
+        return inviteUU;
+    }
+
+    public void setInviteUU(Long inviteUU) {
+        this.inviteUU = inviteUU;
+    }
+
     public String getInviteUserName() {
         return inviteUserName;
     }
@@ -137,6 +157,14 @@ public class Invite implements Serializable {
         this.inviteUserName = inviteUserName;
     }
 
+    public Long getInviteUserUU() {
+        return inviteUserUU;
+    }
+
+    public void setInviteUserUU(Long inviteUserUU) {
+        this.inviteUserUU = inviteUserUU;
+    }
+
     public String getInviteUserTel() {
         return inviteUserTel;
     }

src/main/java/com/uas/platform/b2bManage/service/InviteService.java

@@ -32,13 +32,16 @@ public interface InviteService {
     /**
      * 通过企业UU，填写的邀请用户信息，企业信息更新邀请记录
      *
-     * @param enUU 注册的企业UU
-     * @param userMessage 邀请人信息（姓名、手机、UU号等）
-     * @param enterMessage 邀请企业信息（名称、UU号、营业执照等）
+     * @param enUU 被邀请企业UU
+     * @param userName 邀请用户姓名
+     * @param userTel 邀请用户电话
+     * @param userUU 邀请用户UU
+     * @param enterName 邀请企业名
+     * @param enterUU 邀请企业UU
      * @return
-     * @throws MyException 抛出异常
+     * @throws MyException
      */
-    ModelMap editInvite(Long enUU, String userMessage, String enterMessage) throws MyException;
+    ModelMap editInvite(Long enUU, String userName, String userTel, Long userUU, String enterName, Long enterUU) throws MyException;
 
     /**
      * 清除邀请记录

src/main/java/com/uas/platform/b2bManage/service/impl/InviteServiceImpl.java

@@ -11,6 +11,7 @@ import com.uas.platform.b2bManage.service.InviteService;
 import com.uas.platform.b2bManage.support.MyException;
 import com.uas.platform.b2bManage.support.MyThread;
 import com.uas.platform.b2bManage.support.MyThreadPoolExecutor;
+import com.uas.platform.b2bManage.support.StringUtil;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
@@ -120,28 +121,39 @@ public class InviteServiceImpl extends BaseService implements InviteService {
     /**
      * 通过企业UU，填写的邀请用户信息，企业信息更新邀请记录
      *
-     * @param enUU 注册的企业UU
-     * @param userMessage 邀请人信息（姓名、手机、UU号等）
-     * @param enterMessage 邀请企业信息（名称、UU号、营业执照等）
+     * @param enUU 被邀请企业UU
+     * @param userName 邀请用户姓名
+     * @param userTel 邀请用户电话
+     * @param userUU 邀请用户UU
+     * @param enterName 邀请企业名
+     * @param enterUU 邀请企业UU
      * @return
-     * @throws MyException 抛出异常
+     * @throws MyException
      */
     @Override
-    public ModelMap editInvite(final Long enUU, String userMessage, String enterMessage) throws MyException {
-        if (StringUtils.isEmpty(userMessage) || StringUtils.isEmpty(enterMessage)) {
+    public ModelMap editInvite(final Long enUU, String userName, String userTel, Long userUU, String enterName, Long enterUU) throws MyException {
+        boolean userInfo = true;
+        if (StringUtils.isEmpty(userName) && StringUtils.isEmpty(userTel) && null == userUU) {
+            userInfo = false;
+        }
+        boolean enterInfo = true;
+        if (StringUtils.isEmpty(enterName) && null == enterUU) {
+            enterInfo = false;
+        }
+        if (!userInfo || !enterInfo) {
             throw new MyException("邀请人或邀请企业信息不能为空");
         }
         // 校验用户信息
-        final Long userUU = invalidUserInfo(userMessage);
-        final Long inviteUU = invalidEnterpriseInfo(enterMessage);
+        final Long inviteUserUU = invalidUserInfo(userName, userTel, userUU);
+        final Long inviteUU = invalidEnterpriseInfo(enterName, enterUU);
         String sql = "update sec$enterprises set en_inviteuu = " + inviteUU +
-                ", en_inviteuseruu = " + userUU + " where en_uu = " + enUU;
+                ", en_inviteuseruu = " + inviteUserUU + " where en_uu = " + enUU;
         jdbcTemplate.execute(sql);
         MyThreadPoolExecutor.executor.execute(new Runnable() {
             @Override
             public void run() {
                 // 更新邀请记录
-                updateInvitation(userUU, enUU, inviteUU);
+                updateInvitation(inviteUserUU, enUU, inviteUU);
             }
         });
         return new ModelMap("content", inviteDao.findOne(enUU));
@@ -203,44 +215,38 @@ public class InviteServiceImpl extends BaseService implements InviteService {
     /**
      * 校验用户信息
      *
-     * @param userMessage 用户关键字
+     * @param userName 用户姓名
+     * @param userTel 用户电话
+     * @param userUU 用户UU
      * @return
      * @throws MyException
      */
-    private Long invalidUserInfo(String userMessage) throws MyException {
+    private Long invalidUserInfo(String userName, String userTel, Long userUU) throws MyException {
         UserBaseInfo userBaseInfo = new UserBaseInfo();
-        List<UserBaseInfo> userList = userBaseInfoDao.findByEmail(userMessage.trim());
-        if (userMessage.matches(UU_REGEXP) && !userMessage.matches(TEL_REGEXP)) {
-            userBaseInfo = userBaseInfoDao.findOne(Long.valueOf(userMessage));
-            if (null == userBaseInfo) {
-                throw new MyException(NOT_FOUND_CODE, "未找到关于[" + userMessage + "]的用户信息");
-            }
-        }
-        if (null == userBaseInfo.getUu() && userMessage.matches(EMAIL_REGEXP)) {
-            if (userList.size() > 1) {
-                throw new MyException("[" + userMessage + "]存在多条用户信息，请更新邀请用户信息");
-            } else if (userList.size() == 1) {
-                userBaseInfo = userList.get(0);
-            }
-        }
-        if (null == userBaseInfo.getUu() && userMessage.matches(TEL_REGEXP)) {
-            userList = userBaseInfoDao.findByTel(userMessage.trim());
-            if (userList.size() > 1) {
-                throw new MyException("[" + userMessage + "]存在多条用户信息，请更新邀请用户信息");
-            } else if (userList.size() == 1) {
-                userBaseInfo = userList.get(0);
-            }
+        if (null != userUU) {
+            userBaseInfo = userBaseInfoDao.findOne(userUU);
         }
-        if (null == userBaseInfo.getUu()) {
-            userList = userBaseInfoDao.findByName(userMessage.trim());
-            if (userList.size() > 1) {
-                throw new MyException("[" + userMessage + "]存在多条用户信息，请更新邀请用户信息，请尝试采用UU号或电话输入");
-            } else if (userList.size() == 1) {
-                userBaseInfo = userList.get(0);
+        if (null == userBaseInfo) {
+            if ((!StringUtils.isEmpty(userName) && !StringUtils.isEmpty(userTel))) {
+                List<UserBaseInfo> userList = userBaseInfoDao.findByTel(userTel.trim());
+                if (userList.size() == 1) {
+                    userBaseInfo = userList.get(0);
+                } else if (userList.size() > 1) {
+                    userList = userBaseInfoDao.findByNameAndTel(userName.trim(), userTel.trim());
+                    if (userList.size() == 1) {
+                        userBaseInfo = userList.get(0);
+                    } else if (userList.size() > 1) {
+                        throw new MyException("通过姓名[" + userName + "],[" + userTel + "]查出多条用户信息，请更新邀请用户信息");
+                    } else {
+                        throw new MyException("通过姓名[" + userName + "],手机[" + userTel + "]未找到用户信息，请更新邀请用户信息");
+                    }
+                }
+            } else {
+                throw new MyException("通过UU[" + userUU+ "]未找到用户信息，请更新邀请用户信息");
             }
         }
-        if (null == userBaseInfo.getUu()) {
-            throw new MyException(NOT_FOUND_CODE, "未找到关于[" + userMessage + "]的用户信息");
+        if (null == userBaseInfo) {
+            throw new MyException("通过姓名[" + userName + "],手机[" + userTel + "],UU[" + userUU + "]未找到用户信息，请更新邀请用户信息");
         }
         return userBaseInfo.getUu();
     }
@@ -248,35 +254,30 @@ public class InviteServiceImpl extends BaseService implements InviteService {
     /**
      * 校验企业信息
      *
-     * @param enterMessage 企业关键字
+     * @param enterName 邀请企业名称
+     * @param enterUU  邀请企业UU
      * @return
      */
-    private Long invalidEnterpriseInfo(String enterMessage) throws MyException {
+    private Long invalidEnterpriseInfo(String enterName, Long enterUU) throws MyException {
         EnterpriseBaseInfo baseInfo = new EnterpriseBaseInfo();
-        if (enterMessage.matches(UU_REGEXP)) {
-            baseInfo = enterpriseBaseInfoDao.findOne(Long.valueOf(enterMessage));
+        if (null != enterUU) {
+            baseInfo = enterpriseBaseInfoDao.findOne(enterUU);
             if (null == baseInfo.getUu()) {
-                throw new MyException(NOT_FOUND_CODE, "未找到关于[" + enterMessage + "]的企业信息");
+                throw new MyException(NOT_FOUND_CODE, "通过UU[" + enterUU + "]未找到相关企业信息");
             }
         }
-        if (null == baseInfo.getUu()) {
-            List<EnterpriseBaseInfo> baseInfoList = enterpriseBaseInfoDao.findByEnBussinessCode(enterMessage.trim());
+        if (null == baseInfo && !StringUtils.isEmpty(enterName)) {
+            List<EnterpriseBaseInfo> baseInfoList = enterpriseBaseInfoDao.findByEnName(enterName.trim());
             if (baseInfoList.size() > 1) {
-                throw new MyException("[" + enterMessage + "]存在多条企业信息，请更新邀请企业信息");
+                throw new MyException("通过名称[" + enterName + "]查出多条企业信息，请更新邀请企业信息");
             } else if (baseInfoList.size() == 1) {
                 baseInfo = baseInfoList.get(0);
-            }
-            if (null == baseInfo.getUu()) {
-                baseInfoList = enterpriseBaseInfoDao.findByEnName(enterMessage.trim());
-                if (baseInfoList.size() > 1) {
-                    throw new MyException("[" + enterMessage + "]存在多条企业信息，请更新邀请企业信息");
-                } else if (baseInfoList.size() == 1) {
-                    baseInfo = baseInfoList.get(0);
-                }
+            } else {
+                throw new MyException("通过名称[" + enterName + "]未找到相关企业信息，请更新邀请企业信息");
             }
         }
-        if (null == baseInfo.getUu()) {
-            throw new MyException("未找到关于[" + enterMessage + "]的企业信息");
+        if (null == baseInfo) {
+            throw new MyException("通过名称[" + enterName + "],UU[" + enterUU + "]未找到相关企业信息，请更新邀请企业信息");
         }
         return baseInfo.getUu();
     }

src/main/webapp/WEB-INF/views/normal/inviteList.html

@@ -79,7 +79,7 @@
         height: 45px;
     }
     .modal-dialog .modal-body {
-        height: 175px;
+        height: 250px;
     }
     .modal-dialog .modal-footer {
         height: 60px;
@@ -193,10 +193,22 @@
                         <td><label class="text-right">邀请企业</label></td>
                         <td><input type="text" autocomplete="off" id="in_inviteName"></td>
                     </tr>
+                    <tr>
+                        <td><label class="text-right">邀请企业UU</label></td>
+                        <td><input type="text" autocomplete="off" id="in_inviteUU"></td>
+                    </tr>
                     <tr>
                         <td><label class="text-right">邀请人</label></td>
                         <td><input type="text" autocomplete="off" id="in_inviteUserName"></td>
                     </tr>
+                    <tr>
+                        <td><label class="text-right">邀请人电话</label></td>
+                        <td><input type="text" autocomplete="off" id="in_inviteUserTel"></td>
+                    </tr>
+                    <tr>
+                        <td><label class="text-right">邀请人UU</label></td>
+                        <td><input type="text" autocomplete="off" id="in_inviteUserUU"></td>
+                    </tr>
                     </tbody>
                 </table>
             </div>

src/main/webapp/resources/js/common/invite.js

@@ -107,7 +107,10 @@ function editInfo(invite) {
     $('#inviteInfo').modal('show');
     $("#in_name").val(invite.enName);
     $("#in_inviteName").val(invite.inviteEnName);
+    $("#in_inviteUU").val(invite.inviteUU);
     $("#in_inviteUserName").val(invite.inviteUserName);
+    $("#in_inviteUserTel").val(invite.inviteUserTel);
+    $("#in_inviteUserUU").val(invite.inviteUserUU);
     uu = invite.uu;
 }
 
@@ -135,7 +138,14 @@ function deleteInfo(enUU) {
  * 确定修改
  */
 $('#okay').click(function () {
-    var data = { enUU: uu, userMessage: $('#in_inviteUserName').val(), enterMessage: $('#in_inviteName').val()};
+    var data = {
+        enUU: uu,
+        userName: $('#in_inviteUserName').val(),
+        userTel: $('#in_inviteUserTel').val(),
+        userUU: $('#in_inviteUserUU').val(),
+        enterName: $('#in_inviteName').val(),
+        enterUU: $('#in_inviteUU').val()
+    };
     $.ajax('invite/edit', {
         data: data,
         method: 'POST',