diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 7dec8590c..82402f61f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -235,7 +235,7 @@ public class WxMerchantBUserController extends BaseController { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); } // check password - if (user1.getbUserPwd().equalsIgnoreCase(password)) { + if (user1.getUserPwd().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 0972707d4..934e0fb1c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -50,8 +50,8 @@ public class WxMerchantBUser implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "phone") private String phone; /***/ - @io.swagger.annotations.ApiModelProperty(value = "", name = "bUserPwd") - private String bUserPwd; + @io.swagger.annotations.ApiModelProperty(value = "", name = "userPwd") + private String userPwd; /*商户id**/ @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") private Long merchantId; @@ -159,19 +159,19 @@ public class WxMerchantBUser implements Serializable { this.status = status; } - public String getbUserPwd() { - return bUserPwd; + public String getUserPwd() { + return userPwd; } - public void setbUserPwd(String bUserPwd) { - this.bUserPwd = bUserPwd; + public void setUserPwd(String userPwd) { + this.userPwd = userPwd; } public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), Phone_ASC("`phone` ASC"), Phone_DESC("`phone` DESC"), - BUserPwd_ASC("`b_user_pwd` ASC"), BUserPwd_DESC("`b_user_pwd` DESC"), + UserPwd_ASC("`user_pwd` ASC"), UserPwd_DESC("`user_pwd` DESC"), MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), 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 b8f7fb319..0d7cfdab3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -118,7 +118,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { List list = wxMerchantBUserMapper.findList(bUser); if (list.size() > 0) { bUser = list.get(0); - bUser.setbUserPwd(pwd); + bUser.setUserPwd(pwd); try { wxMerchantBUserMapper.updateByPrimaryKeySelective(bUser); } catch (Exception e) { diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index 181c3da5b..31bd24945 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -5,7 +5,7 @@ - + @@ -17,7 +17,7 @@ - `id`,`tenant_id`,`phone`,`b_user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status` + `id`,`tenant_id`,`phone`,`user_pwd`,`merchant_id`,`create_date`,`update_date`,`app_id`,`token`,`expire_time`,`name`,`status` @@ -36,10 +36,10 @@ and `phone` = #{phone} - - - - and `b_user_pwd` like concat('%', #{bUserPwd},'%') + + + + and `user_pwd` like concat('%', #{userPwd},'%')