更新邀请注册接口新增合作伙伴的方法

src/main/java/com/uas/platform/b2b/controller/InvitationRecordController.java

@@ -8,6 +8,10 @@ import com.uas.platform.b2b.search.SearchService;
 import com.uas.platform.b2b.service.InvitationRecordService;
 import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.b2b.support.UsageBufferedLogger;
+import com.uas.platform.b2b.v2.service.InviteRecordService;
+import com.uas.platform.core.exception.IllegalOperatorException;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageParams;
 import com.uas.search.b2b.model.SPage;
@@ -36,6 +40,11 @@ public class InvitationRecordController {
 	@Autowired
 	private SearchService searchService;
 
+    private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
+
+    @Autowired
+    private InviteRecordService inviteRecordService;
+
 	/**
 	 * 邀请开通平台
 	 * 
@@ -45,6 +54,7 @@ public class InvitationRecordController {
 	@RequestMapping(value = "/invite", method = RequestMethod.POST)
 	private ModelMap invite(String formStore) {
 		InvitationRecord record = JSONObject.parseObject(formStore, InvitationRecord.class);
+		logger.log("邀请注册", "增加邀请注册信息", record.getVendname());
 		return invitationRecordService.invite(record);
 	}
 
@@ -56,6 +66,7 @@ public class InvitationRecordController {
 	 */
 	@RequestMapping(value = "/reInvite/{id}", method = RequestMethod.POST)
 	private ModelMap reInvite(@PathVariable Long id) {
+        logger.log("邀请注册", "再次邀请", "关联id:" + id);
 		return invitationRecordService.reInvite(id);
 	}
 
@@ -67,6 +78,7 @@ public class InvitationRecordController {
 	 */
 	@RequestMapping(value = "/record/{id}", method = RequestMethod.GET)
 	private InvitationRecord getRecordById(@PathVariable Long id) {
+        logger.log("邀请注册", "查询邀请记录", "关联id:" + id);
 		return invitationRecordService.getRecordById(id);
 	}
 
@@ -83,6 +95,7 @@ public class InvitationRecordController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+        logger.log("邀请注册", "查询邀请记录（个人）");
 		return invitationRecordService.getRecords(pageParams, keyword);
 	}
 
@@ -98,6 +111,7 @@ public class InvitationRecordController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+        logger.log("邀请注册", "查询邀请记录（企业）");
 		return invitationRecordService.getRecords(pageParams, keyword);
 	}
 
@@ -118,6 +132,7 @@ public class InvitationRecordController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("in_date", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+        logger.log("邀请注册", "查询邀请记录（企业）--已激活");
 		return invitationRecordService.getRecords(pageParams, keyword);
 	}
 
@@ -143,6 +158,28 @@ public class InvitationRecordController {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         url = url + "?inviteUserCode=" + SystemSession.getUser().getUserUU() + "&inviteuid="
                 + SystemSession.getUser().getEnterprise().getEnBussinessCode() + "&invitationTime=" + sdf.format(new Date()) + "&source=B2B";
+        logger.log("邀请注册", "获取邀请链接", url);
 		return new ModelMap("url", url);
 	}
+
+    /**
+     * 邀请注册如果已注册增加添加合作伙伴接口
+     *
+     * @param inviteEnUU 被邀请的企业UU
+     * @param inviteUserName 被邀请的用户姓名
+     * @param inviteUserTel 被邀请的用户联系方式
+     * @return
+     * @throws Exception
+     */
+	@RequestMapping(value = "/addPart", method = RequestMethod.POST)
+    private ModelMap addPartner(Long inviteEnUU, String inviteUserName, String inviteUserTel) throws Exception {
+        Long enUU = SystemSession.getUser().getEnterprise().getUu();
+        Long userUU = SystemSession.getUser().getUserUU();
+        String app = "B2B";
+        if (enUU.equals(inviteEnUU)) {
+            throw new IllegalOperatorException("不能添加自己企业为合作伙伴");
+        }
+        logger.log("邀请注册", "添加合作伙伴", "添加企业UU：" + inviteEnUU + ",用户:" + inviteUserName);
+        return inviteRecordService.addPartner(userUU, enUU, inviteEnUU, inviteUserName, inviteUserTel, app);
+    }
 }

src/main/java/com/uas/platform/b2b/model/EnterpriseBaseInfo.java

