Просмотр исходного кода

[商户管理员][修改][密码字段]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
c0233942af
5 измененных файлов: 9 добавлений и 25 удалений
  1. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java
  2. +0
    -15
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java
  3. +1
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java
  5. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 1
- 1
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);


+ 0
- 15
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;
}


+ 1
- 2
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) {


+ 2
- 2
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<WxMerchantBUser> 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) {


+ 5
- 5
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());


Загрузка…
Отмена
Сохранить