angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:c921750b2e4ef3a365f0c97f49d1ae7875d13508
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
..
compare: angelo:97b828b4b9db08bfd17f880ba7f21ff9e4ab0bbb
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
angelo:master

No commits in common. "c921750b2e4ef3a365f0c97f49d1ae7875d13508" and "97b828b4b9db08bfd17f880ba7f21ff9e4ab0bbb" have entirely different histories.
c921750b2e ... 97b828b4b9

2 changed files with 0 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/ApiRetailHomePageController.java
View File

@ -46,11 +46,7 @@ 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));

2
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java
View File

@ -12,7 +12,6 @@ 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;
@ -259,7 +258,6 @@ 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");