## Fix - 查询区域偶发带分页&查询会员盒数
This commit is contained in:
parent
f4c6516e10
commit
b62724a7e6
|
@ -46,7 +46,11 @@ public class ApiRetailHomePageController extends BaseController {
|
||||||
CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(pkMember, pkCountry, systemType);
|
CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(pkMember, pkCountry, systemType);
|
||||||
CuMemberRetailAchieveVO vo = CuMemberRetailAchieveVO.builder()
|
CuMemberRetailAchieveVO vo = CuMemberRetailAchieveVO.builder()
|
||||||
.totalBox(result.getTotalBoxNum())
|
.totalBox(result.getTotalBoxNum())
|
||||||
|
.bigAreaBox(result.getBigRangeTotalBoxNum())
|
||||||
.smallAreaBox(result.getSmallRangeTotalBoxNum())
|
.smallAreaBox(result.getSmallRangeTotalBoxNum())
|
||||||
|
.totalSumPv(result.getTotalPv())
|
||||||
|
.bigArealPv(result.getBigRangeTotalPv())
|
||||||
|
.smallAreaPv(result.getSmallRangeTotalPv())
|
||||||
.build();
|
.build();
|
||||||
return AjaxResult.success(vo);
|
return AjaxResult.success(vo);
|
||||||
// return AjaxResult.success(retailAchieveService.selectMemberSmallBox(pkMember, pkCountry, systemType));
|
// return AjaxResult.success(retailAchieveService.selectMemberSmallBox(pkMember, pkCountry, systemType));
|
||||||
|
|
|
@ -12,6 +12,7 @@ import com.hzs.common.core.annotation.RepeatSubmitSimple;
|
||||||
import com.hzs.common.core.config.BdConfig;
|
import com.hzs.common.core.config.BdConfig;
|
||||||
import com.hzs.common.core.constant.msg.AreaConstants;
|
import com.hzs.common.core.constant.msg.AreaConstants;
|
||||||
import com.hzs.common.core.enums.*;
|
import com.hzs.common.core.enums.*;
|
||||||
|
import com.hzs.common.core.utils.PageUtils;
|
||||||
import com.hzs.common.core.web.controller.BaseController;
|
import com.hzs.common.core.web.controller.BaseController;
|
||||||
import com.hzs.common.core.web.domain.AjaxResult;
|
import com.hzs.common.core.web.domain.AjaxResult;
|
||||||
import com.hzs.common.core.web.page.TableDataInfo;
|
import com.hzs.common.core.web.page.TableDataInfo;
|
||||||
|
@ -258,6 +259,7 @@ public class RetailMemberController extends BaseController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/region-tree")
|
@GetMapping("/region-tree")
|
||||||
public AjaxResult regionTree() {
|
public AjaxResult regionTree() {
|
||||||
|
PageUtils.clearPage();
|
||||||
List<BdArea> areaList = iCuMemberRetailRegionService.listChooseRegion(SecurityUtils.getSystemType());
|
List<BdArea> areaList = iCuMemberRetailRegionService.listChooseRegion(SecurityUtils.getSystemType());
|
||||||
if (CollectionUtil.isEmpty(areaList)) {
|
if (CollectionUtil.isEmpty(areaList)) {
|
||||||
log.info("region-tree: 111");
|
log.info("region-tree: 111");
|
||||||
|
|
Loading…
Reference in New Issue