Przeglądaj źródła

[商户][修改][调整字段]

release_toaliyun_real
gongbiao 7 lat temu
rodzic
commit
9d9bd5cc67
2 zmienionych plików z 10 dodań i 10 usunięć
  1. +6
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  2. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 6
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Wyświetl plik

@@ -49,7 +49,7 @@ public class WxMerchant implements Serializable {
private List<WxShop> shops;

@Transient
private List<WxMerchantBUser> bUsers;
private List<WxMerchantBUser> users;

@Transient
private Long rentContractId;
@@ -238,12 +238,12 @@ public class WxMerchant implements Serializable {
this.shops = shops;
}

public List<WxMerchantBUser> getbUsers() {
return bUsers;
}
public List<WxMerchantBUser> getUsers() {
return users;
}

public void setbUsers(List<WxMerchantBUser> bUsers) {
this.bUsers = bUsers;
public void setUsers(List<WxMerchantBUser> users) {
this.users = users;
}

public Date getRentalStartDate() {


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Wyświetl plik

@@ -147,8 +147,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxMerchantBUser wxMerchantBUser = new WxMerchantBUser();
wxMerchantBUser.setMerchantId(wxMerchant.getId());
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode());
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser);
wxMerchant.setbUsers(bUserList);
List<WxMerchantBUser> userList = wxMerchantBUserMapper.findList(wxMerchantBUser);
wxMerchant.setUsers(userList);

//分账信息
WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant);
@@ -470,7 +470,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return new ResultData(ErrorCode.APP_ID_NOT_FOUND);
}
wxAppinfo = list.get(0);
List<WxMerchantBUser> bUsers = wxMerchant.getbUsers();
List<WxMerchantBUser> users = wxMerchant.getUsers();

//删除之前的关联用户
WxMerchantBUser bUser = new WxMerchantBUser();
@@ -482,7 +482,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
}
final IdWorker idWorker = IdWorker.get();
//保存商户关联用户
for (WxMerchantBUser user : bUsers) {
for (WxMerchantBUser user : users) {
if (user.getId() == null) {
long id = idWorker.nextId();
user.setId(id);


Ładowanie…
Anuluj
Zapisz