From 24c9c062abb857b0c64003120801af3ee95aa263 Mon Sep 17 00:00:00 2001 From: Caps <452713115@qq.com> Date: Wed, 22 Apr 2020 15:15:15 +0800 Subject: [PATCH] bug --- src/main/java/com/kiisoo/ic/customer/CustomerService.java | 8 +++----- .../ic/generalize/controller/RetailCompanyController.java | 4 ++-- .../ic/generalize/service/RetailCompanyService.java | 4 ++-- .../java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java | 8 ++++---- .../system/service/impl/PrivilageAccountServiceImpl.java | 4 ++-- src/main/resources/mapper/PoiStoreDOMapper.xml | 8 ++++++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index ff09162..6c2c87f 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -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 listCustomer(Long userId,Long sellerId,String search,String roleCode){ Map 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 stafferInfoVOS = poiStoreStaffDOMapper.selectInfoById(userId); Long shopId = stafferInfoVOS.get(0).getStoreId(); diff --git a/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java b/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java index 7db9e08..a778c76 100644 --- a/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java +++ b/src/main/java/com/kiisoo/ic/generalize/controller/RetailCompanyController.java @@ -79,7 +79,7 @@ public class RetailCompanyController extends BaseController { */ @ResponseBody @GetMapping("/store/company") - public Map listOfStore(@RequestParam("orgId") Long orgId){ + public Map listOfStore(@RequestParam(value = "orgId",required = false) Long orgId){ try{ List list = retailCompanyService.selectShopByCompany(orgId); return data(list); @@ -96,7 +96,7 @@ public class RetailCompanyController extends BaseController { */ @ResponseBody @GetMapping("/seller/store") - public Map listOfSeller(@RequestParam("shopId") Long shopId){ + public Map listOfSeller(@RequestParam(value = "shopId",required = false) Long shopId){ try{ List list = retailCompanyService.selectSellerByShop(shopId); return data(list); diff --git a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java index 233d7c9..62c0e04 100644 --- a/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java +++ b/src/main/java/com/kiisoo/ic/generalize/service/RetailCompanyService.java @@ -114,7 +114,7 @@ public class RetailCompanyService { * @param orgId 零售公司id * @return 门店信息 */ - public List selectShopByCompany(long orgId){ + public List selectShopByCompany(Long orgId){ return poiStoreDOMapper.selectShopByCompany(orgId); } @@ -123,7 +123,7 @@ public class RetailCompanyService { * @param shopId 零售公司id * @return 门店信息 */ - public List selectSellerByShop(long shopId){ + public List selectSellerByShop(Long shopId){ return poiStoreDOMapper.selectSellerByShop(shopId); } diff --git a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java index 3366c6e..ddeded2 100644 --- a/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java +++ b/src/main/java/com/kiisoo/ic/store/mapper/PoiStoreDOMapper.java @@ -31,13 +31,13 @@ public interface PoiStoreDOMapper extends BaseMapper { PoiStore selectShopByName(@Param("name") String name); - ShopRegionDO selectShopMsg(long shopId); + ShopRegionDO selectShopMsg(Long shopId); - CompanyStoreDO selectCompanyStore(long sellerId); + CompanyStoreDO selectCompanyStore(Long sellerId); - List selectShopByCompany(long orgId); + List selectShopByCompany(Long orgId); - List selectSellerByShop(long shopId); + List selectSellerByShop(Long shopId); String selectStoreQrCode(@Param("shopId")Long shopId); List selectShopByNameOrCode (@Param("name") String name); diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java index f04c720..a4d040d 100644 --- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java @@ -260,12 +260,12 @@ public class PrivilageAccountServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("user_id", userId).last("limit 1"); //店铺 diff --git a/src/main/resources/mapper/PoiStoreDOMapper.xml b/src/main/resources/mapper/PoiStoreDOMapper.xml index a2f66bd..6f1a80e 100644 --- a/src/main/resources/mapper/PoiStoreDOMapper.xml +++ b/src/main/resources/mapper/PoiStoreDOMapper.xml @@ -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} + + and t1.org_id = #{orgId} +