Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
O
oms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
oms
Commits
a8746400
提交
a8746400
authored
9月 20, 2023
作者:
xiaowang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
订单数据看板
上级
e0d60562
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
233 行增加
和
0 行删除
+233
-0
OrderReportController.java
...va/com/mmc/oms/controller/data/OrderReportController.java
+36
-0
OrderReportDao.java
src/main/java/com/mmc/oms/dao/data/OrderReportDao.java
+12
-0
UavOrderDao.java
src/main/java/com/mmc/oms/dao/uav/UavOrderDao.java
+5
-0
ImsAppApi.java
src/main/java/com/mmc/oms/feign/ImsAppApi.java
+19
-0
FeignConfiguration.java
...ain/java/com/mmc/oms/feign/config/FeignConfiguration.java
+5
-0
ImsApiHystrix.java
src/main/java/com/mmc/oms/feign/hystrix/ImsApiHystrix.java
+20
-0
OrderReportDTO.java
src/main/java/com/mmc/oms/model/dto/data/OrderReportDTO.java
+35
-0
ReleaseReportDTO.java
...ain/java/com/mmc/oms/model/dto/data/ReleaseReportDTO.java
+31
-0
OrderReportService.java
...ain/java/com/mmc/oms/service/data/OrderReportService.java
+13
-0
OrderReportServiceImpl.java
...com/mmc/oms/service/data/impl/OrderReportServiceImpl.java
+51
-0
OrderReportDao.xml
src/main/resources/mapper/data/OrderReportDao.xml
+6
-0
UavOrderDao.xml
src/main/resources/mapper/uav/UavOrderDao.xml
+0
-0
没有找到文件。
src/main/java/com/mmc/oms/controller/data/OrderReportController.java
0 → 100644
浏览文件 @
a8746400
package
com
.
mmc
.
oms
.
controller
.
data
;
import
com.mmc.oms.common.result.ResultBody
;
import
com.mmc.oms.model.dto.data.OrderReportDTO
;
import
com.mmc.oms.service.data.OrderReportService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiResponse
;
import
io.swagger.annotations.ApiResponses
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
/**
* @Author LW
* @date 2023/9/16 17:49
* 概要:
*/
@Api
(
tags
=
"云享飞加盟入驻及商品sku看板数据"
)
@RequestMapping
(
"/product/report"
)
@RestController
public
class
OrderReportController
{
@Autowired
private
OrderReportService
orderReportService
;
@ApiOperation
(
value
=
"获取用户报表数据"
)
@ApiResponses
({
@ApiResponse
(
code
=
200
,
message
=
"OK"
,
response
=
OrderReportDTO
.
class
)})
@GetMapping
(
"/getOrderReportData"
)
public
ResultBody
<
OrderReportDTO
>
getOrderReportData
()
{
return
orderReportService
.
getOrderReportData
();
}
}
src/main/java/com/mmc/oms/dao/data/OrderReportDao.java
0 → 100644
浏览文件 @
a8746400
package
com
.
mmc
.
oms
.
dao
.
data
;
import
org.apache.ibatis.annotations.Mapper
;
/**
* @Author LW
* @date 2023/9/19 10:06
* 概要:
*/
@Mapper
public
interface
OrderReportDao
{
}
src/main/java/com/mmc/oms/dao/uav/UavOrderDao.java
浏览文件 @
a8746400
...
@@ -4,6 +4,7 @@ import com.mmc.oms.entity.uav.*;
...
@@ -4,6 +4,7 @@ import com.mmc.oms.entity.uav.*;
import
com.mmc.oms.model.qo.uav.UavOrderQO
;
import
com.mmc.oms.model.qo.uav.UavOrderQO
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
java.util.List
;
/**
/**
...
@@ -49,4 +50,8 @@ public interface UavOrderDao {
...
@@ -49,4 +50,8 @@ public interface UavOrderDao {
void
updateUavOrderProportion
(
Integer
id
,
Integer
proportion
);
void
updateUavOrderProportion
(
Integer
id
,
Integer
proportion
);
void
closeShowUavOrder
(
Integer
id
);
void
closeShowUavOrder
(
Integer
id
);
int
getOrderCount
();
BigDecimal
getSaleOrderGMV
();
}
}
src/main/java/com/mmc/oms/feign/ImsAppApi.java
0 → 100644
浏览文件 @
a8746400
package
com
.
mmc
.
oms
.
feign
;
import
com.mmc.oms.common.result.ResultBody
;
import
com.mmc.oms.feign.hystrix.ImsApiHystrix
;
import
com.mmc.oms.model.dto.data.ReleaseReportDTO
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.GetMapping
;
/**
* @Author LW
* @date 2023/6/15 10:46 概要:
*/
@FeignClient
(
url
=
"${ims.url}"
,
name
=
"ims"
,
fallback
=
ImsApiHystrix
.
class
)
public
interface
ImsAppApi
{
@GetMapping
(
"/report/getReleaseReportData"
)
ResultBody
<
ReleaseReportDTO
>
getUserReportData
();
}
src/main/java/com/mmc/oms/feign/config/FeignConfiguration.java
浏览文件 @
a8746400
package
com
.
mmc
.
oms
.
feign
.
config
;
package
com
.
mmc
.
oms
.
feign
.
config
;
import
com.mmc.oms.feign.hystrix.ImsApiHystrix
;
import
com.mmc.oms.feign.hystrix.PmsAppApiHystrix
;
import
com.mmc.oms.feign.hystrix.PmsAppApiHystrix
;
import
com.mmc.oms.feign.hystrix.UserAppApiHystrix
;
import
com.mmc.oms.feign.hystrix.UserAppApiHystrix
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
...
@@ -24,4 +25,8 @@ public class FeignConfiguration {
...
@@ -24,4 +25,8 @@ public class FeignConfiguration {
return
new
UserAppApiHystrix
();
return
new
UserAppApiHystrix
();
}
}
@Bean
(
name
=
"imsApiHystrix"
)
public
ImsApiHystrix
imsAppApi
()
{
return
new
ImsApiHystrix
();
}
}
}
src/main/java/com/mmc/oms/feign/hystrix/ImsApiHystrix.java
0 → 100644
浏览文件 @
a8746400
package
com
.
mmc
.
oms
.
feign
.
hystrix
;
import
com.mmc.oms.common.result.ResultBody
;
import
com.mmc.oms.feign.ImsAppApi
;
import
com.mmc.oms.model.dto.data.ReleaseReportDTO
;
import
lombok.extern.slf4j.Slf4j
;
/**
* @Author LW
* @date 2023/6/15 10:47 概要:
*/
@Slf4j
public
class
ImsApiHystrix
implements
ImsAppApi
{
@Override
public
ResultBody
<
ReleaseReportDTO
>
getUserReportData
()
{
log
.
error
(
"熔断:ImsApiHystrix.getUserReportData"
);
return
null
;
}
}
src/main/java/com/mmc/oms/model/dto/data/OrderReportDTO.java
0 → 100644
浏览文件 @
a8746400
package
com
.
mmc
.
oms
.
model
.
dto
.
data
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.math.BigDecimal
;
/**
* @Author LW
* @date 2023/9/16 14:15
* 概要:
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public
class
OrderReportDTO
{
@ApiModelProperty
(
value
=
"商城售卖订单总数"
)
private
Integer
saleOrderCount
;
@ApiModelProperty
(
value
=
"商品租赁订单总数"
)
private
Integer
leaseOrderCount
;
@ApiModelProperty
(
value
=
"服务订单订单总数"
)
private
Integer
serviceOrderCount
;
@ApiModelProperty
(
value
=
"商城售卖交易总额"
)
private
BigDecimal
saleGMV
;
@ApiModelProperty
(
value
=
"商品租赁交易总额"
)
private
BigDecimal
leaseGMV
;
@ApiModelProperty
(
value
=
"服务订单交易总额"
)
private
BigDecimal
serviceGMV
;
@ApiModelProperty
(
value
=
"交易总额"
)
private
BigDecimal
totalGMV
;
}
src/main/java/com/mmc/oms/model/dto/data/ReleaseReportDTO.java
0 → 100644
浏览文件 @
a8746400
package
com
.
mmc
.
oms
.
model
.
dto
.
data
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.math.BigDecimal
;
/**
* @Author LW
* @date 2023/9/16 14:15
* 概要:
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public
class
ReleaseReportDTO
{
@ApiModelProperty
(
value
=
"信息发布总数"
)
private
Integer
releaseCount
;
@ApiModelProperty
(
value
=
"订单发布数量"
)
private
Integer
orderReleaseCount
;
@ApiModelProperty
(
value
=
"帖子发布数量"
)
private
Integer
postsReleaseCount
;
@ApiModelProperty
(
value
=
"话题发布数量"
)
private
Integer
topicReleaseCount
;
@ApiModelProperty
(
value
=
"订单金额"
)
private
BigDecimal
serviceOrderAmount
;
}
src/main/java/com/mmc/oms/service/data/OrderReportService.java
0 → 100644
浏览文件 @
a8746400
package
com
.
mmc
.
oms
.
service
.
data
;
import
com.mmc.oms.common.result.ResultBody
;
import
com.mmc.oms.model.dto.data.OrderReportDTO
;
/**
* @Author LW
* @date 2023/9/19 10:05
* 概要:
*/
public
interface
OrderReportService
{
ResultBody
<
OrderReportDTO
>
getOrderReportData
();
}
src/main/java/com/mmc/oms/service/data/impl/OrderReportServiceImpl.java
0 → 100644
浏览文件 @
a8746400
package
com
.
mmc
.
oms
.
service
.
data
.
impl
;
import
com.mmc.oms.common.result.ResultBody
;
import
com.mmc.oms.dao.uav.UavOrderDao
;
import
com.mmc.oms.feign.ImsAppApi
;
import
com.mmc.oms.model.dto.data.OrderReportDTO
;
import
com.mmc.oms.model.dto.data.ReleaseReportDTO
;
import
com.mmc.oms.service.data.OrderReportService
;
import
org.springframework.stereotype.Service
;
import
javax.annotation.Resource
;
import
java.math.BigDecimal
;
/**
* @Author LW
* @date 2023/9/19 10:05
* 概要:
*/
@Service
public
class
OrderReportServiceImpl
implements
OrderReportService
{
@Resource
private
UavOrderDao
uavOrderDao
;
@Resource
private
ImsAppApi
imsAppApi
;
@Override
public
ResultBody
<
OrderReportDTO
>
getOrderReportData
()
{
OrderReportDTO
orderReportDTO
=
new
OrderReportDTO
();
// 获取商城订单数量
int
saleOrderCount
=
uavOrderDao
.
getOrderCount
();
orderReportDTO
.
setSaleOrderCount
(
saleOrderCount
);
// 获取租赁订单数量// todo 暂时用商城订单代替
int
leaseOrderCount
=
uavOrderDao
.
getOrderCount
();
orderReportDTO
.
setLeaseOrderCount
(
leaseOrderCount
);
// 获取服务订单总数
ResultBody
<
ReleaseReportDTO
>
userReportData
=
imsAppApi
.
getUserReportData
();
int
serviceOrderCount
=
userReportData
.
getResult
().
getOrderReleaseCount
();
orderReportDTO
.
setServiceOrderCount
(
serviceOrderCount
);
// 获取商城订单GMV
BigDecimal
saleGMV
=
uavOrderDao
.
getSaleOrderGMV
();
orderReportDTO
.
setSaleGMV
(
saleGMV
);
// 获取租赁订单GMV // todo 暂时用商城订单代替
BigDecimal
leaseGMV
=
uavOrderDao
.
getSaleOrderGMV
();
orderReportDTO
.
setLeaseGMV
(
leaseGMV
);
BigDecimal
serviceGMV
=
userReportData
.
getResult
().
getServiceOrderAmount
();
orderReportDTO
.
setServiceGMV
(
serviceGMV
);
// 获取总GMV
orderReportDTO
.
setTotalGMV
(
saleGMV
.
add
(
leaseGMV
).
add
(
serviceGMV
));
return
ResultBody
.
success
(
orderReportDTO
);
}
}
src/main/resources/mapper/data/OrderReportDao.xml
0 → 100644
浏览文件 @
a8746400
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.mmc.oms.dao.data.OrderReportDao"
>
</mapper>
\ No newline at end of file
src/main/resources/mapper/uav/UavOrderDao.xml
浏览文件 @
a8746400
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论