Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
This commit is contained in:
commit
bbf18b7b0a
@ -184,6 +184,8 @@ public class ConnectUtil {
|
|||||||
.clientId(qqConnectSettingItem.getAppId())
|
.clientId(qqConnectSettingItem.getAppId())
|
||||||
.clientSecret(qqConnectSettingItem.getAppKey())
|
.clientSecret(qqConnectSettingItem.getAppKey())
|
||||||
.redirectUri(getRedirectUri(authInterface))
|
.redirectUri(getRedirectUri(authInterface))
|
||||||
|
//这里qq获取unionid 需要配置为true,详情可以查阅属性说明,内部有帮助文档
|
||||||
|
.unionId(true)
|
||||||
.build(), cache);
|
.build(), cache);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,7 @@ public interface StoreDetailMapper extends BaseMapper<StoreDetail> {
|
|||||||
"d.* from li_store s inner join li_store_detail d on s.id=d.store_id where s.id=#{storeId}")
|
"d.* from li_store s inner join li_store_detail d on s.id=d.store_id where s.id=#{storeId}")
|
||||||
StoreDetailVO getStoreDetail(String storeId);
|
StoreDetailVO getStoreDetail(String storeId);
|
||||||
|
|
||||||
@Select("select s.member_name,s.store_name,s.store_disable,s.self_operated,s.store_center,s.store_logo,s.store_desc,d.* " +
|
@Select("select s.member_name,s.store_name,s.store_disable,s.self_operated,s.store_center,s.store_logo,s.store_desc,s.store_address_detail,s.store_address_path,s.store_address_id_path,d.* " +
|
||||||
"from li_store s inner join li_store_detail d on s.id=d.store_id where s.member_id=#{memberId}")
|
"from li_store s inner join li_store_detail d on s.id=d.store_id where s.member_id=#{memberId}")
|
||||||
StoreDetailVO getStoreDetailByMemberId(String memberId);
|
StoreDetailVO getStoreDetailByMemberId(String memberId);
|
||||||
|
|
||||||
|
@ -179,8 +179,8 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
|
|||||||
memberService.updateById(member);
|
memberService.updateById(member);
|
||||||
//设定商家的结算日
|
//设定商家的结算日
|
||||||
storeDetailService.update(new LambdaUpdateWrapper<StoreDetail>()
|
storeDetailService.update(new LambdaUpdateWrapper<StoreDetail>()
|
||||||
.eq(StoreDetail::getStoreId,id)
|
.eq(StoreDetail::getStoreId, id)
|
||||||
.set(StoreDetail::getSettlementDay,new DateTime()));
|
.set(StoreDetail::getSettlementDay, new DateTime()));
|
||||||
} else {
|
} else {
|
||||||
store.setStoreDisable(StoreStatusEnum.REFUSED.value());
|
store.setStoreDisable(StoreStatusEnum.REFUSED.value());
|
||||||
}
|
}
|
||||||
@ -220,11 +220,17 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
|
|||||||
if (!Optional.ofNullable(store).isPresent()) {
|
if (!Optional.ofNullable(store).isPresent()) {
|
||||||
Member member = memberService.getById(UserContext.getCurrentUser().getId());
|
Member member = memberService.getById(UserContext.getCurrentUser().getId());
|
||||||
store = new Store(member);
|
store = new Store(member);
|
||||||
|
BeanUtil.copyProperties(storeCompanyDTO, store);
|
||||||
this.save(store);
|
this.save(store);
|
||||||
StoreDetail storeDetail = new StoreDetail();
|
StoreDetail storeDetail = new StoreDetail();
|
||||||
storeDetail.setStoreId(store.getId());
|
storeDetail.setStoreId(store.getId());
|
||||||
BeanUtil.copyProperties(storeCompanyDTO, storeDetail);
|
BeanUtil.copyProperties(storeCompanyDTO, storeDetail);
|
||||||
return storeDetailService.save(storeDetail);
|
return storeDetailService.save(storeDetail);
|
||||||
|
} else {
|
||||||
|
store.setStoreAddressDetail(storeCompanyDTO.getStoreAddressDetail());
|
||||||
|
store.setStoreAddressIdPath(storeCompanyDTO.getStoreAddressIdPath());
|
||||||
|
store.setStoreAddressPath(storeCompanyDTO.getStoreAddressPath());
|
||||||
|
this.saveOrUpdate(store);
|
||||||
}
|
}
|
||||||
//判断是否存在店铺详情,如果没有则进行新建,如果存在则进行修改
|
//判断是否存在店铺详情,如果没有则进行新建,如果存在则进行修改
|
||||||
StoreDetail storeDetail = storeDetailService.getStoreDetail(store.getId());
|
StoreDetail storeDetail = storeDetailService.getStoreDetail(store.getId());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user