修改

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -40,6 +40,7 @@ import cn.quantgroup.xyqb.service.user.IUserExtInfoService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.service.user.IUserSpouseService;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
+import cn.quantgroup.xyqb.util.IPUtil;
 import cn.quantgroup.xyqb.util.MqUtils;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import com.alibaba.fastjson.JSON;
@@ -69,6 +70,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 //import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
 //import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
 //import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
@@ -405,7 +408,8 @@ public class InnerController implements IBaseController {
   @RequestMapping("/contact/update/contact")
   public JsonResult updateContact(@RequestParam Long contactId, @RequestParam(required = false) String name,
                                   @RequestParam(required = false) String phoneNo,
-                                  @RequestParam(required = false) Relation relation, String key) {
+                                  @RequestParam(required = false) Relation relation, String key,
+                                  @RequestParam String reason,HttpServletRequest request) {
     if (!"@qwsdedad131323213w!".equals(key)) {
       return JsonResult.buildErrorStateResult("参数不合法", null);
     }
@@ -414,15 +418,18 @@ public class InnerController implements IBaseController {
     if (null == contact) {
       return JsonResult.buildErrorStateResult("修改联系人不存在", null);
     }
-    if (null == name && null == phoneNo) {
+    if (StringUtils.isEmpty(name) && StringUtils.isEmpty(phoneNo) ){
       return JsonResult.buildErrorStateResult("修改联系人修改条件不能都为空", null);
     }
-    if (!ValidationUtil.validatePhoneNo(contact.getPhoneNo())) {
+    if (!ValidationUtil.validatePhoneNo(name)) {
       return JsonResult.buildErrorStateResult("用户手机号错误", null);
     }
-    if (!ValidationUtil.validateChinese(contact.getName())) {
+    if (!ValidationUtil.validateChinese(phoneNo)) {
       return JsonResult.buildErrorStateResult("用户姓名错误", null);
     }
+    if(StringUtils.isEmpty(reason)){
+      return JsonResult.buildErrorStateResult("修改原因不能为空", null);
+    }
     if (null != name) {
       contact.setName(name);
     }
@@ -432,10 +439,12 @@ public class InnerController implements IBaseController {
     if (null != relation) {
       contact.setRelation(relation);
     }
+    LOGGER.info("修改前联系人信息:{}",contact);
     Timestamp now = new Timestamp(System.currentTimeMillis());
     contact.setUpdateAt(now);
     contact = contactService.save(contact);
-
+    String ip= IPUtil.getRemoteIP(request);
+    LOGGER.info("修改后联系人信息:{},修改原因：{},操作ip:{}",contact,reason,ip);
 
     return JsonResult.buildSuccessResult("修改联系人成功", contact);
   }
@@ -570,6 +579,7 @@ public class InnerController implements IBaseController {
   }
 
   @RequestMapping("/user_ext_info/search/user_id")
+  @LogHttpCaller
   public JsonResult searchUserExtInfoByUserId(Long userId) {
     if (userId == null) {
       return JsonResult.buildErrorStateResult("userId不能为空", null);