From c0233942af1d7feaa898546c9f670c98aacaa4e3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 12 Nov 2018 19:49:34 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E5=91=98]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E5=AF=86=E7=A0=81=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMerchantBUserController.java | 2 +- .../com/iformall/domain/po/WxMerchantBUser.java | 15 --------------- .../service/impl/WxCouponOrderServiceImpl.java | 3 +-- .../service/impl/WxMerchantBUserServiceImpl.java | 4 ++-- .../service/impl/WxMerchantServiceImpl.java | 10 +++++----- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index eb345958a..dfb072002 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -149,7 +149,7 @@ public class WxMerchantBUserController extends BaseController { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); } // check password - if (user1.getBUserPwd().equalsIgnoreCase(password)) { + if (user1.getbUserPwd().equalsIgnoreCase(password)) { user1.createToken(currentDate); token = user1.getToken(); resultMap.put("token", token); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index 69f6bc9b8..f78b64b32 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -89,13 +89,6 @@ public class WxMerchantBUser implements Serializable { tenantId = _tenantId; } - public Long getBUserId() { - return bUserId; - } - - public void setBUserId(Long _bUserId) { - bUserId = _bUserId; - } public String getPhone() { return phone; @@ -105,14 +98,6 @@ public class WxMerchantBUser implements Serializable { phone = _phone; } - public String getBUserPwd() { - return bUserPwd; - } - - public void setBUserPwd(String _bUserPwd) { - bUserPwd = _bUserPwd; - } - public Long getMerchantId() { return merchantId; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index d432f85fe..dd82e932e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -38,7 +38,6 @@ import java.io.*; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.stream.Collectors; @Service public class WxCouponOrderServiceImpl implements WxCouponOrderService { @@ -345,7 +344,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } try { wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 - wxCouponOrder.setBUserId(wxMerchantBUser.getBUserId()); + wxCouponOrder.setBUserId(wxMerchantBUser.getbUserId()); wxCouponOrder.setUpdateDate(new Date()); wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index 58aa34bc3..1ccd6b113 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -69,7 +69,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { final IdWorker idWorker = IdWorker.get(); long id = idWorker.nextId(); record.setId(id); - record.setBUserId(id); + record.setbUserId(id); Date date = new Date(); record.setCreateDate(date); record.setUpdateDate(date); @@ -119,7 +119,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { List list = wxMerchantBUserMapper.findList(bUser); if (list.size() > 0) { bUser = list.get(0); - bUser.setBUserPwd(pwd); + bUser.setbUserPwd(pwd); try { wxMerchantBUserMapper.updateByPrimaryKeySelective(bUser); } catch (Exception e) { 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 7809dfe34..aff650c01 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -382,7 +382,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (user.getId() == null) { long id = idWorker.nextId(); user.setId(id); - user.setBUserId(id); + user.setbUserId(id); user.setMerchantId(wxMerchant.getId()); user.setTenantId(wxMerchant.getTenantId()); user.setAppId(wxAppinfo.getAppId()); @@ -392,7 +392,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); wxMerchantBUserMapper.insertSelective(user); } else {//有id的更新 - user.setBUserId(user.getId()); + user.setbUserId(user.getId()); user.setMerchantId(wxMerchant.getId()); user.setTenantId(wxMerchant.getTenantId()); user.setAppId(wxAppinfo.getAppId()); @@ -458,7 +458,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { for (WxMerchantBUser user : bUsers) { long id = idWorker.nextId(); user.setId(id); - user.setBUserId(id); + user.setbUserId(id); user.setMerchantId(merchantid); user.setTenantId(wxMerchant.getTenantId()); user.setAppId(wxAppinfo.getAppId()); @@ -558,7 +558,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (user.getId() == null) {//没有id的新增 long id = idWorker.nextId(); user.setId(id); - user.setBUserId(id); + user.setbUserId(id); user.setMerchantId(wxMerchant.getId()); user.setTenantId(wxMerchant.getTenantId()); user.setAppId(wxAppinfo.getAppId()); @@ -568,7 +568,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { user.setStatus(EnumMerchantBUserStatus.VALID.getCode()); wxMerchantBUserMapper.insertSelective(user); } else {//有id的更新 - user.setBUserId(user.getId()); + user.setbUserId(user.getId()); user.setMerchantId(wxMerchant.getId()); user.setTenantId(wxMerchant.getTenantId()); user.setAppId(wxAppinfo.getAppId());