添加合作伙伴数据处理更新

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

@@ -182,67 +182,71 @@ public class InviteRecordServiceImpl implements InviteRecordService {
     public ModelMap addPartner(Long userUU, Long enUU, Long inviteEnUU, String inviteUserName, String inviteUserTel, String app) throws Exception {
         ModelMap map = new ModelMap();
         PartnershipRecord record = new PartnershipRecord();
-        Enterprise v = enterpriseService.findByEnUU(inviteEnUU);
-        if (null == v) {
+        Enterprise c = enterpriseService.findByEnUU(inviteEnUU);
+        if (null == c) {
             throw new IllegalOperatorException("添加合作伙伴的企业未注册");
         }
-        record.setVendName(v.getEnName());
-        record.setVendUID(v.getEnBussinessCode());
+        record.setCustName(c.getEnName());
+        record.setCustUID(c.getEnBussinessCode());
         String adnimTel = null;
         User user = new User();
-        if (null != v.getEnAdminuu()) {
-            user = userService.findUserByUserUU(v.getEnAdminuu());
+        if (null != c.getEnAdminuu()) {
+            user = userService.findUserByUserUU(c.getEnAdminuu());
             if (null != user) {
-                record.setVendUserCode(String.valueOf(user.getUserUU()));
-                record.setVendUserEmail(user.getUserEmail());
-                record.setVendUserName(user.getUserName());
-                record.setVendUserTel(user.getUserTel());
+                record.setCustUserCode(String.valueOf(user.getUserUU()));
+                record.setCustUserEmail(user.getUserEmail());
+                record.setCustUserName(user.getUserName());
+                record.setCustUserTel(user.getUserTel());
                 adnimTel = user.getUserTel();
             }
         }
-        Enterprise c = enterpriseService.findByEnUU(enUU);
+        Enterprise v = enterpriseService.findByEnUU(enUU);
+        record.setVendName(v.getEnName());
+        record.setVendUID(v.getEnBussinessCode());
         record.setAppId(app);
-        record.setCustName(c.getEnName());
-        record.setCustUID(c.getEnBussinessCode());
-        record.setCustUserCode(String.valueOf(userUU));
-        User cu = userService.findUserByUserUU(userUU);
-        if (null != cu) {
-            record.setCustUserEmail(cu.getUserEmail());
-            record.setCustUserName(cu.getUserName());
-            record.setCustUserTel(cu.getUserTel());
+        record.setVendUserCode(String.valueOf(userUU));
+        User vu = userService.findUserByUserUU(userUU);
+        if (null != vu) {
+            record.setVendUserEmail(vu.getUserEmail());
+            record.setVendUserName(vu.getUserName());
+            record.setVendUserTel(vu.getUserTel());
         }
         String contactTel = null;
-        User vu = new User();
+        User cu = new User();
         if (!StringUtils.isEmpty(inviteUserTel)) {
             List<User> users = userDao.findUserByUserTel(inviteUserTel);
             if (!CollectionUtils.isEmpty(users)) {
-                vu = users.get(0);
-                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();
+                cu = users.get(0);
+                String userName = StringUtils.isEmpty(inviteUserName) ? cu.getUserName() : inviteUserName;
+                record.setCustUserCode(String.valueOf(cu.getUserUU()));
+                record.setCustUserEmail(cu.getUserEmail());
+                record.setCustUserName(userName);
+                record.setCustUserTel(cu.getUserTel());
+                contactTel = cu.getUserTel();
             }
         }
         // 发送短信通知
         if (adnimTel.equals(contactTel)) {// 相同的人调用通知接口
             try {
                 smsService.send(messageConf.getMsgAddPartForB2B(), adnimTel,
-                        new Object[] { user.getUserName(), v.getEnName(), c.getEnName() });
+                        new Object[] { user.getUserName(), c.getEnName(), v.getEnName() });
             } catch (Exception e) {
                 e.printStackTrace();
             }
         } else { // 针对不同的人调用不同的接口
             // 发送给管理员
-            sendMsgToManager(c.getEnName(), adnimTel);
+            sendMsgToManager(v.getEnName(), adnimTel);
             // 发送给联系人
-            sendMsgToContact(c.getEnName(), contactTel, user.getUserName(), adnimTel);
+            sendMsgToContact(v.getEnName(), contactTel, user.getUserName(), adnimTel);
         }
         String result = AccountUtils.addNewRecord(record);
         JSONObject object = JSON.parseObject(result);
-        map.put("error", object.getString("error"));
-        map.put("success", object.getString("success"));
+        String errorMsg = object.getString("error");
+        if (!StringUtils.isEmpty(errorMsg)) {
+            map.put("error", errorMsg);
+        } else {
+            map.put("success", object.getString("success"));
+        }
         return map;
     }