| @@ -235,7 +235,7 @@ public class WxMerchantBUserController extends BaseController { | |||||
| return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); | return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); | ||||
| } | } | ||||
| // check password | // check password | ||||
| if (user1.getbUserPwd().equalsIgnoreCase(password)) { | |||||
| if (user1.getUserPwd().equalsIgnoreCase(password)) { | |||||
| user1.createToken(currentDate); | user1.createToken(currentDate); | ||||
| token = user1.getToken(); | token = user1.getToken(); | ||||
| resultMap.put("token", token); | resultMap.put("token", token); | ||||
| @@ -50,8 +50,8 @@ public class WxMerchantBUser implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "phone") | @io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "phone") | ||||
| private String 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**/ | /*商户id**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") | @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @@ -159,19 +159,19 @@ public class WxMerchantBUser implements Serializable { | |||||
| this.status = status; | 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 { | public static enum Field { | ||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | ||||
| TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), | TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), | ||||
| Phone_ASC("`phone` ASC"), Phone_DESC("`phone` 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"), | MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), | ||||
| CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), | CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), | ||||
| UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), | UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), | ||||
| @@ -118,7 +118,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { | |||||
| List<WxMerchantBUser> list = wxMerchantBUserMapper.findList(bUser); | List<WxMerchantBUser> list = wxMerchantBUserMapper.findList(bUser); | ||||
| if (list.size() > 0) { | if (list.size() > 0) { | ||||
| bUser = list.get(0); | bUser = list.get(0); | ||||
| bUser.setbUserPwd(pwd); | |||||
| bUser.setUserPwd(pwd); | |||||
| try { | try { | ||||
| wxMerchantBUserMapper.updateByPrimaryKeySelective(bUser); | wxMerchantBUserMapper.updateByPrimaryKeySelective(bUser); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -5,7 +5,7 @@ | |||||
| <id column="id" jdbcType="BIGINT" property="id" /> | <id column="id" jdbcType="BIGINT" property="id" /> | ||||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | ||||
| <result column="phone" jdbcType="VARCHAR" property="phone" /> | <result column="phone" jdbcType="VARCHAR" property="phone" /> | ||||
| <result column="b_user_pwd" jdbcType="VARCHAR" property="bUserPwd" /> | |||||
| <result column="user_pwd" jdbcType="VARCHAR" property="userPwd"/> | |||||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | <result column="merchant_id" jdbcType="BIGINT" property="merchantId" /> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | ||||
| @@ -17,7 +17,7 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `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` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -36,10 +36,10 @@ | |||||
| <if test=" null != phone "> | <if test=" null != phone "> | ||||
| and `phone` = #{phone} | and `phone` = #{phone} | ||||
| </if> | |||||
| <if test=" null != bUserPwd "> | |||||
| and `b_user_pwd` like concat('%', #{bUserPwd},'%') | |||||
| </if> | |||||
| <if test=" null != userPwd "> | |||||
| and `user_pwd` like concat('%', #{userPwd},'%') | |||||
| </if> | </if> | ||||