Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgAccountServiceImpl.java

@@ -84,6 +84,9 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
     @Autowired
     SysSmsSettingMapper sysSmsSettingMapper;
 
+    @Autowired
+    private TaOrgAccountBlockedMapper taOrgAccountBlockedMapper;
+
     @Autowired
     SMSUtils smsUtils;
 

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -254,4 +254,28 @@ public class TaContactController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 新增财务联系人
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/taContactFinance/{id}",method= RequestMethod.PUT)
+    public ResponseBean taContactInfoAdd(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaContact taContact = new TaContact();
+            taContact.setContactId(id);
+            taContact.setContactType(CommConstant.FINANCE);
+            if (iTaContactService.updateById(taContact)) {
+                responseBean.addSuccess(taContact);
+            } else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taContactInfoAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }