Commit 1529e24a by 陶光胜

观云台小程序

parent bd9c2fc0
......@@ -22,6 +22,8 @@ import com.gic.mall.share.api.service.ShopApiService;
import com.google.inject.internal.asm.$Handle;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -30,6 +32,7 @@ import java.util.List;
@RestController
public class BaseSalesController {
private Logger log = LogManager.getLogger(BaseSalesController.class);
@Autowired
private DataAuthUtils dataAuthUtils;
@Autowired
......@@ -86,6 +89,7 @@ public class BaseSalesController {
dto.setPageNum(qo.getPageNum());
dto.setPageSize(qo.getPageSize());
ServiceResponse<Page<BaseSalesDTO>> response = this.baseSalesApiService.pageBaseSales(dto);
log.info("response:{}", JSON.toJSONString(response));
vo.setPage(this.goDownComponent.parseData(response.getResult(), qo.getChannel(), qo.getEnterpriseId(), qo.getLevel(), maxLevel));
dto.setCountType(2);//合计
/**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
......@@ -94,6 +98,7 @@ public class BaseSalesController {
dto.getOnLine().add("-1");
}
ServiceResponse<Page<BaseSalesDTO>> totalResponse = this.baseSalesApiService.pageBaseSales(dto);
log.info("totalResponse:{}", JSON.toJSONString(totalResponse));
this.goDownComponent.parseTotal(totalResponse, vo);
if(qo.getChannel() != null && qo.getChannel() == 1 && qo.getLevel() == levelVo.getLevel()){
dto.setCountType(3); //无归属
......@@ -103,6 +108,7 @@ public class BaseSalesController {
dto.getStoreInfoIdList().add(-1);
dto.getOnLine().add("-1");
ServiceResponse<Page<BaseSalesDTO>> wgsResponse = this.baseSalesApiService.pageBaseSales(dto);
log.info("wgsResponse:{}", JSON.toJSONString(wgsResponse));
this.goDownComponent.parseWgs(wgsResponse, vo);
}
return RestResponse.success(vo);
......
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