diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cArticleController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cArticleController.java index 86ddce8..ae5b0a6 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cArticleController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cArticleController.java @@ -46,8 +46,6 @@ public class Oms2cArticleController extends BaseController @Autowired private IEmisArticleLikeRecordService emisArticleLikeRecordService; - - @JacksonFilter(exclude= { "content" },value= EmisArticle.class,type= JacksonFilter.JscksonFilterType.RESPONSE) diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCustomerUserController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCustomerUserController.java index c9ae8b2..c541d82 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCustomerUserController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCustomerUserController.java @@ -11,6 +11,7 @@ package com.xdadan.erp.oms.web; +import com.alibaba.fastjson.JSONObject; import com.xdadan.erp.oms.common.core.controller.BaseController; import com.xdadan.erp.oms.common.core.domain.AjaxResult; import com.xdadan.erp.oms.common.core.domain.entity.SysOmsUser; @@ -48,19 +49,14 @@ public class Oms2cCustomerUserController extends BaseController public AjaxResult idVerification(@RequestBody SysOmsUser emisCustomerUser) { try { + SysOmsUser oldUser=sysOmsUserService.selectSysOmsUserById(getLoginUser().getUser().getId()); + if("1".equals(oldUser.getIdVerifyStatus())){ + return AjaxResult.error("已实名"); + } + emisCustomerUser.setIdVerifyStatus("1"); - SysOmsUser user=sysOmsUserService.selectSysOmsUserById(getLoginUser().getUser().getId()); + return toAjax(sysOmsUserService.updateSysOmsUser(emisCustomerUser)); -// EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone()); -// if(oldUser!=null){ -// return AjaxResult.error("该客户电话号码已被占用,请使用新号码"); -// } -// emisCustomerUser.setCustomerType("1"); -// emisCustomerUser.setSettledType("1"); -// emisCustomerUser.setUserType("1"); -// emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); -// return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser)); - return AjaxResult.success("成功"); } catch (Exception e) { e.printStackTrace(); return AjaxResult.error("数据重复!"); @@ -76,16 +72,18 @@ public class Oms2cCustomerUserController extends BaseController public AjaxResult getIdVerification() { try { -// EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone()); -// if(oldUser!=null){ -// return AjaxResult.error("该客户电话号码已被占用,请使用新号码"); -// } -// emisCustomerUser.setCustomerType("1"); -// emisCustomerUser.setSettledType("1"); -// emisCustomerUser.setUserType("1"); -// emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); -// return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser)); - return AjaxResult.success("成功"); + + SysOmsUser user=sysOmsUserService.selectSysOmsUserById(getLoginUser().getUser().getId()); + + JSONObject jObjData = new JSONObject(); + jObjData.put("realName",user.getRealName()); + jObjData.put("idType",user.getIdType()); + jObjData.put("idNo",user.getIdNo()); + jObjData.put("idPic1",user.getIdPic1()); + jObjData.put("idPic2",user.getIdPic2()); + jObjData.put("idVerifyStatus",user.getIdVerifyStatus()); + + return AjaxResult.success("成功",jObjData); } catch (Exception e) { e.printStackTrace(); return AjaxResult.error("数据重复!");