Преглед изворни кода

feat:分转元

release_toaliyun_real
xmzhao71 пре 2 година
родитељ
комит
f98881d7bb
3 измењених фајлова са 18 додато и 15 уклоњено
  1. +10
    -5
      mallink-swagger/src/main/java/com/iformall/config/SwaggerConfiguration.java
  2. +1
    -5
      mallinkAdmin/src/main/resources/application-dev.yml
  3. +7
    -5
      mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java

+ 10
- 5
mallink-swagger/src/main/java/com/iformall/config/SwaggerConfiguration.java Прегледај датотеку

@@ -62,7 +62,15 @@ public class SwaggerConfiguration {
} }





/**
* 1、分组
* 2、切换分组,修改访问/v2/api-docs/ 接口的路径
* https://admintest.malls.iformall.com/v2/api-docs/
* https://admintest.malls.iformall.com/B/v2/api-docs/
*
* @param servletContext
* @return {@link Docket}
*/
@Bean @Bean
public Docket api(ServletContext servletContext) { public Docket api(ServletContext servletContext) {
// base-path处理 // base-path处理
@@ -93,10 +101,7 @@ public class SwaggerConfiguration {
Predicates.or(basePath) Predicates.or(basePath)
) )
) )
.build()
.securitySchemes(Collections.singletonList(securitySchema()))
.securityContexts(Collections.singletonList(securityContext()));
// .groupName("a")
.build();
// .pathMapping("/B"); // .pathMapping("/B");
} }




+ 1
- 5
mallinkAdmin/src/main/resources/application-dev.yml Прегледај датотеку

@@ -204,10 +204,6 @@ logging:
path: ./logs/admin path: ./logs/admin


swagger: swagger:
services:
a: /
b: /B
pre-path: ${server.servlet.context-path}
base-package: com.iformall.controller base-package: com.iformall.controller
title: 富茂_iformall_接口文档 title: 富茂_iformall_接口文档
description: 前后端联调 description: 前后端联调
@@ -215,7 +211,7 @@ swagger:
license: Apache license: Apache
license-url: https://admintest.malls.iformall.com license-url: https://admintest.malls.iformall.com
terms-of-service-url: https://admintest.malls.iformall.com terms-of-service-url: https://admintest.malls.iformall.com
host: localhost:9000
host: localhost:8888
contact: contact:
name: 张三 name: 张三
url: https://admintest.malls.iformall.com url: https://admintest.malls.iformall.com

+ 7
- 5
mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java Прегледај датотеку

@@ -192,11 +192,13 @@ public class CockpitScreenServiceImpl implements CockpitScreenService {
}); });


CountOrderTrendVO.OrderInfo orderInfo = new CountOrderTrendVO.OrderInfo(); CountOrderTrendVO.OrderInfo orderInfo = new CountOrderTrendVO.OrderInfo();
orderInfo.setAmount(tradeOrder.stream().map(MonthOrderMapping::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
BigDecimal orderAmount = tradeOrder.stream().map(MonthOrderMapping::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
orderInfo.setAmount(orderAmount.divide(BigDecimal.valueOf(100)));
orderInfo.setCount(tradeOrder.stream().map(MonthOrderMapping::getCount).reduce(Integer::sum).orElse(0)); orderInfo.setCount(tradeOrder.stream().map(MonthOrderMapping::getCount).reduce(Integer::sum).orElse(0));


CountOrderTrendVO.VerifiedOrderInfo verifiedOrderInfo = new CountOrderTrendVO.VerifiedOrderInfo(); CountOrderTrendVO.VerifiedOrderInfo verifiedOrderInfo = new CountOrderTrendVO.VerifiedOrderInfo();
verifiedOrderInfo.setAmount(verifiedOrder.stream().map(MonthOrderMapping::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO));
BigDecimal verifiedOrderAmount = verifiedOrder.stream().map(MonthOrderMapping::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
verifiedOrderInfo.setAmount(verifiedOrderAmount.divide(BigDecimal.valueOf(100)));
verifiedOrderInfo.setCount(verifiedOrder.stream().map(MonthOrderMapping::getCount).reduce(Integer::sum).orElse(0)); verifiedOrderInfo.setCount(verifiedOrder.stream().map(MonthOrderMapping::getCount).reduce(Integer::sum).orElse(0));
verifiedOrderInfo.setUserCount(verifiedOrder.stream().map(MonthOrderMapping::getUserCount).reduce(Integer::sum).orElse(0)); verifiedOrderInfo.setUserCount(verifiedOrder.stream().map(MonthOrderMapping::getUserCount).reduce(Integer::sum).orElse(0));


@@ -236,8 +238,8 @@ public class CockpitScreenServiceImpl implements CockpitScreenService {
Integer carUserCount = wxCUserCarMapper.countCarUser(tenantIds); Integer carUserCount = wxCUserCarMapper.countCarUser(tenantIds);


CountBasicVO vo = new CountBasicVO(); CountBasicVO vo = new CountBasicVO();
vo.setTotalTradingAmount(totalTradingAmount);
vo.setTotalVerifiedAmount(totalVerifiedAmount);
vo.setTotalTradingAmount(totalTradingAmount.divide(BigDecimal.valueOf(100)));
vo.setTotalVerifiedAmount(totalVerifiedAmount.divide(BigDecimal.valueOf(100)));
vo.setTotalMerchantCount(totalMerchantCount); vo.setTotalMerchantCount(totalMerchantCount);
vo.setTotalUserCount(totalUserCount); vo.setTotalUserCount(totalUserCount);
vo.setTotalReachUserCount(sumVisit.getUv()); vo.setTotalReachUserCount(sumVisit.getUv());
@@ -246,7 +248,7 @@ public class CockpitScreenServiceImpl implements CockpitScreenService {


vo.setTodayPvCount(todaySumVisit.getPv()); vo.setTodayPvCount(todaySumVisit.getPv());
vo.setTodayUserCount(todayUserCount); vo.setTodayUserCount(todayUserCount);
vo.setTodayTradingAmount(todayTradingAmount);
vo.setTodayTradingAmount(todayTradingAmount.divide(BigDecimal.valueOf(100)));
return vo; return vo;
} }




Loading…
Откажи
Сачувај