parent: 78bbf4 | patch | commitdiff
xiaoyong931011
2021-09-22 b4ee04b14d289262fc303967412a56202b6e002f
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, September 22, 2021 16:41 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, September 22, 2021 16:41 +0800
commitb4ee04b14d289262fc303967412a56202b6e002f
tree 7a617ef087d2a3925cbb7193f3369fb79d01923d tree | zip | gz
parent 78bbf44ed2122e8831ae26f1c48b6f3c0b0ff5af view | diff
531863f590d1064ca4ec01afe95606dc1c6d9adc view | diff 
Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

 Conflicts:
	src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsSkuMapper.java
	src/main/resources/mapper/modules/MallGoodsSkuMapper.xml
16 files modified
9 files added
603 ■■■■■ changed files
sql/xc_mall.sql 81 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/OrderStatusEnum.java 46 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/utils/MallUtils.java 30 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsCategoryController.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ApiMallOrderController.java 37 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/AddOrderItemDto.java 24 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/PayOrderDto.java 28 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallGoodsSku.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallMemberWallet.java 26 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsSkuMapper.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallMemberWalletMapper.java 12 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberWalletService.java 13 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java 11 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberWalletServiceImpl.java 53 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java 145 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java 6 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallGoodsMapper.xml 2 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallGoodsSkuMapper.xml 10 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallMemberWalletMapper.xml 15 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallOrderInfoMapper.xml 3 ●●●●● diff | view | raw | blame | history