From e19827066db33f98eb3916137c7f721cd8fbfa23 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 22 Aug 2018 17:24:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E9=93=BA=E5=95=86=E6=88=B7][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=9B=B4=E6=96=B0=20=E4=BF=AE=E6=94=B9user?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E3=80=81=E6=B7=BB=E5=8A=A0=20status?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/domain/po/WxMerchantBUser.java | 13 +++++ .../impl/WxMerchantBUserServiceImpl.java | 1 + .../service/impl/WxMerchantServiceImpl.java | 50 ++++++++++++------- .../mapper/WxMerchantBUserMapper.xml | 7 ++- 4 files changed, 51 insertions(+), 20 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java index f1a7255eb..660f0b46a 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java @@ -77,6 +77,10 @@ public class WxMerchantBUser implements Serializable { @io.swagger.annotations.ApiModelProperty(value="name",name="name") private String name; + @io.swagger.annotations.ApiModelProperty(value="删除状态1删除0未删除",name="status") + private Integer status; + + public String getTenantId() { return tenantId; } @@ -146,6 +150,14 @@ public class WxMerchantBUser implements Serializable { this.name = _name; } + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") @@ -160,6 +172,7 @@ public class WxMerchantBUser implements Serializable { ,Token_ASC("`token` ASC"),Token_DESC("`token` DESC") ,ExpireTime_ASC("`expireTime` ASC"),ExpireTime_DESC("`expireTime` DESC") ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") ; private String value; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java index 7da93e763..945a82aaa 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java @@ -84,6 +84,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { public boolean hasphone(String phone) { WxMerchantBUser bUser = new WxMerchantBUser(); bUser.setPhone(phone); + bUser.setStatus(0); List list = wxMerchantBUserMapper.findList(bUser); return list.size()>=1?true:false; } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 65d8e6ba4..996e3eb05 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -122,13 +122,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxShopMapper.updateByPrimaryKeySelective(wxShop); } - //删除之前的关联用户 List bUsers = wxMerchant.getbUsers(); - for(WxMerchantBUser user:bUsers){ - wxMerchantBUserMapper.deleteByPrimaryKey(user.getId()); - } - //保存商户关联用户 for(WxMerchantBUser user:bUsers){ long id = idWorker.nextId(); @@ -140,6 +135,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { date = new Date(); user.setCreateDate(date); user.setUpdateDate(date); + user.setStatus(0); wxMerchantBUserMapper.insertSelective(user); } @@ -188,25 +184,43 @@ public class WxMerchantServiceImpl implements WxMerchantService { WxShopMapper.updateByPrimaryKeySelective(wxShop); } - //删除之前的关联用户 List bUsers = wxMerchant.getbUsers(); - for(WxMerchantBUser user:bUsers){ - wxMerchantBUserMapper.deleteByPrimaryKey(user.getId()); + //删除之前的关联用户 + WxMerchantBUser bUser = new WxMerchantBUser(); + bUser.setMerchantId(wxMerchant.getId()); + List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); + for(WxMerchantBUser wxMerchantBUser:wxMerchantBUserMapperList){ + wxMerchantBUser.setStatus(1); + wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser); } + //保存商户关联用户 for(WxMerchantBUser user:bUsers){ - long id = idWorker.nextId(); - user.setId(id); - user.setBUserId(id); - user.setMerchantId(wxMerchant.getId()); - user.setTenantId(wxMerchant.getTenantId()); - user.setAppId(wxAppinfo.getAppId()); - date = new Date(); - user.setCreateDate(date); - user.setUpdateDate(date); - wxMerchantBUserMapper.insertSelective(user); + if(user.getId()==null){//没有id的新增 + long id = idWorker.nextId(); + user.setId(id); + user.setBUserId(id); + user.setMerchantId(wxMerchant.getId()); + user.setTenantId(wxMerchant.getTenantId()); + user.setAppId(wxAppinfo.getAppId()); + date = new Date(); + user.setCreateDate(date); + user.setUpdateDate(date); + user.setStatus(0); + wxMerchantBUserMapper.insertSelective(user); + }else{//有id的更新 + user.setBUserId(user.getId()); + user.setMerchantId(wxMerchant.getId()); + user.setTenantId(wxMerchant.getTenantId()); + user.setAppId(wxAppinfo.getAppId()); + date = new Date(); + user.setUpdateDate(date); + user.setStatus(0); + wxMerchantBUserMapper.updateByPrimaryKeySelective(user); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index e35e13063..7c156dcf3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -14,11 +14,11 @@ - + - `id`,`tenant_id`,`b_user_id`,`phone`,`b_user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name` + `id`,`tenant_id`,`b_user_id`,`phone`,`b_user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status` @@ -81,6 +81,9 @@ and `name` = #{name} + + and `status` = #{status} + and id in