@@ -258,12 +258,19 @@ public class EnterpriseBaseInfo implements Serializable {
         this.inviteUserName = inviteUserName;
     }
 
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
+
     public EnterpriseBaseInfo(Enterprise e) {
         this.enName = e.getEnName();
         this.uu = e.getUu();
         this.enAddress = e.getEnAddress();
-        this.enTel = e.getEnAdminTel();
-        this.adminName = e.getEnAdminName();
+        this.enTel = e.getEnTel();
         this.date = e.getEnDate();
         this.enCorporation = e.getEnCorporation();
     }

src/main/java/com/uas/platform/b2b/service/impl/InvitationRecordServiceImpl.java

@@ -231,10 +231,15 @@ public class InvitationRecordServiceImpl implements InvitationRecordService {
 	@Override
 	public List<EnterpriseBaseInfo> findByName(String name) {
 		List<EnterpriseBaseInfo> baseInfoList = new ArrayList<EnterpriseBaseInfo>();
-		List<Enterprise> enterprises = enterpriseDao.findByEnName(name);
+		List<Enterprise> enterprises = enterpriseDao.findByName(name);
 		if (!CollectionUtils.isEmpty(enterprises)) {
 			for (Enterprise e : enterprises) {
 				EnterpriseBaseInfo baseInfo = new EnterpriseBaseInfo(e);
+				User user = userDao.findOne(e.getEnAdminuu());
+				if (null != user) {
+					baseInfo.setAdminName(user.getUserName());
+					baseInfo.setEnTel(user.getUserTel());
+				}
 				List<InvitationRecord> records = findbyVendName(e.getEnName());
 				if (!CollectionUtils.isEmpty(records)) {
 					Enterprise enterprise = enterpriseDao.findOne(records.get(0).getEnuu());

src/main/java/com/uas/platform/b2b/support/MessageConf.java

@@ -88,6 +88,12 @@ public class MessageConf {
 	@Value("#{message.messagePublicServiceDevUrl}")
 	private String messagePublicServiceDevUrl;
 
+    /**
+     * 添加合作伙伴通知
+     */
+	@Value("#{message.msgAddPartForB2B}")
+    private String msgAddPartForB2B;
+
 	public String getTplInvitationForB2B() {
 		return tplInvitationForB2B;
 	}
@@ -183,4 +189,12 @@ public class MessageConf {
 	public void setMessagePublicServiceDevUrl(String messagePublicServiceDevUrl) {
 		this.messagePublicServiceDevUrl = messagePublicServiceDevUrl;
 	}
+
+    public String getMsgAddPartForB2B() {
+        return msgAddPartForB2B;
+    }
+
+    public void setMsgAddPartForB2B(String msgAddPartForB2B) {
+        this.msgAddPartForB2B = msgAddPartForB2B;
+    }
 }

src/main/java/com/uas/platform/b2b/v2/controller/InviteRecordController.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2b.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.model.InvitationRecord;
 import com.uas.platform.b2b.search.SearchService;
-import com.uas.platform.b2b.service.InvitationRecordService;
 import com.uas.platform.b2b.support.CommBufferedLogger;
 import com.uas.platform.b2b.v2.model.Invitation;
 import com.uas.platform.b2b.v2.service.InviteRecordService;
@@ -37,9 +36,6 @@ public class InviteRecordController {
     @Autowired
     private InviteRecordService inviteRecordService;
 
-    @Autowired
-    private InvitationRecordService recordService;
-
     private final static CommBufferedLogger logger = BufferedLoggerManager.getLogger(CommBufferedLogger.class);
 
     @Autowired
@@ -182,4 +178,5 @@ public class InviteRecordController {
         logger.log("邀请注册", "添加合作伙伴", "添加企业UU：" + inviteEnUU + ",用户:" + inviteUserName, userUU, enUU);
         return inviteRecordService.addPartner(userUU, enUU, inviteEnUU, inviteUserName, inviteUserTel, app);
     }
+
 }

src/main/java/com/uas/platform/b2b/v2/service/impl/InviteRecordServiceImpl.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.account.entity.PartnershipRecord;
 import com.uas.account.util.AccountUtils;
+import com.uas.message.sms.service.SmsService;
+import com.uas.platform.b2b.core.util.ThreadUtils;
 import com.uas.platform.b2b.dao.CommonDao;
 import com.uas.platform.b2b.dao.InvitationRecordDao;
 import com.uas.platform.b2b.model.Enterprise;
@@ -29,7 +31,9 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * Created by hejq on 2018-03-22.
@@ -55,6 +59,14 @@ public class InviteRecordServiceImpl implements InviteRecordService {
     @Autowired
     private MessageConf messageConf;
 
+    @Autowired
+    private SmsService smsService;
+
+    /**
+     * 短信接口
+     */
+    final String messageUrl = "http://message.ubtob.com/sms/send";
+
     /**
      * 通过填写的名称检验企业是否已注册
      *
@@ -68,6 +80,11 @@ public class InviteRecordServiceImpl implements InviteRecordService {
         if (!CollectionUtils.isEmpty(enterprises)) {
             for (Enterprise e : enterprises) {
                 EnterpriseBaseInfo baseInfo = new EnterpriseBaseInfo(e);
+                User user = userService.findUserByUserUU(e.getEnAdminuu());
+                if (null != user) {
+                    baseInfo.setAdminName(user.getUserName());
+                    baseInfo.setEnTel(user.getUserTel());
+                }
                 List<InvitationRecord> records = invitationRecordService.findbyVendName(e.getEnName());
                 if (!CollectionUtils.isEmpty(records)) {
                     Enterprise enterprise = enterpriseService.findByEnUU(records.get(0).getEnuu());
@@ -167,28 +184,52 @@ public class InviteRecordServiceImpl implements InviteRecordService {
         }
         record.setVendName(v.getEnName());
         record.setVendUID(v.getEnBussinessCode());
-        if (null != v.getAdmin()) {
-            record.setVendUserCode(String.valueOf(v.getAdmin().getUserUU()));
-            record.setVendUserEmail(v.getAdmin().getUserEmail());
-            record.setVendUserName(v.getAdmin().getUserName());
-            record.setVendUserTel(v.getAdmin().getUserTel());
+        String adnimTel = null;
+        User user = new User();
+        if (null != v.getEnAdminuu()) {
+            user = userService.findUserByUserUU(v.getEnAdminuu());
+            if (null != user) {
+                record.setVendUserCode(String.valueOf(user.getUserUU()));
+                record.setVendUserEmail(user.getUserEmail());
+                record.setVendUserName(user.getUserName());
+                record.setVendUserTel(user.getUserTel());
+                adnimTel = user.getUserTel();
+            }
         }
         Enterprise c = enterpriseService.findByEnUU(enUU);
         record.setAppId(app);
         record.setCustName(c.getEnName());
         record.setCustUID(c.getEnBussinessCode());
         record.setCustUserCode(String.valueOf(userUU));
-        User cu = userService.findUserByUserTel(inviteUserTel);
-        record.setCustUserEmail(cu.getUserEmail());
-        record.setCustUserName(cu.getUserName());
-        record.setCustUserTel(cu.getUserTel());
+        User cu = userService.findUserByUserUU(userUU);
+        if (null != cu) {
+            record.setCustUserEmail(cu.getUserEmail());
+            record.setCustUserName(cu.getUserName());
+            record.setCustUserTel(cu.getUserTel());
+        }
+        String contactTel = null;
+        User vu = new User();
         if (!StringUtils.isEmpty(inviteUserTel)) {
-            User vu = userService.findUserByUserTel(inviteUserTel);
-            record.setVendUserCode(String.valueOf(vu.getUserUU()));
-            record.setVendUserEmail(vu.getUserEmail());
-            String userName = StringUtils.isEmpty(inviteUserName) ? vu.getUserName() : inviteUserName;
-            record.setVendUserName(userName);
-            record.setVendUserTel(vu.getUserTel());
+            vu = userService.findUserByUserTel(inviteUserTel);
+            if (null != vu) {
+                record.setVendUserCode(String.valueOf(vu.getUserUU()));
+                record.setVendUserEmail(vu.getUserEmail());
+                String userName = StringUtils.isEmpty(inviteUserName) ? vu.getUserName() : inviteUserName;
+                record.setVendUserName(userName);
+                record.setVendUserTel(vu.getUserTel());
+                contactTel = vu.getUserTel();
+            }
+        }
+        // 发送短信通知
+        if (adnimTel.equals(contactTel)) {// 相同的人调用通知接口
+            try {
+                smsService.send(messageConf.getMsgAddPartForB2B(), adnimTel,
+                        new Object[] { user.getUserName(), c.getEnName(), v.getEnName() });
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else { // 针对不同的人调用不同的接口
+
         }
         String result = AccountUtils.addNewRecord(record);
         JSONObject object = JSON.parseObject(result);
@@ -197,11 +238,6 @@ public class InviteRecordServiceImpl implements InviteRecordService {
         return map;
     }
 
-    /**
-     * 短信接口
-     */
-    final String messageUrl = "http://message.ubtob.com/sms/send";
-
     /**
      * 增加注册记录
      *
@@ -227,7 +263,6 @@ public class InviteRecordServiceImpl implements InviteRecordService {
             map.put("error", "该企业已注册！");
             return map;
         }
-        Map<String, Object> model = new HashMap<String, Object>();
         // 先判断记录
         InvitationRecord oldrecord = invitationRecordDao.findByUseruuAndVendname(record.getUseruu(), record.getVendname());
         if (record.getId() != null) { // 如果是已存在的，直接替换
@@ -287,19 +322,24 @@ public class InviteRecordServiceImpl implements InviteRecordService {
      * @param custUser 当前用户
      * @param custEn 当前企业
      */
-    private void sendMsg(InvitationRecord record, User custUser, Enterprise custEn) {
-        try {
-            SmsMessage sms = new SmsMessage();
-            List<Object> obj = new ArrayList<Object>();
-            obj.add(record.getVendusername());
-            obj.add(record.getVendname());
-            obj.add(custUser.getUserName() + "(" + custEn.getEnName() + ")");
-            sms.setParams(obj);
-            sms.setReceiver(record.getVendusertel());
-            sms.setTemplateId(messageConf.getMsgInvitationForB2B());
-            HttpUtil.sendPost(messageUrl, FlexJsonUtils.toJsonDeep(sms));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+    private void sendMsg(final InvitationRecord record, final User custUser, final Enterprise custEn) {
+        ThreadUtils.task(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    SmsMessage sms = new SmsMessage();
+                    List<Object> obj = new ArrayList<Object>();
+                    obj.add(record.getVendusername());
+                    obj.add(record.getVendname());
+                    obj.add(custUser.getUserName() + "(" + custEn.getEnName() + ")");
+                    sms.setParams(obj);
+                    sms.setReceiver(record.getVendusertel());
+                    sms.setTemplateId(messageConf.getMsgInvitationForB2B());
+                    HttpUtil.sendPost(messageUrl, FlexJsonUtils.toJsonDeep(sms));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }).run();
     }
 }

src/main/resources/dev/message.properties

@@ -11,5 +11,6 @@ tplAutoInquiryForB2B=fe01ead8-1e26-43d9-8278-4f8a9b4b343c
 msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
 messageUrl=http://message.ubtob.com/sms/send
+msgAddPartForB2B=5222f956-69e8-4692-9b14-9711a4ead828
 
 messagePublicServiceDevUrl=http://192.168.253.131:8080

src/main/resources/prod/message.properties

@@ -11,6 +11,7 @@ tplAutoInquiryForB2B=fe01ead8-1e26-43d9-8278-4f8a9b4b343c
 msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
 messageUrl=http://message.ubtob.com/sms/send
+msgAddPartForB2B=5222f956-69e8-4692-9b14-9711a4ead828
 
 messagePublicServiceDevUrl=http://10.10.100.23:24000
 #wangyc localhost

src/main/resources/test/message.properties

@@ -11,5 +11,6 @@ tplAutoInquiryForB2B=fe01ead8-1e26-43d9-8278-4f8a9b4b343c
 msgInquiryForB2B=629edeb3-a87e-4a40-a5e5-51d9ae734f1b
 msgAutoInquiryForB2B=8cf71d56-09bb-4d60-993e-ed87ce72ec3b
 messageUrl=http://message.ubtob.com/sms/send
+msgAddPartForB2B=5222f956-69e8-4692-9b14-9711a4ead828
 
 messagePublicServiceDevUrl=http://218.17.158.219:24000/message/

src/main/webapp/resources/js/index/app.js

@@ -1378,6 +1378,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         templateUrl: 'static/tpl/index/baseInfo/modal/QQshare_modal.html',
                         controller: 'QQShareCtrl',
                     });
+                } else {
+                    $scope.enterprise = $scope.existEn[0];
                 }
             });
         }
@@ -1388,7 +1390,26 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.cancel = function () {
             $modalInstance.dismiss();
         }
+        $scope.closeDetail = function() {
+            $scope.exist = 0;
+        }
 
+        /**
+         * 添加合作伙伴
+         * @param enterprise
+         */
+        $scope.addPartner = function(en) {
+            InvitationRecord.addPart({inviteEnUU: $scope.enterprise.uu, inviteUserName: en.vendusername, inviteUserTel: en.vendusertel}, {}, function(data) {
+                if (data.success) {
+                    toaster.pop('success', data.success);
+                    $modalInstance.dismiss();
+                } else if (data.error) {
+                    toaster.pop('error', data.error);
+                }
+            }, function(response) {
+                toaster.pop('error', response.data);
+            });
+        }
     }]);
 
     /**
@@ -1444,6 +1465,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.cancel = function () {
             $modalInstance.dismiss();
         }
+
     }]);
 
     /**

src/main/webapp/resources/js/index/services/BaseInfo.js

@@ -457,6 +457,13 @@ define(['ngResource'], function() {
 			getInviteUrl: {
                 url: 'invitationrecord/inviteUrl',
                 method: 'GET'
+			},
+            /**
+			 * 添加合作伙伴
+             */
+            addPart: {
+                url: 'invitationrecord/addPart',
+                method: 'POST'
 			}
 		})
 	}]);

