From 2b91ddfb7797b4814e97f9b516c463c7a8c686f4 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Wed, 19 Sep 2018 15:33:02 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF=E7=94=A8=E6=88=B7=E5=8F=AA=E5=8F=96?= =?UTF-8?q?=E6=9C=89=E6=95=88=E7=94=A8=E6=88=B7][=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxMerchantBUserController.java | 2 ++ .../com/iformall/enums/EnumMerchantBUserStatus.java | 4 ++-- .../iformall/service/impl/WxMerchantServiceImpl.java | 10 +++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 0ac5a85e7..1c9a38a6e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.enums.EnumMerchantBUserStatus; import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.WxMallService; import com.iformall.service.WxMerchantBUserService; @@ -113,6 +114,7 @@ public class WxMerchantBUserController extends BaseController { WxMerchantBUser user = new WxMerchantBUser(); user.setAppId(appId); user.setPhone(phone); + user.setStatus(EnumMerchantBUserStatus.NOT_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 5d2810f91..42e1d5d24 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantBUserStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantBUserStatus.java @@ -5,8 +5,8 @@ package com.iformall.enums; */ public enum EnumMerchantBUserStatus { - NOT_BOUND(0, "绑定"), - BOUND(1, "未绑定"), + VALID(0, "有效/绑定"), + NOT_VALID(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 6660a9f64..1b56939de 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -99,7 +99,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); wxMerchantBUser.setMerchantId(wxMerchant.getId()); - wxMerchantBUser.setStatus(EnumMerchantBUserStatus.BOUND.getCode()); + wxMerchantBUser.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode()); List bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); wxMerchant.setbUsers(bUserList); return wxMerchant; @@ -217,7 +217,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { date = new Date(); user.setCreateDate(date); user.setUpdateDate(date); - user.setStatus(EnumMerchantBUserStatus.NOT_BOUND.getCode()); + user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); wxMerchantBUserMapper.insertSelective(user); } //添加商户的分账账户(不是必选) @@ -296,7 +296,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { bUser.setMerchantId(wxMerchant.getId()); List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); for(WxMerchantBUser wxMerchantBUser:wxMerchantBUserMapperList){ - wxMerchantBUser.setStatus(EnumMerchantBUserStatus.NOT_BOUND.getCode()); + wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser); } @@ -313,7 +313,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { date = new Date(); user.setCreateDate(date); user.setUpdateDate(date); - user.setStatus(EnumMerchantBUserStatus.BOUND.getCode()); + user.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode()); wxMerchantBUserMapper.insertSelective(user); }else{//有id的更新 user.setBUserId(user.getId()); @@ -322,7 +322,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { user.setAppId(wxAppinfo.getAppId()); date = new Date(); user.setUpdateDate(date); - user.setStatus(EnumMerchantBUserStatus.BOUND.getCode()); + user.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode()); wxMerchantBUserMapper.updateByPrimaryKeySelective(user); }