caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper 2021-11-16 15:27:47 +08:00
commit f9112c4b39
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java
View File

@ -180,11 +180,28 @@ public class StoreDetail extends BaseIdEntity {
public StoreDetail(Store store, AdminStoreApplyDTO adminStoreApplyDTO) { public StoreDetail(Store store, AdminStoreApplyDTO adminStoreApplyDTO) {
this.storeId = store.getId(); this.storeId = store.getId();
//过滤字段值
isNotNull(adminStoreApplyDTO);
//设置店铺公司信息、设置店铺银行信息、设置店铺其他信息 //设置店铺公司信息、设置店铺银行信息、设置店铺其他信息
BeanUtil.copyProperties(adminStoreApplyDTO, this); BeanUtil.copyProperties(adminStoreApplyDTO, this);
this.settlementDay = DateUtil.date(); this.settlementDay = DateUtil.date();
this.stockWarning = 10; this.stockWarning = 10;
} }
public void isNotNull(AdminStoreApplyDTO adminStoreApplyDTO){
if("null".equals(adminStoreApplyDTO.getSalesConsigneeName())){
adminStoreApplyDTO.setSalesConsigneeName("");
}
if("null".equals(adminStoreApplyDTO.getSalesConsigneeMobile())){
adminStoreApplyDTO.setSalesConsigneeMobile("");
}
if("null".equals(adminStoreApplyDTO.getSalesConsigneeDetail())){
adminStoreApplyDTO.setSalesConsigneeDetail("");
}
if("null".equals(adminStoreApplyDTO.getDdCode())){
adminStoreApplyDTO.setDdCode("");
}
}
} }

3
framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java
View File

@ -75,7 +75,8 @@ public class StoreDetailServiceImpl extends ServiceImpl<StoreDetailMapper, Store
@Override @Override
public StoreDetailVO getStoreDetailVO(String storeId) { public StoreDetailVO getStoreDetailVO(String storeId) {
return this.baseMapper.getStoreDetail(storeId); StoreDetailVO storeDetail = this.baseMapper.getStoreDetail(storeId);
return storeDetail;
} }
@Override @Override

1
framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
View File

@ -115,7 +115,6 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
if (Boolean.TRUE.equals(member.getHaveStore())) { if (Boolean.TRUE.equals(member.getHaveStore())) {
throw new ServiceException(ResultCode.STORE_APPLY_DOUBLE_ERROR); throw new ServiceException(ResultCode.STORE_APPLY_DOUBLE_ERROR);
} }
//添加店铺 //添加店铺
Store store = new Store(member, adminStoreApplyDTO); Store store = new Store(member, adminStoreApplyDTO);
this.save(store); this.save(store);