src/main/webapp/resources/tpl/index/search/enterpirseInfo.html

@@ -19,28 +19,29 @@
 				<li class="text-inverse text-info">请输入<b>完整的企业名称</b>，系统将根据企业名称验证企业是已注册优软云</li>
 				<li><em>企业名称</em><input type="text" placeholder="企业名称" ng-model="enter.vendname" required="true"></li>
 				<li ng-if="existEn" class="register">您邀请企业已注册优软云<span ng-click="viewDetail()">查看详情</span></li>
-				<li><em>联系人</em><input type="text" placeholder="客户姓名"  ng-model="enter.vendusername" required="true"></li>
+				<li><em>联系人</em><input type="text" placeholder="客户姓名"  ng-model="enter.closeDetail" required="true"></li>
 				<li><em>手机</em><input type="text" placeholder="手机" ng-model="enter.vendusertel" ng-pattern="/^1(3|4|5|7|8)\d{9}$/" required="true"></li>
-				<li class="per-btn perBtn"><button ng-click="save(enter)" class="save" ng-disabled="contactInfo.$invalid">发送邀请</button><a ng-click="cancel()" class="mod-psd">取消</a></li>
+				<li class="per-btn perBtn" ng-if="!existEn"><button ng-click="save(enter)" class="save" ng-disabled="contactInfo.$invalid">发送邀请</button><a ng-click="cancel()" class="mod-psd">取消</a></li>
+				<li class="per-btn perBtn" ng-if="existEn"><button ng-click="addPartner(enter)" class="save" ng-disabled="contactInfo.$invalid">添加合作伙伴</button><a ng-click="cancel()" class="mod-psd">取消</a></li>
 			</ul>
 		</form>
 	</div>
 	<div class="box01 box box-bottom" ng-if="exist == 1">
 		<div class="box-header">
 			<p>企业详情</p>
