zhenghuang
/
bsdgy-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug

Browse Source
master
Caps 6 years ago
parent b223a28e34
commit 24c9c062ab
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/com/kiisoo/ic/customer/CustomerService.java
Unescape Escape View File

@ -7,8 +7,8 @@ import com.kiisoo.ic.constants.Constants;
import com.kiisoo.ic.customer.bean.CustomerDTO;
import com.kiisoo.ic.customer.bean.CustomerModifyDTO;
import com.kiisoo.ic.customer.bean.FriendDTO;
import com.kiisoo.ic.customer.entity.OpCustomer;
import com.kiisoo.ic.customer.bean.OpCustomerDTO;
import com.kiisoo.ic.customer.entity.OpCustomer;
import com.kiisoo.ic.customer.entity.OpSellerCustomerRelation;
import com.kiisoo.ic.customer.entity.OpVip;
import com.kiisoo.ic.customer.mapper.OpCustomerDOMapper;
@ -17,18 +17,16 @@ import com.kiisoo.ic.customer.mapper.OpVipDOMapper;
import com.kiisoo.ic.domain.service.PrivilageDomainService;
import com.kiisoo.ic.generalize.service.RetailCompanyService;
import com.kiisoo.ic.store.entity.PoiStore;
import com.kiisoo.ic.store.service.PoiStoreService;
import com.kiisoo.ic.store.entity.PoiStoreStaff;
import com.kiisoo.ic.store.mapper.PoiStoreDOMapper;
import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper;
import com.kiisoo.ic.store.service.PoiStoreService;
import com.kiisoo.ic.system.enums.RoleEnum;
import com.kiisoo.ic.webappmy.vo.StafferInfoVO;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@ -258,7 +256,7 @@ public class CustomerService {
public Map<String,Object> listCustomer(Long userId,Long sellerId,String search,String roleCode){
Map<String,Object> results = new HashMap<>();
Date thisDate = new Date();
Date lastDate = DateUtils.addDays(thisDate, -1);
Date lastDate = new Date();
if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())){
List<StafferInfoVO> stafferInfoVOS = poiStoreStaffDOMapper.selectInfoById(userId);
Long shopId = stafferInfoVOS.get(0).getStoreId();

4
src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java
Unescape Escape View File

@ -79,7 +79,7 @@ public class RetailCompanyController extends BaseController {
*/
@ResponseBody
@GetMapping("/store/company")
public Map<String,Object> listOfStore(@RequestParam("orgId") Long orgId){
public Map<String,Object> listOfStore(@RequestParam(value = "orgId",required = false) Long orgId){
try{
List<PoiStore> list = retailCompanyService.selectShopByCompany(orgId);
return data(list);
@ -96,7 +96,7 @@ public class RetailCompanyController extends BaseController {
*/
@ResponseBody
@GetMapping("/seller/store")
public Map<String,Object> listOfSeller(@RequestParam("shopId") Long shopId){
public Map<String,Object> listOfSeller(@RequestParam(value = "shopId",required = false) Long shopId){
try{
List<PrivilageUserDO> list = retailCompanyService.selectSellerByShop(shopId);
return data(list);

4
src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java
Unescape Escape View File

@ -114,7 +114,7 @@ public class RetailCompanyService {
* @param orgId 零售公司id
* @return 门店信息
*/
public List<PoiStore> selectShopByCompany(long orgId){
public List<PoiStore> selectShopByCompany(Long orgId){
return poiStoreDOMapper.selectShopByCompany(orgId);
}
@ -123,7 +123,7 @@ public class RetailCompanyService {
* @param shopId 零售公司id
* @return 门店信息
*/
public List<PrivilageUserDO> selectSellerByShop(long shopId){
public List<PrivilageUserDO> selectSellerByShop(Long shopId){
return poiStoreDOMapper.selectSellerByShop(shopId);
}

8
src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java
Unescape Escape View File

@ -31,13 +31,13 @@ public interface PoiStoreDOMapper extends BaseMapper<PoiStore> {
PoiStore selectShopByName(@Param("name") String name);
ShopRegionDO selectShopMsg(long shopId);
ShopRegionDO selectShopMsg(Long shopId);
CompanyStoreDO selectCompanyStore(long sellerId);
CompanyStoreDO selectCompanyStore(Long sellerId);
List<PoiStore> selectShopByCompany(long orgId);
List<PoiStore> selectShopByCompany(Long orgId);
List<PrivilageUserDO> selectSellerByShop(long shopId);
List<PrivilageUserDO> selectSellerByShop(Long shopId);
String selectStoreQrCode(@Param("shopId")Long shopId);
List<PoiStore> selectShopByNameOrCode (@Param("name") String name);

4
src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java
Unescape Escape View File

@ -260,12 +260,12 @@ public class PrivilageAccountServiceImpl extends ServiceImpl<PrivilageAccountDOM
if (accountBean == null) return;
String roleCode = accountBean.getRoleCode();
//不是店长设置为全部
if (!roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) {
if (!roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode()) && !roleCode.equals(RoleEnum.ROLE_CODE_DG.getRoleCode())) {
accountBean.setChannel(AccountBean.ALL_SHOP);
accountBean.setShopName(AccountBean.ALL_SHOP);
}
//店长角色查询店铺信息和渠道
if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) {
if (roleCode.equals(RoleEnum.ROLE_CODE_DZ.getRoleCode()) || roleCode.equals(RoleEnum.ROLE_CODE_DG.getRoleCode())) {
QueryWrapper<PoiStoreStaff> wrapper = new QueryWrapper<>();
wrapper.eq("user_id", userId).last("limit 1");
//店铺

8
src/main/resources/mapper/PoiStoreDOMapper.xml
Unescape Escape View File

@ -37,14 +37,18 @@
where t1.domain_id = t2.domain_id
and t2.entity_id = t3.id
and t2.type = 3
and t1.org_id = #{orgId}
<if test="orgId != null">
and t1.org_id = #{orgId}
</if>
</select>
<select id="selectSellerByShop" resultType="com.kiisoo.ic.system.entity.PrivilageUserDO">
select t2.id ,t2.name
from poi_store_staff t1,
privilage_user t2
where t1.user_id = t2.id
and t1.store_id = #{shopId}
<if test="shopId != null">
and t1.store_id = #{shopId}
</if>
</select>
<select id="selectStoreQrCode" resultType="java.lang.String">
select t2.qr_code as qrCode

Write Preview
Loading…
Cancel
Save