parent: 6699cd | patch | commitdiff
xiaoyong931011
2021-09-22 d8c97392354a6b6d14efbdd4a73ee0148609bef8
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, September 22, 2021 10:04 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, September 22, 2021 10:04 +0800
commitd8c97392354a6b6d14efbdd4a73ee0148609bef8
tree 961f99fc8e67ea3e2f3a4411a9fcf157c8682b96 tree | zip | gz
parent 6699cdfa0ebf67724e018264b53d8c6e07e92e58 view | diff
843883c439cdb30979a78295dc32e8f9eee4896d view | diff 
Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

 Conflicts:
	pom.xml
	src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java
40 files added
10 files modified
1359 ■■■■■ changed files
pom.xml 29 ●●●●● diff | view | raw | blame | history
sql/xc_mall.sql 146 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/interceptor/LoginInterceptor.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ApiMallAddressInfoController.java 81 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java 17 ●●●●● 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/controller/ApiMallShoppingCartController.java 52 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/conversion/MallAddressInfoConversion.java 25 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/conversion/MallGoodsConversion.java 21 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/conversion/MallGoodsSkuConversion.java 21 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/conversion/MallGoodsStyleConversion.java 21 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/conversion/MallShoppingCartConversion.java 21 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/AddCartDto.java 24 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/AddOrderDto.java 20 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/AddressInfoDto.java 44 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallAddressInfo.java 48 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallGoodsStyle.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallMoneyFlow.java 24 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallOrderInfo.java 49 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallOrderItem.java 33 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/entity/MallShoppingCart.java 31 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallAddressInfoMapper.java 14 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsImagesMapper.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java 11 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallShoppingCartMapper.java 18 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallAddressInfoService.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallGoodsService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IApiMallShoppingCartService.java 20 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallAddressInfoServiceImpl.java 88 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallShoppingCartServiceImpl.java 64 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/AddressInfoVo.java 32 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/GoodsDetailsSkuVo.java 37 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/GoodsDetailsStyleVo.java 25 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java 46 ●●●●● diff | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/ShoppingCartGoodsVo.java 27 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallAddressInfoMapper.xml 19 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallGoodsImagesMapper.xml 8 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallGoodsMapper.xml 51 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallGoodsSkuMapper.xml 9 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml 5 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallOrderInfoMapper.xml 5 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallOrderItemMapper.xml 5 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/modules/MallShoppingCartMapper.xml 23 ●●●●● diff | view | raw | blame | history