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

[商户商铺][商户][编辑回显商铺问题]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
8085701f2d
2 измененных файлов: 24 добавлений и 12 удалений
  1. +10
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  2. +14
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 10
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -7,6 +7,7 @@ import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;


@Table(name = "wx_merchant") @Table(name = "wx_merchant")
public class WxMerchant implements Serializable { public class WxMerchant implements Serializable {
@@ -77,6 +78,8 @@ public class WxMerchant implements Serializable {
@Transient @Transient
private String accountName; private String accountName;


@Transient
private List<Map<String,Object>> shoplist;


/*租户ID**/ /*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
@@ -109,6 +112,13 @@ public class WxMerchant implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="联系人",name="linkPerson") @io.swagger.annotations.ApiModelProperty(value="联系人",name="linkPerson")
private String linkPerson; private String linkPerson;


public List<Map<String, Object>> getShoplist() {
return shoplist;
}

public void setShoplist(List<Map<String, Object>> shoplist) {
this.shoplist = shoplist;
}


public String getTenantId() { public String getTenantId() {
return tenantId; return tenantId;


+ 14
- 12
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -23,7 +23,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxMerchantMapper wxMerchantMapper; WxMerchantMapper wxMerchantMapper;


@Autowired @Autowired
WxShopMapper WxShopMapper;
WxShopMapper wxShopMapper;


@Autowired @Autowired
WxMerchantShopMapper wxMerchantShopMapper; WxMerchantShopMapper wxMerchantShopMapper;
@@ -75,7 +75,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxMerchantShop wxMerchantShop=new WxMerchantShop(); WxMerchantShop wxMerchantShop=new WxMerchantShop();
wxMerchantShop.setMerchantId(wxMerchant.getId()); wxMerchantShop.setMerchantId(wxMerchant.getId());
wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode());
List<WxShop> shops = new ArrayList<>();
List<Map<String,Object>> shops = new ArrayList<>();


WxRentContract wxRentContract = new WxRentContract(); WxRentContract wxRentContract = new WxRentContract();
wxRentContract.setMerchantId(id); wxRentContract.setMerchantId(id);
@@ -90,12 +90,14 @@ public class WxMerchantServiceImpl implements WxMerchantService {
for(WxMerchantShop merchantShop:wxMerchantShopList){ for(WxMerchantShop merchantShop:wxMerchantShopList){
wxMerchant.setRentalStartDate(merchantShop.getRentalStartDate()); wxMerchant.setRentalStartDate(merchantShop.getRentalStartDate());
wxMerchant.setRentalEndDate(merchantShop.getRentalEndDate()); wxMerchant.setRentalEndDate(merchantShop.getRentalEndDate());
WxShop wxShop = WxShopMapper.selectByPrimaryKey(merchantShop.getShopId());
if(wxShop!=null)
shops.add(wxShop);
WxShop record = new WxShop();
record.setId(merchantShop.getShopId());
List<Map<String,Object>> shoplist = wxShopMapper.findListMap(record);
if(shoplist.size()>0)
shops.add(shoplist.get(0));
} }


wxMerchant.setShops(shops);
wxMerchant.setShoplist(shops);


WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); WxMerchantBUser wxMerchantBUser = new WxMerchantBUser();
wxMerchantBUser.setMerchantId(wxMerchant.getId()); wxMerchantBUser.setMerchantId(wxMerchant.getId());
@@ -130,7 +132,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxShop wxShop = new WxShop(); WxShop wxShop = new WxShop();
wxShop.setId(merchantShop.getShopId()); wxShop.setId(merchantShop.getShopId());
wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode());//未出租 wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode());//未出租
WxShopMapper.updateByPrimaryKeySelective(wxShop);
wxShopMapper.updateByPrimaryKeySelective(wxShop);
} }


//解绑用户 //解绑用户
@@ -166,7 +168,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {


WxShop wxShopP = new WxShop(); WxShop wxShopP = new WxShop();
wxShopP.setId(wxMerchant.getShopids().get(0)); wxShopP.setId(wxMerchant.getShopids().get(0));
wxShopP = WxShopMapper.findList(wxShopP).get(0);
wxShopP = wxShopMapper.findList(wxShopP).get(0);


WxRentContract wxRentContract = new WxRentContract(); WxRentContract wxRentContract = new WxRentContract();
wxRentContract.setMerchantId(merchantid); wxRentContract.setMerchantId(merchantid);
@@ -201,7 +203,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxShop wxShop = new WxShop(); WxShop wxShop = new WxShop();
wxShop.setId(shopid); wxShop.setId(shopid);
wxShop.setStatus(EnumShopStatus.RENT.getCode());//已出租 wxShop.setStatus(EnumShopStatus.RENT.getCode());//已出租
WxShopMapper.updateByPrimaryKeySelective(wxShop);
wxShopMapper.updateByPrimaryKeySelective(wxShop);
} }


List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); List<WxMerchantBUser> bUsers = wxMerchant.getbUsers();
@@ -239,7 +241,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {


WxShop wxShopP = new WxShop(); WxShop wxShopP = new WxShop();
wxShopP.setId(wxMerchant.getShopids().get(0)); wxShopP.setId(wxMerchant.getShopids().get(0));
wxShopP = WxShopMapper.findList(wxShopP).get(0);
wxShopP = wxShopMapper.findList(wxShopP).get(0);


WxRentContract wxRentContract = wxRentContractMapper.findObjectByMerchantId(wxMerchant.getId()); WxRentContract wxRentContract = wxRentContractMapper.findObjectByMerchantId(wxMerchant.getId());
wxRentContract.setRentalStartDate(wxMerchant.getRentalStartDate()); wxRentContract.setRentalStartDate(wxMerchant.getRentalStartDate());
@@ -263,7 +265,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxShop wxShop = new WxShop(); WxShop wxShop = new WxShop();
wxShop.setId(merchantShop.getShopId()); wxShop.setId(merchantShop.getShopId());
wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode());//未出租 wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode());//未出租
WxShopMapper.updateByPrimaryKeySelective(wxShop);
wxShopMapper.updateByPrimaryKeySelective(wxShop);
} }


//保存商户商铺的关联 //保存商户商铺的关联
@@ -286,7 +288,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxShop wxShop = new WxShop(); WxShop wxShop = new WxShop();
wxShop.setId(shopid); wxShop.setId(shopid);
wxShop.setStatus(EnumShopStatus.RENT.getCode());//已出租 wxShop.setStatus(EnumShopStatus.RENT.getCode());//已出租
WxShopMapper.updateByPrimaryKeySelective(wxShop);
wxShopMapper.updateByPrimaryKeySelective(wxShop);
} }


List<WxMerchantBUser> bUsers = wxMerchant.getbUsers(); List<WxMerchantBUser> bUsers = wxMerchant.getbUsers();


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