From 231368c219f9064c9d3a2fc4fd465a5bd191bf3a Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 20 Sep 2018 22:09:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E7=94=A8=E6=88=B7VALID/INVA?= =?UTF-8?q?LID=E6=95=B4=E7=90=86][=E6=95=B4=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxMerchantBUserController.java | 2 +- .../java/com/iformall/enums/EnumMerchantBUserStatus.java | 2 +- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 1c9a38a6e..d59c1d604 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -114,7 +114,7 @@ public class WxMerchantBUserController extends BaseController { WxMerchantBUser user = new WxMerchantBUser(); user.setAppId(appId); user.setPhone(phone); - user.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode()); + user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); Date currentDate = new Date(); WxMerchantBUser user1 = null; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantBUserStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantBUserStatus.java index 42e1d5d24..9fbdd15fa 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantBUserStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantBUserStatus.java @@ -6,7 +6,7 @@ package com.iformall.enums; public enum EnumMerchantBUserStatus { VALID(0, "有效/绑定"), - NOT_VALID(1, "无效/未绑定"), + INVALID(1, "无效/未绑定"), ; public static EnumMerchantBUserStatus getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 54104f80a..68f68ba59 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -140,7 +140,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { bUser.setMerchantId(wxMerchant.getId()); List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); for(WxMerchantBUser wxMerchantBUser:wxMerchantBUserMapperList){ - wxMerchantBUser.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode()); + wxMerchantBUser.setStatus(EnumMerchantBUserStatus.INVALID.getCode()); wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser); } } @@ -298,7 +298,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { bUser.setMerchantId(wxMerchant.getId()); List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); for(WxMerchantBUser wxMerchantBUser:wxMerchantBUserMapperList){ - wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); + wxMerchantBUser.setStatus(EnumMerchantBUserStatus.INVALID.getCode()); wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser); } @@ -315,7 +315,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { date = new Date(); user.setCreateDate(date); user.setUpdateDate(date); - user.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode()); + user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); wxMerchantBUserMapper.insertSelective(user); }else{//有id的更新 user.setBUserId(user.getId()); @@ -324,7 +324,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { user.setAppId(wxAppinfo.getAppId()); date = new Date(); user.setUpdateDate(date); - user.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode()); + user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); wxMerchantBUserMapper.updateByPrimaryKeySelective(user); }