-			<a class="close">&times;</a>
+			<a class="close" ng-click="closeDetail()">&times;</a>
 		</div>
 		<form class="per-data" name="contactInfo" id="contactInfo">
-			<ul ng-repeat="e in existEn">
-                <li><em>企业名称:</em><input type="text" ng-model="e.enName"></li>
-                <li><em>地址:</em><input type="text" ng-model="e.enAddress"></li>
-                <li><em>法人:</em><input type="text" ng-model="e.enCorporation"></li>
-                <li><em>管理员:</em><input type="text" ng-model="e.adminName"></li>
-                <li><em>联系电话:</em><input type="text" ng-model="e.enTel"></li>
-                <li><em>注册日期:</em><input type="text" ng-model="e.date"></li>
-                <li><em>邀请人:</em><input type="text" ng-model="e.inviteUserName"></li>
-                <li><em>邀请企业:</em><input type="text" ng-model="e.inviteEnName"></li>
-                <li><a class="mod-psd" ng-click="cancel()">关闭</a></li>
+			<ul>
+				<li><em>企业名称:</em><input type="text" ng-model="enterprise.enName"></li>
+				<li><em>地址:</em><input type="text" ng-model="enterprise.enAddress"></li>
+				<li><em>法人:</em><input type="text" ng-model="enterprise.enCorporation"></li>
+				<li><em>管理员:</em><input type="text" ng-model="enterprise.adminName"></li>
+				<li><em>联系电话:</em><input type="text" ng-model="enterprise.enTel"></li>
+				<li><em>注册日期:</em><input type="text" ng-model="enterprise.date"></li>
+				<li><em>邀请人:</em><input type="text" ng-model="enterprise.inviteUserName"></li>
+				<li><em>邀请企业:</em><input type="text" ng-model="enterprise.inviteEnName"></li>
+                <li><a class="mod-psd" ng-click="closeDetail()">关闭</a></li>
 			</ul>
 		</form>
 	</div>