Commit fc0051e0 by 徐高华

积分商城订单数

parent 853fdf4e
...@@ -214,6 +214,11 @@ ...@@ -214,6 +214,11 @@
<artifactId>gic-game-api</artifactId> <artifactId>gic-game-api</artifactId>
<version>${gic-game-api}</version> <version>${gic-game-api}</version>
</dependency> </dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-integral-mall-api</artifactId>
<version>${gic-integral-mall-api}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -1616,9 +1616,12 @@ public class WxStaffController extends WebBaseController { ...@@ -1616,9 +1616,12 @@ public class WxStaffController extends WebBaseController {
// 区经门店列表 // 区经门店列表
@RequestMapping("/list-clerk-store") @RequestMapping("/list-clerk-store")
public RestResponse<Object> listClerkStore(String wxEnterpriseId , String enterpriseId,String clerkId,String searchParams , @RequestParam(defaultValue="20")int pageSize , @RequestParam(defaultValue="1")int currentPage) { public RestResponse<Object> listClerkStore(String wxEnterpriseId , String enterpriseId,String clerkId, @RequestParam(defaultValue="20")int pageSize , @RequestParam(defaultValue="1")int currentPage) {
List<StoreListVO> voList = new ArrayList<>();
List<String> storeIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId) ; List<String> storeIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId) ;
if (CollectionUtils.isEmpty(storeIdList)) {
return RestResponse.failure("-1", "无授权门店");
}
List<StoreListVO> voList = new ArrayList<>();
int totalCount = 0 ; int totalCount = 0 ;
List<StoreDTO> storeDTOList = null ; List<StoreDTO> storeDTOList = null ;
if(storeIdList.get(0).contains("-1")) { if(storeIdList.get(0).contains("-1")) {
...@@ -1666,7 +1669,7 @@ public class WxStaffController extends WebBaseController { ...@@ -1666,7 +1669,7 @@ public class WxStaffController extends WebBaseController {
//区经门店查询 //区经门店查询
@RequestMapping("search-clerk-store") @RequestMapping("search-clerk-store")
public RestResponse<Object> listClerkStoreByParams(String wxEnterpriseId, String enterpriseId, String storeSearchParams , String clerkId) { public RestResponse<Object> listClerkStoreByParams(String wxEnterpriseId, String enterpriseId, String clerkId, String storeSearchParams) {
if(StringUtils.isEmpty(storeSearchParams)) { if(StringUtils.isEmpty(storeSearchParams)) {
return RestResponse.failure("-1", "查询条件为空") ; return RestResponse.failure("-1", "查询条件为空") ;
} }
......
...@@ -37,6 +37,8 @@ import com.gic.game.api.dto.GameActivityDTO; ...@@ -37,6 +37,8 @@ import com.gic.game.api.dto.GameActivityDTO;
import com.gic.game.api.service.GameService; import com.gic.game.api.service.GameService;
import com.gic.haoban.manage.web.controller.WebBaseController; import com.gic.haoban.manage.web.controller.WebBaseController;
import com.gic.haoban.manage.web.vo.AiMemberLogListVO; import com.gic.haoban.manage.web.vo.AiMemberLogListVO;
import com.gic.integralmall.api.dto.IntegralMallExchangeLogDTO;
import com.gic.integralmall.api.service.IntegralmallService;
import com.gic.marketing.api.dto.CoupCardShelfDTO; import com.gic.marketing.api.dto.CoupCardShelfDTO;
import com.gic.marketing.api.dto.MemberCardLogDTO; import com.gic.marketing.api.dto.MemberCardLogDTO;
import com.gic.marketing.api.dto.member.MemberSmsLogDTO; import com.gic.marketing.api.dto.member.MemberSmsLogDTO;
...@@ -86,7 +88,19 @@ public class MemberMarketingController extends WebBaseController { ...@@ -86,7 +88,19 @@ public class MemberMarketingController extends WebBaseController {
private GameApiService gameApiService; private GameApiService gameApiService;
@Autowired @Autowired
private AchievementService achievementService; private AchievementService achievementService;
@Autowired
private IntegralmallService integralMallService;
// 会员积分商城订单数
@RequestMapping("/member/integral-order-num")
private RestResponse<Object> getIntegralOrderNum(String enterpriseId, String memberId) {
Page<IntegralMallExchangeLogDTO> page = new Page<>();
page.setCurrentPage(1);
page.setPageSize(20);
page = integralMallService.findExchangeLogFromMember(enterpriseId, memberId, null, null, "1,2,3", null, page);
return RestResponse.successResult(page.getTotalCount());
}
/** /**
* ECM营销日志 * ECM营销日志
* *
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<dubbo:reference interface="com.gic.marketing.pro.api.service.game.GameApiService" id="gameApiService" /> <dubbo:reference interface="com.gic.marketing.pro.api.service.game.GameApiService" id="gameApiService" />
<dubbo:reference interface="com.gic.member.api.service.AchievementService" id="achievementService" /> <dubbo:reference interface="com.gic.member.api.service.AchievementService" id="achievementService" />
<dubbo:reference interface="com.gic.clerk.api.service.PowerService" id="powerService" /> <dubbo:reference interface="com.gic.clerk.api.service.PowerService" id="powerService" />
<dubbo:reference interface="com.gic.integralmall.api.service.IntegralmallService" id="integralmallService" />
<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/> <dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService" <dubbo:reference interface="com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment