parent: 5b9cbf | patch | commitdiff
xiaoyong931011
2021-09-22 cad69fd8620d6317fe09efdd4eee730bf8e2d053
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, September 22, 2021 17:53 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, September 22, 2021 17:53 +0800
commitcad69fd8620d6317fe09efdd4eee730bf8e2d053
tree bbfe159c67c603a2bcb062402d0979923db83717 tree | zip | gz
parent 5b9cbf3994dc13b45553c952ae733742d6e8a4ef view | diff
b4f2219ce06b1b1d3fe4631090b58fd9f9a7824d view | diff 
Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

 Conflicts:
	src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
	src/main/resources/mapper/modules/MallOrderInfoMapper.xml
9 files added
8 files modified
412 ■■■■■ changed files
sql/xc_mall.sql 16 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java 13 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/conversion/MallOrderInfoConversion.java 25 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/conversion/MallOrderItemConversion.java 20 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java 26 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallExpressInfo.java 23 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallExpressInfoMapper.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java 34 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java 54 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java 35 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/OrderListVo.java 36 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallExpressInfoMapper.xml 8 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallOrderInfoMapper.xml 82 ●●●●● diff | view | raw | blame | history