From e4e36571c5a7b348f561db90009e64c615ed8370 Mon Sep 17 00:00:00 2001 From: chendt <18902722133@163.com> Date: Tue, 21 Feb 2023 15:04:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/admin/config/AdminBeanConfig.java | 3 + .../admin/config/SwaggerConfiguration.java | 9 +- .../admin/controller/AttributeController.java | 4 +- .../admin/controller/CategoryController.java | 10 +- .../admin/controller/HotSearchController.java | 6 +- .../admin/controller/IndexImgController.java | 2 +- .../admin/controller/NoticeController.java | 4 +- .../admin/controller/OrderController.java | 8 +- .../admin/controller/ProdTagController.java | 4 +- .../controller/ShopDetailController.java | 1 - .../shop/admin/controller/UserController.java | 34 +-- .../yami/shop/api/config/ApiBeanConfig.java | 3 + .../shop/api/config/SwaggerConfiguration.java | 5 +- .../shop/api/controller/AddrController.java | 4 +- .../api/controller/CategoryController.java | 3 + .../api/controller/DeliveryController.java | 3 + .../api/controller/IndexImgController.java | 9 +- .../api/controller/MyOrderController.java | 3 + .../shop/api/controller/NoticeController.java | 3 + .../shop/api/controller/OrderController.java | 5 +- .../shop/api/controller/PayController.java | 3 + .../api/controller/PayNoticeController.java | 3 + .../api/controller/ProdCommController.java | 3 + .../shop/api/controller/ProdController.java | 2 +- .../api/controller/ProdTagController.java | 6 +- .../shop/api/controller/SearchController.java | 8 +- .../api/controller/ShopCartController.java | 3 + .../shop/api/controller/SkuController.java | 3 + .../shop/api/controller/SmsController.java | 3 + .../controller/UserCollectionController.java | 8 +- .../shop/api/controller/UserController.java | 4 +- .../api/listener/SubmitOrderListener.java | 197 ++++++++++-------- .../com/yami/shop/bean/SmsInfoContext.java | 3 + .../yami/shop/bean/app/dto/BasketItemDto.java | 3 + .../yami/shop/bean/app/dto/CategoryDto.java | 3 + .../bean/app/dto/ChooseDiscountItemDto.java | 1 + .../shop/bean/app/dto/CouponOrderDto.java | 8 +- .../yami/shop/bean/app/dto/DeliveryDto.java | 7 +- .../shop/bean/app/dto/DeliveryInfoDto.java | 3 + .../yami/shop/bean/app/dto/DiscountDto.java | 3 + .../yami/shop/bean/app/dto/IndexImgDto.java | 3 + .../yami/shop/bean/app/dto/MyOrderDto.java | 7 +- .../shop/bean/app/dto/MyOrderItemDto.java | 3 + .../com/yami/shop/bean/app/dto/NoticeDto.java | 3 + .../shop/bean/app/dto/OrderCountData.java | 3 + .../shop/bean/app/dto/OrderNumbersDto.java | 4 + .../shop/bean/app/dto/ProdCommDataDto.java | 4 +- .../yami/shop/bean/app/dto/ProdCommDto.java | 4 +- .../yami/shop/bean/app/dto/ProdTagDto.java | 3 + .../yami/shop/bean/app/dto/ProductDto.java | 8 +- .../shop/bean/app/dto/ShopCartAmountDto.java | 3 + .../yami/shop/bean/app/dto/ShopCartDto.java | 3 + .../bean/app/dto/ShopCartExpiryItemDto.java | 3 + .../bean/app/dto/ShopCartItemDiscountDto.java | 3 + .../shop/bean/app/dto/ShopCartOrderDto.java | 1 + .../bean/app/dto/ShopCartOrderMergerDto.java | 1 + .../com/yami/shop/bean/app/dto/SkuDto.java | 3 + .../yami/shop/bean/app/dto/TagProductDto.java | 4 +- .../yami/shop/bean/app/dto/UserAddrDto.java | 4 +- .../shop/bean/app/dto/UserCollectionDto.java | 4 +- .../com/yami/shop/bean/app/dto/UserDto.java | 4 +- .../yami/shop/bean/app/param/AddrParam.java | 7 +- .../yami/shop/bean/app/param/LoginParam.java | 3 + .../shop/bean/app/param/OrderItemParam.java | 9 +- .../yami/shop/bean/app/param/OrderParam.java | 12 +- .../app/param/OrderRefundExpressParam.java | 3 + .../shop/bean/app/param/OrderRefundParam.java | 9 +- .../shop/bean/app/param/OrderShopParam.java | 3 + .../yami/shop/bean/app/param/PayParam.java | 3 + .../shop/bean/app/param/ProdCommParam.java | 6 +- .../shop/bean/app/param/SendSmsParam.java | 7 +- .../shop/bean/app/param/ShopCartParam.java | 3 + .../shop/bean/app/param/ShopCartParams.java | 3 + .../shop/bean/app/param/SubmitOrderParam.java | 7 +- .../shop/bean/app/param/UserInfoParam.java | 4 +- .../java/com/yami/shop/bean/bo/SmsInfoBo.java | 7 +- .../distribution/UserShoppingDataDto.java | 1 + .../com/yami/shop/bean/dto/HotSearchDto.java | 3 + .../com/yami/shop/bean/dto/ProductDto.java | 3 + .../com/yami/shop/bean/dto/SearchProdDto.java | 4 +- .../yami/shop/bean/enums/MessageStatus.java | 3 + .../com/yami/shop/bean/enums/OrderStatus.java | 3 + .../com/yami/shop/bean/enums/PayType.java | 3 + .../com/yami/shop/bean/enums/SmsType.java | 3 + .../java/com/yami/shop/bean/model/Area.java | 14 +- .../com/yami/shop/bean/model/AttachFile.java | 11 +- .../java/com/yami/shop/bean/model/Basket.java | 11 +- .../java/com/yami/shop/bean/model/Brand.java | 11 +- .../com/yami/shop/bean/model/Category.java | 3 + .../yami/shop/bean/model/CategoryBrand.java | 3 + .../yami/shop/bean/model/CategoryProp.java | 3 + .../com/yami/shop/bean/model/Delivery.java | 11 +- .../com/yami/shop/bean/model/HotSearch.java | 7 +- .../com/yami/shop/bean/model/IndexImg.java | 13 +- .../com/yami/shop/bean/model/LoginHist.java | 11 +- .../com/yami/shop/bean/model/Message.java | 12 +- .../java/com/yami/shop/bean/model/Order.java | 11 +- .../com/yami/shop/bean/model/OrderItem.java | 3 + .../com/yami/shop/bean/model/OrderRefund.java | 3 + .../yami/shop/bean/model/OrderSettlement.java | 11 +- .../com/yami/shop/bean/model/PickAddr.java | 3 + .../com/yami/shop/bean/model/ProdImg.java | 10 +- .../com/yami/shop/bean/model/ProdProp.java | 13 +- .../yami/shop/bean/model/ProdPropValue.java | 10 +- .../com/yami/shop/bean/model/Product.java | 3 + .../com/yami/shop/bean/model/ShopDetail.java | 3 + .../java/com/yami/shop/bean/model/Sku.java | 3 + .../java/com/yami/shop/bean/model/SmsLog.java | 9 +- .../com/yami/shop/bean/model/Transcity.java | 3 + .../yami/shop/bean/model/TranscityFree.java | 3 + .../com/yami/shop/bean/model/Transfee.java | 13 +- .../yami/shop/bean/model/TransfeeFree.java | 8 +- .../com/yami/shop/bean/model/Transport.java | 4 +- .../java/com/yami/shop/bean/model/User.java | 4 +- .../yami/shop/bean/model/UserAddrOrder.java | 10 +- .../shop/bean/param/DeliveryOrderParam.java | 7 +- .../com/yami/shop/bean/param/OrderParam.java | 4 +- .../yami/shop/bean/param/ProductParam.java | 3 + .../yami/shop/bean/param/ShopDetailParam.java | 4 +- .../java/com/yami/shop/bean/vo/SysUserVO.java | 4 +- .../java/com/yami/shop/bean/vo/UserVO.java | 4 +- .../shop/common/annotation/RedisLock.java | 3 +- .../yami/shop/common/annotation/SysLog.java | 3 + .../bean/{ALiDaYu.java => AliDaYu.java} | 2 +- .../shop/common/config/MybatisPlusConfig.java | 9 +- .../shop/common/config/ShopBasicConfig.java | 4 +- .../shop/common/config/ShopBeanConfig.java | 7 +- .../shop/common/config/Swagger2Config.java | 16 +- .../yami/shop/common/constants/Constant.java | 16 ++ .../exception/YamiShopBindException.java | 4 +- .../shop/common/response/ResponseCode.java | 3 + .../shop/common/response/ServerResponse.java | 4 +- .../common/response/ServerResponseEntity.java | 3 + .../serializer/json/ImgJsonSerializer.java | 3 + .../java/com/yami/shop/common/util/Arith.java | 37 ++-- .../shop/common/util/CacheManagerUtil.java | 3 + .../shop/common/util/HttpContextUtils.java | 3 + .../com/yami/shop/common/util/IdUtil.java | 10 +- .../util/{IPHelper.java => IpHelper.java} | 6 +- .../java/com/yami/shop/common/util/Json.java | 32 +-- .../com/yami/shop/common/util/PageParam.java | 9 +- .../com/yami/shop/common/xss/XssWrapper.java | 10 +- .../MallWebSecurityConfigurerAdapter.java | 3 +- .../security/common/config/CorsConfig.java | 1 - .../common/manager/PasswordCheckManager.java | 4 +- .../java/com/yami/shop/dao/AreaMapper.java | 10 +- .../com/yami/shop/dao/AttachFileMapper.java | 8 +- .../java/com/yami/shop/dao/BasketMapper.java | 57 +++-- .../java/com/yami/shop/dao/BrandMapper.java | 19 +- .../yami/shop/dao/CategoryBrandMapper.java | 24 ++- .../com/yami/shop/dao/CategoryMapper.java | 22 +- .../com/yami/shop/dao/CategoryPropMapper.java | 24 ++- .../com/yami/shop/dao/DeliveryMapper.java | 3 + .../com/yami/shop/dao/HotSearchMapper.java | 12 +- .../com/yami/shop/dao/IndexImgMapper.java | 22 +- .../com/yami/shop/dao/LoginHistMapper.java | 3 + .../java/com/yami/shop/dao/MessageMapper.java | 5 +- .../java/com/yami/shop/dao/NoticeMapper.java | 5 + .../com/yami/shop/dao/OrderItemMapper.java | 25 ++- .../java/com/yami/shop/dao/OrderMapper.java | 85 +++++++- .../com/yami/shop/dao/OrderRefundMapper.java | 3 + .../yami/shop/dao/OrderSettlementMapper.java | 32 ++- .../com/yami/shop/dao/PickAddrMapper.java | 10 +- .../com/yami/shop/dao/ProdCommMapper.java | 27 +++ .../java/com/yami/shop/dao/ProdImgMapper.java | 3 + .../com/yami/shop/dao/ProdPropMapper.java | 30 ++- .../yami/shop/dao/ProdPropValueMapper.java | 20 +- .../yami/shop/dao/ProdTagReferenceMapper.java | 13 +- .../java/com/yami/shop/dao/ProductMapper.java | 82 +++++++- .../com/yami/shop/dao/ShopDetailMapper.java | 5 +- .../java/com/yami/shop/dao/SkuMapper.java | 35 +++- .../java/com/yami/shop/dao/SmsLogMapper.java | 9 +- .../yami/shop/dao/TranscityFreeMapper.java | 3 + .../com/yami/shop/dao/TranscityMapper.java | 30 ++- .../com/yami/shop/dao/TransfeeFreeMapper.java | 4 +- .../com/yami/shop/dao/TransfeeMapper.java | 28 ++- .../com/yami/shop/dao/TransportMapper.java | 26 ++- .../com/yami/shop/dao/UserAddrMapper.java | 16 +- .../yami/shop/dao/UserAddrOrderMapper.java | 4 +- .../yami/shop/dao/UserCollectionMapper.java | 7 +- .../java/com/yami/shop/dao/UserMapper.java | 14 +- .../yami/shop/service/AttachFileService.java | 19 +- .../com/yami/shop/service/BasketService.java | 53 ++++- .../com/yami/shop/service/BrandService.java | 3 +- .../shop/service/CategoryBrandService.java | 3 +- .../shop/service/CategoryPropService.java | 3 +- .../yami/shop/service/CategoryService.java | 24 +-- .../yami/shop/service/HotSearchService.java | 15 +- .../yami/shop/service/IndexImgService.java | 15 +- .../com/yami/shop/service/MessageService.java | 2 - .../com/yami/shop/service/NoticeService.java | 21 ++ .../yami/shop/service/OrderItemService.java | 9 +- .../com/yami/shop/service/OrderService.java | 78 ++++++- .../shop/service/OrderSettlementService.java | 2 + .../com/yami/shop/service/PayService.java | 13 +- .../yami/shop/service/PickAddrService.java | 2 - .../yami/shop/service/ProdCommService.java | 26 ++- .../yami/shop/service/ProdPropService.java | 16 +- .../shop/service/ProdPropValueService.java | 3 +- .../shop/service/ProdTagReferenceService.java | 6 +- .../com/yami/shop/service/ProdTagService.java | 8 +- .../com/yami/shop/service/ProductService.java | 56 ++++- .../yami/shop/service/ShopDetailService.java | 14 +- .../com/yami/shop/service/SkuService.java | 10 +- .../com/yami/shop/service/SmsLogService.java | 8 +- .../shop/service/TransportManagerService.java | 10 +- .../yami/shop/service/TransportService.java | 26 ++- .../shop/service/UserAddrOrderService.java | 4 +- .../yami/shop/service/UserAddrService.java | 22 +- .../shop/service/UserCollectionService.java | 6 + .../com/yami/shop/service/UserService.java | 11 +- .../service/impl/AttachFileServiceImpl.java | 18 +- .../shop/service/impl/BrandServiceImpl.java | 3 +- .../impl/CategoryBrandServiceImpl.java | 3 +- .../service/impl/CategoryPropServiceImpl.java | 3 +- .../service/impl/CategoryServiceImpl.java | 38 ++-- .../service/impl/HotSearchServiceImpl.java | 4 +- .../service/impl/IndexImgServiceImpl.java | 8 +- .../shop/service/impl/MessageServiceImpl.java | 5 - .../shop/service/impl/OrderServiceImpl.java | 12 +- .../service/impl/PickAddrServiceImpl.java | 5 - .../service/impl/ProdPropServiceImpl.java | 8 +- .../impl/ProdPropValueServiceImpl.java | 3 +- .../shop/service/impl/ProductServiceImpl.java | 19 +- .../service/impl/ShopDetailServiceImpl.java | 13 -- .../shop/service/impl/SmsLogServiceImpl.java | 4 +- .../impl/TransportManagerServiceImpl.java | 44 ++-- .../service/impl/TransportServiceImpl.java | 6 + .../impl/UserAddrOrderServiceImpl.java | 4 +- .../service/impl/UserAddrServiceImpl.java | 4 +- .../main/resources/mapper/BasketMapper.xml | 12 -- .../main/resources/mapper/CategoryMapper.xml | 11 - .../main/resources/mapper/IndexImgMapper.xml | 4 +- .../main/resources/mapper/MessageMapper.xml | 7 - .../src/main/resources/mapper/OrderMapper.xml | 8 +- .../main/resources/mapper/PickAddrMapper.xml | 8 +- .../main/resources/mapper/ProdPropMapper.xml | 6 - .../main/resources/mapper/ProductMapper.xml | 11 +- .../yami/shop/sys/aspect/SysLogAspect.java | 4 +- .../com/yami/shop/sys/constant/Constant.java | 1 + .../com/yami/shop/sys/constant/MenuType.java | 1 + .../com/yami/shop/sys/dao/SysLogMapper.java | 1 + .../com/yami/shop/sys/dao/SysMenuMapper.java | 5 + .../com/yami/shop/sys/dao/SysRoleMapper.java | 11 +- .../yami/shop/sys/dao/SysRoleMenuMapper.java | 3 + .../com/yami/shop/sys/dao/SysUserMapper.java | 3 + .../yami/shop/sys/dao/SysUserRoleMapper.java | 3 + .../yami/shop/sys/dto/UpdatePasswordDto.java | 4 +- .../com/yami/shop/sys/model/SysConfig.java | 1 + .../java/com/yami/shop/sys/model/SysLog.java | 2 +- .../java/com/yami/shop/sys/model/SysMenu.java | 2 +- .../java/com/yami/shop/sys/model/SysRole.java | 2 +- .../com/yami/shop/sys/model/SysRoleMenu.java | 2 +- .../java/com/yami/shop/sys/model/SysUser.java | 1 + .../com/yami/shop/sys/model/SysUserRole.java | 1 + .../yami/shop/sys/service/SysMenuService.java | 8 +- .../yami/shop/sys/service/SysUserService.java | 2 + 257 files changed, 1812 insertions(+), 768 deletions(-) rename yami-shop-common/src/main/java/com/yami/shop/common/bean/{ALiDaYu.java => AliDaYu.java} (94%) create mode 100644 yami-shop-common/src/main/java/com/yami/shop/common/constants/Constant.java rename yami-shop-common/src/main/java/com/yami/shop/common/util/{IPHelper.java => IpHelper.java} (87%) diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminBeanConfig.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminBeanConfig.java index eddb72e..dae32f4 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminBeanConfig.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/AdminBeanConfig.java @@ -15,6 +15,9 @@ import lombok.AllArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +/** + * @author lanhai + */ @Configuration @AllArgsConstructor public class AdminBeanConfig { diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java index ed32a5a..e00cf2e 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java @@ -16,26 +16,27 @@ import io.swagger.v3.oas.models.info.License; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; /** * Swagger文档，只有在测试环境才会使用 * @author LGH */ -//@Profile("dev") +@Profile("dev") @Configuration public class SwaggerConfiguration { @Bean public GroupedOpenApi baseRestApi() { return GroupedOpenApi.builder() - .group("基础版") - .packagesToScan("com.yami.shop.api") + .group("接口文档") + .packagesToScan("com.yami") .build(); } @Bean - public OpenAPI springShopOpenAPI() { + public OpenAPI springShopOpenApi() { return new OpenAPI() .info(new Info().title("Mall4j接口文档") .description("Mall4j接口文档，openapi3.0 接口，用于前端对接") diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java index 4301e98..e7106a5 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java @@ -44,8 +44,8 @@ public class AttributeController { public ResponseEntity> page(ProdProp prodProp,PageParam page){ prodProp.setRule(ProdPropRule.ATTRIBUTE.value()); prodProp.setShopId(SecurityUtils.getSysUser().getShopId()); - IPage prodPropIPage = prodPropService.pagePropAndValue(prodProp,page); - return ResponseEntity.ok(prodPropIPage); + IPage prodPropPage = prodPropService.pagePropAndValue(prodProp,page); + return ResponseEntity.ok(prodPropPage); } /** diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java index 188f2b7..6d960e3 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/CategoryController.java @@ -75,7 +75,7 @@ public class CategoryController { if(categoryName != null){ throw new YamiShopBindException("类目名称已存在！"); } - categoryService.saveCategroy(category); + categoryService.saveCategory(category); return ResponseEntity.ok().build(); } @@ -95,16 +95,16 @@ public class CategoryController { if(categoryName != null){ throw new YamiShopBindException("类目名称已存在！"); } - Category categoryDB = categoryService.getById(category.getCategoryId()); + Category categoryDb = categoryService.getById(category.getCategoryId()); // 如果从下线改成正常，则需要判断上级的状态 - if (Objects.equals(categoryDB.getStatus(),0) && Objects.equals(category.getStatus(),1) && !Objects.equals(category.getParentId(),0L)){ + if (Objects.equals(categoryDb.getStatus(),0) && Objects.equals(category.getStatus(),1) && !Objects.equals(category.getParentId(),0L)){ Category parentCategory = categoryService.getOne(new LambdaQueryWrapper().eq(Category::getCategoryId, category.getParentId())); if(Objects.isNull(parentCategory) || Objects.equals(parentCategory.getStatus(),0)){ // 修改失败，上级分类不存在或者不为正常状态 throw new YamiShopBindException("修改失败，上级分类不存在或者不为正常状态"); } } - categoryService.updateCategroy(category); + categoryService.updateCategory(category); return ResponseEntity.ok().build(); } @@ -118,7 +118,7 @@ public class CategoryController { if (categoryService.count(new LambdaQueryWrapper().eq(Category::getParentId,categoryId)) >0) { return ResponseEntity.badRequest().body("请删除子分类，再删除该分类"); } - categoryService.deleteCategroy(categoryId); + categoryService.deleteCategory(categoryId); return ResponseEntity.ok().build(); } diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java index f76eab2..4223be9 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java @@ -72,7 +72,7 @@ public class HotSearchController { hotSearch.setShopId(SecurityUtils.getSysUser().getShopId()); hotSearchService.save(hotSearch); //清除缓存 - hotSearchService.removeHotSearchDtoCacheByshopId(SecurityUtils.getSysUser().getShopId()); + hotSearchService.removeHotSearchDtoCacheByShopId(SecurityUtils.getSysUser().getShopId()); return ResponseEntity.ok().build(); } @@ -84,7 +84,7 @@ public class HotSearchController { public ResponseEntity update(@RequestBody @Valid HotSearch hotSearch){ hotSearchService.updateById(hotSearch); //清除缓存 - hotSearchService.removeHotSearchDtoCacheByshopId(SecurityUtils.getSysUser().getShopId()); + hotSearchService.removeHotSearchDtoCacheByShopId(SecurityUtils.getSysUser().getShopId()); return ResponseEntity.ok().build(); } @@ -96,7 +96,7 @@ public class HotSearchController { public ResponseEntity delete(@RequestBody List ids){ hotSearchService.removeByIds(ids); //清除缓存 - hotSearchService.removeHotSearchDtoCacheByshopId(SecurityUtils.getSysUser().getShopId()); + hotSearchService.removeHotSearchDtoCacheByShopId(SecurityUtils.getSysUser().getShopId()); return ResponseEntity.ok().build(); } } diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java index 814c145..46c1969 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java @@ -104,7 +104,7 @@ public class IndexImgController { @DeleteMapping @PreAuthorize("@pms.hasPermission('admin:indexImg:delete')") public ResponseEntity delete(@RequestBody Long[] ids) { - indexImgService.deleteIndexImgsByIds(ids); + indexImgService.deleteIndexImgByIds(ids); indexImgService.removeIndexImgCache(); return ResponseEntity.ok().build(); } diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java index 8935292..4ed4936 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java @@ -47,11 +47,11 @@ public class NoticeController { */ @GetMapping("/page") public ResponseEntity> getNoticePage(PageParam page, Notice notice) { - IPage noticeIPage = noticeService.page(page, new LambdaQueryWrapper() + IPage noticePage = noticeService.page(page, new LambdaQueryWrapper() .eq(notice.getStatus() != null, Notice::getStatus, notice.getStatus()) .eq(notice.getIsTop()!=null,Notice::getIsTop,notice.getIsTop()) .like(notice.getTitle() != null, Notice::getTitle, notice.getTitle()).orderByDesc(Notice::getUpdateTime)); - return ResponseEntity.ok(noticeIPage); + return ResponseEntity.ok(noticePage); } diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java index 44e791a..96c0b27 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java @@ -75,8 +75,8 @@ public class OrderController { public ResponseEntity> page(OrderParam orderParam,PageParam page) { Long shopId = SecurityUtils.getSysUser().getShopId(); orderParam.setShopId(shopId); - IPage orderIPage = orderService.pageOrdersDetialByOrderParam(page, orderParam); - return ResponseEntity.ok(orderIPage); + IPage orderPage = orderService.pageOrdersDetailByOrderParam(page, orderParam); + return ResponseEntity.ok(orderPage); } @@ -145,7 +145,7 @@ public class OrderController { Long shopId = SecurityUtils.getSysUser().getShopId(); order.setShopId(shopId); order.setStatus(OrderStatus.PADYED.value()); - List orders = orderService.listOrdersDetialByOrder(order, startTime, endTime); + List orders = orderService.listOrdersDetailByOrder(order, startTime, endTime); //通过工具类创建writer ExcelWriter writer = ExcelUtil.getWriter(); @@ -199,7 +199,7 @@ public class OrderController { Long shopId = SecurityUtils.getSysUser().getShopId(); order.setShopId(shopId); order.setIsPayed(1); - List orders = orderService.listOrdersDetialByOrder(order, startTime, endTime); + List orders = orderService.listOrdersDetailByOrder(order, startTime, endTime); //通过工具类创建writer ExcelWriter writer = ExcelUtil.getWriter(); diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java index e7c075f..b81d19a 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java @@ -51,12 +51,12 @@ public class ProdTagController { */ @GetMapping("/page") public ResponseEntity> getProdTagPage(PageParam page, ProdTag prodTag) { - IPage tagIPage = prodTagService.page( + IPage tagPage = prodTagService.page( page, new LambdaQueryWrapper() .eq(prodTag.getStatus() != null, ProdTag::getStatus, prodTag.getStatus()) .like(prodTag.getTitle() != null, ProdTag::getTitle, prodTag.getTitle()) .orderByDesc(ProdTag::getSeq, ProdTag::getCreateTime)); - return ResponseEntity.ok(tagIPage); + return ResponseEntity.ok(tagPage); } diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java index 45b3482..64b8da8 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java @@ -51,7 +51,6 @@ public class ShopDetailController { * 修改分销开关 */ @PutMapping("/isDistribution") - //@PreAuthorize("@pms.hasPermission('shop:shopDetail:update')") public ResponseEntity updateIsDistribution(@RequestParam Integer isDistribution){ ShopDetail shopDetail=new ShopDetail(); shopDetail.setShopId(SecurityUtils.getSysUser().getShopId()); diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java index f4d5989..2bbb37d 100644 --- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java +++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java @@ -10,32 +10,20 @@ package com.yami.shop.admin.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.UUID; - import cn.hutool.core.util.StrUtil; +import cn.hutool.extra.emoji.EmojiUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; - +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yami.shop.bean.model.User; +import com.yami.shop.common.util.PageParam; +import com.yami.shop.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; - -import com.yami.shop.common.util.PageParam; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yami.shop.bean.model.User; -import com.yami.shop.service.UserService; - -import cn.hutool.extra.emoji.EmojiUtil; +import java.util.Arrays; +import java.util.Date; /** @@ -54,13 +42,13 @@ public class UserController { @GetMapping("/page") @PreAuthorize("@pms.hasPermission('admin:user:page')") public ResponseEntity> page(User user,PageParam page) { - IPage userIPage = userService.page(page, new LambdaQueryWrapper() + IPage userPage = userService.page(page, new LambdaQueryWrapper() .like(StrUtil.isNotBlank(user.getNickName()), User::getNickName, user.getNickName()) .eq(user.getStatus() != null, User::getStatus, user.getStatus())); - for (User userResult : userIPage.getRecords()) { + for (User userResult : userPage.getRecords()) { userResult.setNickName(EmojiUtil.toUnicode(userResult.getNickName() == null ? "" : userResult.getNickName())); } - return ResponseEntity.ok(userIPage); + return ResponseEntity.ok(userPage); } /** diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiBeanConfig.java b/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiBeanConfig.java index 9475ff5..485feb0 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiBeanConfig.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/config/ApiBeanConfig.java @@ -15,6 +15,9 @@ import lombok.AllArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +/** + * @author lanhai + */ @Configuration @AllArgsConstructor public class ApiBeanConfig { diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java b/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java index ba6ae15..30b9bb5 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java @@ -16,12 +16,13 @@ import io.swagger.v3.oas.models.info.License; import org.springdoc.core.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; /** * Swagger文档，只有在测试环境才会使用 * @author LGH */ -//@Profile("dev") +@Profile("dev") @Configuration public class SwaggerConfiguration { @@ -29,7 +30,7 @@ public class SwaggerConfiguration { public GroupedOpenApi createRestApi() { return GroupedOpenApi.builder() .group("接口文档") - .packagesToScan("com.yami") + .packagesToScan("com.yami.shop.api") .build(); } diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java index 30c9553..e47675f 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java @@ -30,7 +30,9 @@ import javax.validation.Valid; import java.util.Date; import java.util.List; - +/** + * @author lanhai + */ @RestController @RequestMapping("/p/address") @Tag(name = "地址接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java index 68c9eb9..52a3298 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java @@ -28,6 +28,9 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; import ma.glasnost.orika.MapperFacade; +/** + * @author lanhai + */ @RestController @RequestMapping("/category") @Tag(name = "分类接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java index c401c83..45b2e1d 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java @@ -28,6 +28,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +/** + * @author lanhai + */ @RestController @RequestMapping("/delivery") @Tag(name = "查看物流接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/IndexImgController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/IndexImgController.java index 499d035..8fb7ca0 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/IndexImgController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/IndexImgController.java @@ -13,18 +13,19 @@ package com.yami.shop.api.controller; import com.yami.shop.bean.app.dto.IndexImgDto; import com.yami.shop.bean.model.IndexImg; import com.yami.shop.service.IndexImgService; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import ma.glasnost.orika.MapperFacade; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; +/** + * @author lanhai + */ @RestController @Tag(name = "首页轮播图接口") public class IndexImgController { @@ -40,7 +41,7 @@ public class IndexImgController { @GetMapping("/indexImgs") @Operation(summary = "首页轮播图" , description = "获取首页轮播图列表信息") public ResponseEntity> indexImgs() { - List indexImgList = indexImgService.listIndexImgs(); + List indexImgList = indexImgService.listIndexImg(); List indexImgDtos = mapperFacade.mapAsList(indexImgList, IndexImgDto.class); return ResponseEntity.ok(indexImgDtos); } diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java index 0ab256b..af1ec49 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java @@ -35,6 +35,9 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; +/** + * @author lanhai + */ @RestController @RequestMapping("/p/myOrder") @Tag(name = "我的订单接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java index ac521ca..3b00931 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java @@ -29,6 +29,9 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; +/** + * @author lanhai + */ @RestController @RequestMapping("/shop/notice") @Tag(name = "公告管理接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java index 082a1a8..222748f 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java @@ -38,6 +38,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +/** + * @author lanhai + */ @RestController @RequestMapping("/p/order") @Tag(name = "订单接口") @@ -130,7 +133,7 @@ public class OrderController { shopCartOrderMergerDto.setShopCartOrders(shopCartOrders); shopCartOrderMergerDto.setOrderReduce(orderReduce); - orderService.putConfirmOrderCache(userId,shopCartOrderMergerDto); + shopCartOrderMergerDto = orderService.putConfirmOrderCache(userId, shopCartOrderMergerDto); return ResponseEntity.ok(shopCartOrderMergerDto); } diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java index 12f1121..e465c61 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java @@ -26,6 +26,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * @author lanhai + */ @RestController @RequestMapping("/p/order") @Tag(name = "订单接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java index a4122b3..f146c4c 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java @@ -15,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import io.swagger.v3.oas.annotations.Hidden; +/** + * @author lanhai + */ @Hidden @RestController @RequestMapping("/notice/pay") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java index e0728aa..b7fd173 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java @@ -29,6 +29,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; +/** + * @author lanhai + */ @RestController @RequestMapping("/prodComm") @Tag(name = "评论接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java index 0eba269..2d2e9d2 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java @@ -101,7 +101,7 @@ public class ProdController { @Parameters({ }) public ResponseEntity> lastedProdPage(PageParam page) { - IPage productPage = prodService.pageByPutawayTime(page); + IPage productPage = prodService.pageByPutAwayTime(page); return ResponseEntity.ok(productPage); } diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java index 4b23d1c..6150f4a 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java @@ -10,12 +10,11 @@ package com.yami.shop.api.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.yami.shop.bean.app.dto.ProdTagDto; import com.yami.shop.bean.model.ProdTag; import com.yami.shop.service.ProdTagService; -import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import ma.glasnost.orika.MapperFacade; import org.springframework.http.ResponseEntity; @@ -25,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; +/** + * @author lanhai + */ @RestController @RequestMapping("/prod/tag") @Tag(name = "商品分组标签接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java index 37cd17d..033e857 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java @@ -16,7 +16,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yami.shop.common.util.PageParam; import com.yami.shop.bean.dto.HotSearchDto; import com.yami.shop.bean.dto.SearchProdDto; -import com.yami.shop.common.util.PageParam; import com.yami.shop.service.HotSearchService; import com.yami.shop.service.ProductService; import io.swagger.v3.oas.annotations.tags.Tag; @@ -32,6 +31,9 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Collections; import java.util.List; +/** + * @author lanhai + */ @RestController @RequestMapping("/search") @Tag(name = "搜索接口") @@ -50,7 +52,7 @@ public class SearchController { @Parameter(name = "sort", description = "是否按照顺序(0 否 1是)"), }) public ResponseEntity> hotSearchByShopId(Long shopId,Integer number,Integer sort) { - List list = hotSearchService.getHotSearchDtoByshopId(shopId); + List list = hotSearchService.getHotSearchDtoByShopId(shopId); return getListResponseEntity(number, sort, list); } @@ -62,7 +64,7 @@ public class SearchController { @Parameter(name = "sort", description = "是否按照顺序(0 否 1是)", required = false ), }) public ResponseEntity> hotSearch(Integer number,Integer sort) { - List list = hotSearchService.getHotSearchDtoByshopId(0L); + List list = hotSearchService.getHotSearchDtoByShopId(0L); return getListResponseEntity(number, sort, list); } diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java index d987222..872bed7 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java @@ -39,6 +39,9 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +/** + * @author lanhai + */ @RestController @RequestMapping("/p/shopCart") @Tag(name = "购物车接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java index e5115da..5b1c7f1 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java @@ -26,6 +26,9 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; +/** + * @author lanhai + */ @RestController @RequestMapping("/sku") @Tag(name = "sku规格接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java index 42b85ba..1a9e7fa 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java @@ -24,6 +24,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +/** + * @author lanhai + */ @RestController @RequestMapping("/p/sms") @Tag(name = "发送验证码接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java index bc25ac1..cec3ba9 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java @@ -31,7 +31,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.Objects; - +/** + * @author lanhai + */ @RestController @RequestMapping("/p/user/collection") @Tag(name = "收藏接口") @@ -98,8 +100,8 @@ public class UserCollectionController { @Operation(summary = "获取用户收藏商品列表" , description = "获取用户收藏商品列表") public ResponseEntity> collectionProds(PageParam page) { String userId = SecurityUtils.getUser().getUserId(); - IPage productDtoIPage = productService.collectionProds(page, userId); - return ResponseEntity.ok(productDtoIPage); + IPage productDtoPage = productService.collectionProds(page, userId); + return ResponseEntity.ok(productDtoPage); } } diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java index 38588cc..1ccbbfb 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java @@ -22,7 +22,9 @@ import lombok.AllArgsConstructor; import ma.glasnost.orika.MapperFacade; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; - +/** + * @author lanhai + */ @RestController @RequestMapping("/p/user") @Tag(name = "用户接口") diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java b/yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java index 92c716b..e6952aa 100644 --- a/yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java +++ b/yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java @@ -20,6 +20,7 @@ import com.yami.shop.bean.enums.OrderStatus; import com.yami.shop.bean.event.SubmitOrderEvent; import com.yami.shop.bean.model.*; import com.yami.shop.bean.order.SubmitOrderOrder; +import com.yami.shop.common.constants.Constant; import com.yami.shop.common.exception.YamiShopBindException; import com.yami.shop.common.util.Arith; import com.yami.shop.dao.*; @@ -82,9 +83,9 @@ public class SubmitOrderListener { List shopCartOrders = mergerOrder.getShopCartOrders(); List basketIds = new ArrayList<>(); - // 商品skuid为key 需要更新的sku为value的map + // 商品skuId为key 需要更新的sku为value的map Map skuStocksMap = new HashMap<>(16); - // 商品productid为key 需要更新的product为value的map + // 商品productId为key 需要更新的product为value的map Map prodStocksMap = new HashMap<>(16); // 把订单地址保存到数据库 @@ -102,95 +103,7 @@ public class SubmitOrderListener { // 每个店铺生成一个订单 for (ShopCartOrderDto shopCartOrderDto : shopCartOrders) { - // 使用雪花算法生成的订单号 - String orderNumber = String.valueOf(snowflake.nextId()); - shopCartOrderDto.setOrderNumber(orderNumber); - - Long shopId = shopCartOrderDto.getShopId(); - - // 订单商品名称 - StringBuilder orderProdName = new StringBuilder(100); - - List orderItems = new ArrayList<>(); - - List shopCartItemDiscounts = shopCartOrderDto.getShopCartItemDiscounts(); - for (ShopCartItemDiscountDto shopCartItemDiscount : shopCartItemDiscounts) { - List shopCartItems = shopCartItemDiscount.getShopCartItems(); - for (ShopCartItemDto shopCartItem : shopCartItems) { - Sku sku = checkAndGetSku(shopCartItem.getSkuId(), shopCartItem, skuStocksMap); - Product product = checkAndGetProd(shopCartItem.getProdId(), shopCartItem, prodStocksMap); - - OrderItem orderItem = new OrderItem(); - orderItem.setShopId(shopId); - orderItem.setOrderNumber(orderNumber); - orderItem.setProdId(sku.getProdId()); - orderItem.setSkuId(sku.getSkuId()); - orderItem.setSkuName(sku.getSkuName()); - orderItem.setProdCount(shopCartItem.getProdCount()); - orderItem.setProdName(sku.getProdName()); - orderItem.setPic(StrUtil.isBlank(sku.getPic()) ? product.getPic() : sku.getPic()); - orderItem.setPrice(shopCartItem.getPrice()); - orderItem.setUserId(userId); - orderItem.setProductTotalAmount(shopCartItem.getProductTotalAmount()); - orderItem.setRecTime(now); - orderItem.setCommSts(0); - orderItem.setBasketDate(shopCartItem.getBasketDate()); - orderProdName.append(orderItem.getProdName()).append(","); - //推广员卡号 - orderItem.setDistributionCardNo(shopCartItem.getDistributionCardNo()); - - orderItems.add(orderItem); - - if (shopCartItem.getBasketId() != null && shopCartItem.getBasketId() != 0) { - basketIds.add(shopCartItem.getBasketId()); - } - } - - } - - - orderProdName.subSequence(0, Math.min(orderProdName.length() - 1, 100)); - if (orderProdName.lastIndexOf(",") == orderProdName.length() - 1) { - orderProdName.deleteCharAt(orderProdName.length() - 1); - } - - - // 订单信息 - com.yami.shop.bean.model.Order order = new com.yami.shop.bean.model.Order(); - - order.setShopId(shopId); - order.setOrderNumber(orderNumber); - // 订单商品名称 - order.setProdName(orderProdName.toString()); - // 用户id - order.setUserId(userId); - // 商品总额 - order.setTotal(shopCartOrderDto.getTotal()); - // 实际总额 - order.setActualTotal(shopCartOrderDto.getActualTotal()); - order.setStatus(OrderStatus.UNPAY.value()); - order.setUpdateTime(now); - order.setCreateTime(now); - order.setIsPayed(0); - order.setDeleteStatus(0); - order.setProductNums(shopCartOrderDto.getTotalCount()); - order.setAddrOrderId(addrOrderId); - order.setReduceAmount(Arith.sub(Arith.add(shopCartOrderDto.getTotal(), shopCartOrderDto.getTransfee()), shopCartOrderDto.getActualTotal())); - order.setFreightAmount(shopCartOrderDto.getTransfee()); - order.setRemarks(shopCartOrderDto.getRemarks()); - - order.setOrderItems(orderItems); - event.getOrders().add(order); - // 插入订单结算表 - OrderSettlement orderSettlement = new OrderSettlement(); - orderSettlement.setUserId(userId); - orderSettlement.setIsClearing(0); - orderSettlement.setCreateTime(now); - orderSettlement.setOrderNumber(orderNumber); - orderSettlement.setPayAmount(order.getActualTotal()); - orderSettlement.setPayStatus(0); - orderSettlement.setVersion(0); - orderSettlementMapper.insert(orderSettlement); + createOrder(event, now, userId, basketIds, skuStocksMap, prodStocksMap, addrOrderId, shopCartOrderDto); } @@ -221,6 +134,108 @@ public class SubmitOrderListener { } + private void createOrder(SubmitOrderEvent event, Date now, String userId, List basketIds, Map skuStocksMap, Map prodStocksMap, Long addrOrderId, ShopCartOrderDto shopCartOrderDto) { + // 使用雪花算法生成的订单号 + String orderNumber = String.valueOf(snowflake.nextId()); + shopCartOrderDto.setOrderNumber(orderNumber); + + Long shopId = shopCartOrderDto.getShopId(); + + // 订单商品名称 + StringBuilder orderProdName = new StringBuilder(100); + + List orderItems = new ArrayList<>(); + + List shopCartItemDiscounts = shopCartOrderDto.getShopCartItemDiscounts(); + for (ShopCartItemDiscountDto shopCartItemDiscount : shopCartItemDiscounts) { + List shopCartItems = shopCartItemDiscount.getShopCartItems(); + for (ShopCartItemDto shopCartItem : shopCartItems) { + Sku sku = checkAndGetSku(shopCartItem.getSkuId(), shopCartItem, skuStocksMap); + Product product = checkAndGetProd(shopCartItem.getProdId(), shopCartItem, prodStocksMap); + + OrderItem orderItem = getOrderItem(now, userId, orderNumber, shopId, orderProdName, shopCartItem, sku, product); + + orderItems.add(orderItem); + + if (shopCartItem.getBasketId() != null && shopCartItem.getBasketId() != 0) { + basketIds.add(shopCartItem.getBasketId()); + } + } + + } + + + orderProdName.subSequence(0, Math.min(orderProdName.length() - 1, 100)); + if (orderProdName.lastIndexOf(Constant.COMMA) == orderProdName.length() - 1) { + orderProdName.deleteCharAt(orderProdName.length() - 1); + } + + + // 订单信息 + com.yami.shop.bean.model.Order order = getOrder(now, userId, addrOrderId, shopCartOrderDto, orderNumber, shopId, orderProdName, orderItems); + event.getOrders().add(order); + // 插入订单结算表 + OrderSettlement orderSettlement = new OrderSettlement(); + orderSettlement.setUserId(userId); + orderSettlement.setIsClearing(0); + orderSettlement.setCreateTime(now); + orderSettlement.setOrderNumber(orderNumber); + orderSettlement.setPayAmount(order.getActualTotal()); + orderSettlement.setPayStatus(0); + orderSettlement.setVersion(0); + orderSettlementMapper.insert(orderSettlement); + } + + private com.yami.shop.bean.model.Order getOrder(Date now, String userId, Long addrOrderId, ShopCartOrderDto shopCartOrderDto, String orderNumber, Long shopId, StringBuilder orderProdName, List orderItems) { + com.yami.shop.bean.model.Order order = new com.yami.shop.bean.model.Order(); + + order.setShopId(shopId); + order.setOrderNumber(orderNumber); + // 订单商品名称 + order.setProdName(orderProdName.toString()); + // 用户id + order.setUserId(userId); + // 商品总额 + order.setTotal(shopCartOrderDto.getTotal()); + // 实际总额 + order.setActualTotal(shopCartOrderDto.getActualTotal()); + order.setStatus(OrderStatus.UNPAY.value()); + order.setUpdateTime(now); + order.setCreateTime(now); + order.setIsPayed(0); + order.setDeleteStatus(0); + order.setProductNums(shopCartOrderDto.getTotalCount()); + order.setAddrOrderId(addrOrderId); + order.setReduceAmount(Arith.sub(Arith.add(shopCartOrderDto.getTotal(), shopCartOrderDto.getTransfee()), shopCartOrderDto.getActualTotal())); + order.setFreightAmount(shopCartOrderDto.getTransfee()); + order.setRemarks(shopCartOrderDto.getRemarks()); + + order.setOrderItems(orderItems); + return order; + } + + private OrderItem getOrderItem(Date now, String userId, String orderNumber, Long shopId, StringBuilder orderProdName, ShopCartItemDto shopCartItem, Sku sku, Product product) { + OrderItem orderItem = new OrderItem(); + orderItem.setShopId(shopId); + orderItem.setOrderNumber(orderNumber); + orderItem.setProdId(sku.getProdId()); + orderItem.setSkuId(sku.getSkuId()); + orderItem.setSkuName(sku.getSkuName()); + orderItem.setProdCount(shopCartItem.getProdCount()); + orderItem.setProdName(sku.getProdName()); + orderItem.setPic(StrUtil.isBlank(sku.getPic()) ? product.getPic() : sku.getPic()); + orderItem.setPrice(shopCartItem.getPrice()); + orderItem.setUserId(userId); + orderItem.setProductTotalAmount(shopCartItem.getProductTotalAmount()); + orderItem.setRecTime(now); + orderItem.setCommSts(0); + orderItem.setBasketDate(shopCartItem.getBasketDate()); + orderProdName.append(orderItem.getProdName()).append(","); + //推广员卡号 + orderItem.setDistributionCardNo(shopCartItem.getDistributionCardNo()); + return orderItem; + } + @SuppressWarnings({"Duplicates"}) private Product checkAndGetProd(Long prodId, ShopCartItemDto shopCartItem, Map prodStocksMap) { Product product = productService.getProductByProdId(prodId); diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/SmsInfoContext.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/SmsInfoContext.java index ae1c36a..b094616 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/SmsInfoContext.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/SmsInfoContext.java @@ -17,6 +17,9 @@ import com.yami.shop.bean.bo.SmsInfoBo; import cn.hutool.core.collection.CollectionUtil; +/** + * @author lanhai + */ public class SmsInfoContext { /** The request holder. */ diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java index bfd4af2..6918816 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/BasketItemDto.java @@ -19,6 +19,9 @@ import lombok.Data; import java.io.Serializable; import java.util.List; +/** + * @author lanhai + */ @Data public class BasketItemDto implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java index eae0916..6c75bcc 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java @@ -15,6 +15,9 @@ import com.yami.shop.common.serializer.json.ImgJsonSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +/** + * @author lanhai + */ @Data public class CategoryDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ChooseDiscountItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ChooseDiscountItemDto.java index 6a335f4..bb313a3 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ChooseDiscountItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ChooseDiscountItemDto.java @@ -16,6 +16,7 @@ import java.io.Serializable; /** * 购物车中选中的满减活动项信息 + * @author lanhai */ @Data public class ChooseDiscountItemDto implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CouponOrderDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CouponOrderDto.java index 3fa2bea..eeb4176 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CouponOrderDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CouponOrderDto.java @@ -10,15 +10,13 @@ package com.yami.shop.bean.app.dto; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +/** + * @author lanhai + */ @Data public class CouponOrderDto implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java index 184fe24..3760eac 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryDto.java @@ -10,11 +10,14 @@ package com.yami.shop.bean.app.dto; -import java.util.List; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.List; + +/** + * @author lanhai + */ @Data public class DeliveryDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java index 1ca6751..73dff12 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DeliveryInfoDto.java @@ -13,6 +13,9 @@ package com.yami.shop.bean.app.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +/** + * @author lanhai + */ @Data public class DeliveryInfoDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DiscountDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DiscountDto.java index 8ca1d48..7a363a3 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DiscountDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/DiscountDto.java @@ -14,6 +14,9 @@ import lombok.Data; import java.io.Serializable; +/** + * @author lanhai + */ @Data public class DiscountDto implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java index c946d48..3b70a7a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/IndexImgDto.java @@ -17,6 +17,9 @@ import lombok.Data; import java.util.Date; +/** + * @author lanhai + */ @Schema(description = "首页图片对象") @Data public class IndexImgDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java index 2453120..82b40cd 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderDto.java @@ -10,11 +10,14 @@ package com.yami.shop.bean.app.dto; -import java.util.List; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.List; + +/** + * @author lanhai + */ @Data @Schema(description = "我的订单") public class MyOrderDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java index 7085f0e..91ea692 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/MyOrderItemDto.java @@ -15,6 +15,9 @@ import com.yami.shop.common.serializer.json.ImgJsonSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +/** + * @author lanhai + */ @Schema(description = "我的订单-订单项") @Data public class MyOrderItemDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java index 86cd252..bd7fdc3 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/NoticeDto.java @@ -16,6 +16,9 @@ import lombok.Data; import java.util.Date; +/** + * @author lanhai + */ @Schema(description = "公告对象") @Data public class NoticeDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderCountData.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderCountData.java index a712f43..cfc3594 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderCountData.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderCountData.java @@ -13,6 +13,9 @@ package com.yami.shop.bean.app.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +/** + * @author lanhai + */ @Data @Schema(description = "我的订单数量") public class OrderCountData { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java index 1cc1791..629ae47 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/OrderNumbersDto.java @@ -13,6 +13,9 @@ package com.yami.shop.bean.app.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +/** + * @author lanhai + */ @Data public class OrderNumbersDto { @@ -22,4 +25,5 @@ public class OrderNumbersDto { public OrderNumbersDto(String orderNumbers) { this.orderNumbers = orderNumbers; } + public OrderNumbersDto(){} } diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDataDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDataDto.java index e364764..af03f81 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDataDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDataDto.java @@ -13,7 +13,9 @@ package com.yami.shop.bean.app.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; - +/** + * @author lanhai + */ @Schema(description = "商品评论数据") @Data public class ProdCommDataDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java index 514bd26..1e73e97 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java @@ -19,8 +19,10 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -import java.util.List; +/** + * @author lanhai + */ @Schema(description = "评论对象") @Data public class ProdCommDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdTagDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdTagDto.java index acaee1a..10d70c1 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdTagDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdTagDto.java @@ -13,6 +13,9 @@ package com.yami.shop.bean.app.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +/** + * @author lanhai + */ @Data public class ProdTagDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java index d06ffa1..0d45af3 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProductDto.java @@ -10,15 +10,17 @@ package com.yami.shop.bean.app.dto; -import java.util.List; - import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.yami.shop.bean.model.Transport; - import com.yami.shop.common.serializer.json.ImgJsonSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.List; + +/** + * @author lanhai + */ @Data public class ProductDto { /** diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartAmountDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartAmountDto.java index f5fb016..1ef3bcb 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartAmountDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartAmountDto.java @@ -13,6 +13,9 @@ package com.yami.shop.bean.app.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +/** + * @author lanhai + */ @Data @Schema(description = "购物车合计") public class ShopCartAmountDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java index 7d3fb0f..d456371 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartDto.java @@ -16,6 +16,9 @@ import lombok.Data; import java.io.Serializable; import java.util.List; +/** + * @author lanhai + */ @Data public class ShopCartDto implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java index 4edf9f9..28820ea 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartExpiryItemDto.java @@ -15,6 +15,9 @@ import lombok.Data; import java.util.List; +/** + * @author lanhai + */ @Data @Schema(description = "购物车失效商品对象") public class ShopCartExpiryItemDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java index bf775dd..e5d7b4c 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDiscountDto.java @@ -16,6 +16,9 @@ import lombok.Data; import java.io.Serializable; import java.util.List; +/** + * @author lanhai + */ @Data public class ShopCartItemDiscountDto implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java index 39f6252..ce4c25a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderDto.java @@ -18,6 +18,7 @@ import java.util.List; /** * 单个店铺的订单信息 + * @author lanhai */ @Data public class ShopCartOrderDto implements Serializable{ diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java index ee5c387..30b6bc8 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartOrderMergerDto.java @@ -19,6 +19,7 @@ import java.util.List; /** * 多个店铺订单合并在一起的合并类 * "/confirm" 使用 + * @author lanhai */ @Data public class ShopCartOrderMergerDto implements Serializable{ diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java index 3ea187c..51e6c85 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/SkuDto.java @@ -17,6 +17,9 @@ import lombok.Data; import java.io.Serializable; +/** + * @author lanhai + */ @Data public class SkuDto implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/TagProductDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/TagProductDto.java index 91ee577..7dda27d 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/TagProductDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/TagProductDto.java @@ -10,12 +10,14 @@ package com.yami.shop.bean.app.dto; -import com.yami.shop.bean.model.ProdTag; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.List; +/** + * @author lanhai + */ @Data public class TagProductDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java index c093850..0b3dd22 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserAddrDto.java @@ -14,7 +14,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; - +/** + * @author lanhai + */ @Data public class UserAddrDto implements Serializable { @Schema(description = "地址id" , required = true) diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserCollectionDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserCollectionDto.java index 9c6ef71..700816f 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserCollectionDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserCollectionDto.java @@ -14,7 +14,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.util.Date; - +/** + * @author lanhai + */ @Schema(description = "收藏对象") @Data public class UserCollectionDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java index 3a28696..0d6cc1c 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/UserDto.java @@ -11,7 +11,9 @@ package com.yami.shop.bean.app.dto; import io.swagger.v3.oas.annotations.media.Schema; - +/** + * @author lanhai + */ public class UserDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java index 8b3d18f..86e5cb1 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java @@ -10,10 +10,13 @@ package com.yami.shop.bean.app.param; -import javax.validation.constraints.NotNull; - import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.NotNull; + +/** + * @author lanhai + */ @Schema(description = "地址参数") public class AddrParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java index 3a7bec8..4ede312 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/LoginParam.java @@ -12,6 +12,9 @@ package com.yami.shop.bean.app.param; import io.swagger.v3.oas.annotations.media.Schema; +/** + * @author lanhai + */ @Schema(description = "登陆参数") public class LoginParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java index c3f66ca..d3aac71 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java @@ -10,12 +10,15 @@ package com.yami.shop.bean.app.param; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; + +/** + * @author lanhai + */ @Data @Schema(description = "购物车物品参数") public class OrderItemParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java index 403317a..5262073 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java @@ -10,15 +10,15 @@ package com.yami.shop.bean.app.param; -import java.util.List; - -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - -import com.yami.shop.bean.enums.OrderEntry; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @author lanhai + */ @Data @Schema(description = "订单参数") public class OrderParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundExpressParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundExpressParam.java index f0b9442..915215c 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundExpressParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundExpressParam.java @@ -5,6 +5,9 @@ import lombok.Data; import javax.validation.constraints.NotEmpty; +/** + * @author lanhai + */ @Data public class OrderRefundExpressParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundParam.java index 0c7dda6..744d3d4 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundParam.java @@ -6,6 +6,9 @@ import lombok.Data; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +/** + * @author lanhai + */ @Data public class OrderRefundParam { @@ -17,17 +20,11 @@ public class OrderRefundParam { @NotNull(message = "申请类型不能为空") private Integer applyType; -// @Schema(description = "订单金额" , required = true) -// @NotNull(message = "订单金额不能为空") -// private Double orderAmount; @Schema(description = "订单项id(全部退款是0)" , required = true) @NotNull(message = "订单项id不能为空") private Long orderItemId; -// @Schema(description = "退款金额" , required = true) -// @NotNull(message = "退款金额不能为空") -// private BigDecimal refundAmount; @Schema(description = "凭证图片列表" , required = true) private String photoFiles; diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java index c9325ef..1df48a7 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderShopParam.java @@ -12,6 +12,9 @@ package com.yami.shop.bean.app.param; import io.swagger.v3.oas.annotations.media.Schema; +/** + * @author lanhai + */ public class OrderShopParam { /** 店铺ID **/ diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java index 3855f2d..8ade3f1 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java @@ -15,6 +15,9 @@ import javax.validation.constraints.NotNull; import io.swagger.v3.oas.annotations.media.Schema; +/** + * @author lanhai + */ @Schema(description = "支付参数") public class PayParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java index 2e63037..a315583 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java @@ -10,14 +10,14 @@ package com.yami.shop.bean.app.param; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.yami.shop.common.serializer.json.ImgJsonSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import javax.validation.constraints.NotNull; -import java.util.List; +/** + * @author lanhai + */ @Data @Schema(description = "添加评论信息") public class ProdCommParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SendSmsParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SendSmsParam.java index 3a7384b..7f66285 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SendSmsParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SendSmsParam.java @@ -10,10 +10,13 @@ package com.yami.shop.bean.app.param; -import javax.validation.constraints.Pattern; - import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.Pattern; + +/** + * @author lanhai + */ @Schema(description = "发送验证码参数") public class SendSmsParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParam.java index 26c2b4f..b7f2658 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParam.java @@ -13,6 +13,9 @@ package com.yami.shop.bean.app.param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +/** + * @author lanhai + */ @Schema(description = "购物车参数") @Data public class ShopCartParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParams.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParams.java index c6207ac..7b6240f 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParams.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ShopCartParams.java @@ -14,6 +14,9 @@ import lombok.Data; import java.util.List; +/** + * @author lanhai + */ @Data public class ShopCartParams { List shopCartParams; diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java index 87641ce..4d789a1 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java @@ -10,11 +10,14 @@ package com.yami.shop.bean.app.param; -import java.util.List; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.util.List; + +/** + * @author lanhai + */ @Data @Schema(description = "提交订单参数") public class SubmitOrderParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/UserInfoParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/UserInfoParam.java index 0d131f6..52a4f62 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/UserInfoParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/UserInfoParam.java @@ -12,7 +12,9 @@ package com.yami.shop.bean.app.param; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; - +/** + * @author lanhai + */ @Data @Schema(description = "设置用户信息") public class UserInfoParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/bo/SmsInfoBo.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/bo/SmsInfoBo.java index a2c0b08..950f9a9 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/bo/SmsInfoBo.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/bo/SmsInfoBo.java @@ -10,10 +10,13 @@ package com.yami.shop.bean.bo; -import java.util.Map; - import com.yami.shop.bean.enums.SmsType; +import java.util.Map; + +/** + * @author lanhai + */ public class SmsInfoBo { private SmsType smsType; diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/distribution/UserShoppingDataDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/distribution/UserShoppingDataDto.java index 006892e..bf35485 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/distribution/UserShoppingDataDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/distribution/UserShoppingDataDto.java @@ -15,6 +15,7 @@ import lombok.Data; /** * 用户购物数据 + * @author lanhai */ @Data public class UserShoppingDataDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/HotSearchDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/HotSearchDto.java index f1aeb63..f03ca8c 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/HotSearchDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/HotSearchDto.java @@ -16,6 +16,9 @@ import lombok.Data; import java.io.Serializable; +/** + * @author lanhai + */ @Schema(description = "热搜数据") @Data public class HotSearchDto implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/ProductDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/ProductDto.java index e3de016..8258a1b 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/ProductDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/ProductDto.java @@ -16,6 +16,9 @@ import lombok.Data; import java.util.Date; import java.util.List; +/** + * @author lanhai + */ @Data public class ProductDto { /** diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/SearchProdDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/SearchProdDto.java index 283b64d..7b561cb 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/SearchProdDto.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/dto/SearchProdDto.java @@ -15,7 +15,9 @@ import com.yami.shop.common.serializer.json.ImgJsonSerializer; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; - +/** + * @author lanhai + */ @Data @Schema(description = "搜索商品数据") public class SearchProdDto { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/MessageStatus.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/MessageStatus.java index 0ffb235..5ee8d2c 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/MessageStatus.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/MessageStatus.java @@ -10,6 +10,9 @@ package com.yami.shop.bean.enums; +/** + * @author lanhai + */ public enum MessageStatus { /** diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderStatus.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderStatus.java index 6e2c6ff..985a1f7 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderStatus.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/OrderStatus.java @@ -10,6 +10,9 @@ package com.yami.shop.bean.enums; +/** + * @author lanhai + */ public enum OrderStatus { /** diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/PayType.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/PayType.java index 3fcecc2..0ca6b80 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/PayType.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/PayType.java @@ -10,6 +10,9 @@ package com.yami.shop.bean.enums; +/** + * @author lanhai + */ public enum PayType { /** 微信支付*/ diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/SmsType.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/SmsType.java index 5b7347a..2f79a81 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/SmsType.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/enums/SmsType.java @@ -10,6 +10,9 @@ package com.yami.shop.bean.enums; +/** + * @author lanhai + */ public enum SmsType { /** diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java index 54ab628..6327d5b 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Area.java @@ -10,14 +10,18 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.*; - +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.io.Serializable; +import java.util.List; + +/** + * @author lanhai + */ @Data @TableName("tz_area") public class Area implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/AttachFile.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/AttachFile.java index 09f82f1..f0903da 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/AttachFile.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/AttachFile.java @@ -10,11 +10,16 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * @author lanhai + */ @Data @TableName("tz_attach_file") public class AttachFile implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Basket.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Basket.java index 763ea02..821e297 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Basket.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Basket.java @@ -10,11 +10,16 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * @author lanhai + */ @Data @TableName("tz_basket") public class Basket implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Brand.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Brand.java index 6feec03..ea1f954 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Brand.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Brand.java @@ -10,11 +10,16 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * @author lanhai + */ @Data @TableName("tz_brand") public class Brand implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Category.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Category.java index bbe0485..51ace5f 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Category.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Category.java @@ -19,6 +19,9 @@ import java.io.Serializable; import java.util.Date; import java.util.List; +/** + * @author lanhai + */ @Data @TableName("tz_category") public class Category implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryBrand.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryBrand.java index de7eb86..5744c5c 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryBrand.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryBrand.java @@ -15,6 +15,9 @@ import lombok.Data; import java.io.Serializable; +/** + * @author lanhai + */ @Data @TableName("tz_category_brand") public class CategoryBrand implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryProp.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryProp.java index 6964888..387cd5a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryProp.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/CategoryProp.java @@ -15,6 +15,9 @@ import lombok.Data; import java.io.Serializable; +/** + * @author lanhai + */ @Data @TableName("tz_category_prop") public class CategoryProp implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Delivery.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Delivery.java index e19dd92..6181024 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Delivery.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Delivery.java @@ -10,11 +10,16 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * @author lanhai + */ @Data @TableName("tz_delivery") public class Delivery implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/HotSearch.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/HotSearch.java index 9a87b73..44e7f79 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/HotSearch.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/HotSearch.java @@ -10,14 +10,17 @@ package com.yami.shop.bean.model; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; +/** + * @author lanhai + */ @Data @TableName("tz_hot_search") public class HotSearch implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/IndexImg.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/IndexImg.java index 2a383d5..cde109e 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/IndexImg.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/IndexImg.java @@ -10,14 +10,19 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; - -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.yami.shop.common.serializer.json.ImgJsonSerializer; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * @author lanhai + */ @Data @TableName("tz_index_img") public class IndexImg implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/LoginHist.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/LoginHist.java index 6f8037a..9c9997e 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/LoginHist.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/LoginHist.java @@ -10,11 +10,16 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * @author lanhai + */ @Data @TableName("tz_login_hist") public class LoginHist implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Message.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Message.java index d4ee981..95a8fbf 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Message.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Message.java @@ -10,15 +10,17 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; - +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.io.Serializable; +import java.util.Date; +/** + * @author lanhai + */ @Data @TableName("tz_message") public class Message implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java index 7e09fad..41d2957 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java @@ -10,18 +10,19 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import com.fasterxml.jackson.annotation.JsonFormat; +import java.io.Serializable; +import java.util.Date; +import java.util.List; +/** + * @author lanhai + */ @Data @TableName("tz_order") public class Order implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderItem.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderItem.java index 42b25cd..0cdf2ba 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderItem.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderItem.java @@ -18,6 +18,9 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +/** + * @author lanhai + */ @Data @TableName("tz_order_item") public class OrderItem implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRefund.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRefund.java index 513fd79..c73dd95 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRefund.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderRefund.java @@ -18,6 +18,9 @@ import java.util.List; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; +/** + * @author lanhai + */ @Data @TableName("tz_order_refund") public class OrderRefund implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderSettlement.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderSettlement.java index e1fe76f..b4dd8b5 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderSettlement.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/OrderSettlement.java @@ -10,11 +10,16 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * @author lanhai + */ @Data @TableName("tz_order_settlement") public class OrderSettlement implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PickAddr.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PickAddr.java index 2fffa97..6465860 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PickAddr.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/PickAddr.java @@ -15,6 +15,9 @@ import lombok.Data; import java.io.Serializable; +/** + * @author lanhai + */ @Data @TableName("tz_pick_addr") public class PickAddr implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdImg.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdImg.java index e5b80c8..3ca733a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdImg.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdImg.java @@ -10,11 +10,15 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; + +/** + * @author lanhai + */ @Data @TableName("tz_prod_img") public class ProdImg implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java index 4bde5ab..cac4b89 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java @@ -10,16 +10,19 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; +/** + * @author lanhai + */ @Data @TableName("tz_prod_prop") public class ProdProp implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdPropValue.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdPropValue.java index 0b0a2be..6974da6 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdPropValue.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdPropValue.java @@ -10,11 +10,15 @@ package com.yami.shop.bean.model; -import java.io.Serializable; - -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; + +/** + * @author lanhai + */ @Data @TableName("tz_prod_prop_value") public class ProdPropValue implements Serializable{ diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java index 425d9b1..ed42d17 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Product.java @@ -19,6 +19,9 @@ import java.io.Serializable; import java.util.Date; import java.util.List; +/** + * @author lanhai + */ @Data @TableName("tz_prod") public class Product implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ShopDetail.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ShopDetail.java index 4e05106..eb42df7 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ShopDetail.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/ShopDetail.java @@ -15,6 +15,9 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; +/** + * @author lanhai + */ @Data @TableName("tz_shop_detail") public class ShopDetail implements Serializable{ diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Sku.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Sku.java index 08c055a..ef90b3e 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Sku.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Sku.java @@ -19,6 +19,9 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; +/** + * @author lanhai + */ @Data @TableName("tz_sku") public class Sku implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/SmsLog.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/SmsLog.java index 29e0920..ce4b47d 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/SmsLog.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/SmsLog.java @@ -10,10 +10,15 @@ package com.yami.shop.bean.model; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.util.Date; + +/** + * @author lanhai + */ @Data @TableName("tz_sms_log") public class SmsLog { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transcity.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transcity.java index 402b19b..e013839 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transcity.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transcity.java @@ -15,6 +15,9 @@ import lombok.Data; import java.io.Serializable; +/** + * @author lanhai + */ @Data @TableName("tz_transcity") public class Transcity implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TranscityFree.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TranscityFree.java index 4088d69..cb101ee 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TranscityFree.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TranscityFree.java @@ -15,6 +15,9 @@ import lombok.Data; import java.io.Serializable; +/** + * @author lanhai + */ @Data @TableName("tz_transcity_free") public class TranscityFree implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java index 045a274..bcabdeb 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transfee.java @@ -10,14 +10,17 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.List; - -import com.baomidou.mybatisplus.annotation.*; - +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.io.Serializable; +import java.util.List; +/** + * @author lanhai + */ @Data @TableName("tz_transfee") public class Transfee implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java index f83ee6d..97a119d 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/TransfeeFree.java @@ -10,15 +10,17 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.List; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.io.Serializable; +import java.util.List; +/** + * @author lanhai + */ @Data @TableName("tz_transfee_free") public class TransfeeFree implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java index eccbf7f..ce77f1a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/Transport.java @@ -22,7 +22,9 @@ import org.springframework.format.annotation.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; - +/** + * @author lanhai + */ @Data @TableName("tz_transport") public class Transport implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java index 60bba25..084c3a4 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java @@ -21,7 +21,9 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import com.fasterxml.jackson.annotation.JsonFormat; - +/** + * @author lanhai + */ @Data @TableName("tz_user") public class User implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddrOrder.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddrOrder.java index 536b974..4172047 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddrOrder.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/UserAddrOrder.java @@ -10,11 +10,15 @@ package com.yami.shop.bean.model; -import java.io.Serializable; -import java.util.Date; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; +/** + * @author lanhai + */ @Data @TableName("tz_user_addr_order") public class UserAddrOrder implements Serializable { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java index 2f99635..9014ac1 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java @@ -10,10 +10,13 @@ package com.yami.shop.bean.param; -import javax.validation.constraints.NotBlank; - import io.swagger.v3.oas.annotations.media.Schema; +import javax.validation.constraints.NotBlank; + +/** + * @author lanhai + */ public class DeliveryOrderParam { @NotBlank(message="订单号不能为空") diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/OrderParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/OrderParam.java index 3ba9a8a..b7e88df 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/OrderParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/OrderParam.java @@ -10,12 +10,14 @@ package com.yami.shop.bean.param; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; +/** + * @author lanhai + */ @Data public class OrderParam { /** diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java index 4d7688b..d297c42 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java @@ -19,6 +19,9 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.util.List; +/** + * @author lanhai + */ @Data public class ProductParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ShopDetailParam.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ShopDetailParam.java index a3a262e..e6d5d2a 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ShopDetailParam.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/param/ShopDetailParam.java @@ -11,9 +11,11 @@ package com.yami.shop.bean.param; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; +/** + * @author lanhai + */ public class ShopDetailParam { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SysUserVO.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SysUserVO.java index 7c4dc81..0f2f082 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SysUserVO.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/SysUserVO.java @@ -11,7 +11,9 @@ package com.yami.shop.bean.vo; import lombok.Data; - +/** + * @author lanhai + */ @Data public class SysUserVO { diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/UserVO.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/UserVO.java index 8948bbd..32be169 100644 --- a/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/UserVO.java +++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/vo/UserVO.java @@ -11,7 +11,9 @@ package com.yami.shop.bean.vo; import lombok.Data; - +/** + * @author lanhai + */ @Data public class UserVO { diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/annotation/RedisLock.java b/yami-shop-common/src/main/java/com/yami/shop/common/annotation/RedisLock.java index 4058530..3dec89a 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/annotation/RedisLock.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/annotation/RedisLock.java @@ -10,13 +10,12 @@ package com.yami.shop.common.annotation; -import org.springframework.core.annotation.AliasFor; - import java.lang.annotation.*; import java.util.concurrent.TimeUnit; /** * 使用redis进行分布式锁 + * @author lanhai */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/annotation/SysLog.java b/yami-shop-common/src/main/java/com/yami/shop/common/annotation/SysLog.java index a506e14..caf8d1e 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/annotation/SysLog.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/annotation/SysLog.java @@ -16,6 +16,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @author lanhai + */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/bean/ALiDaYu.java b/yami-shop-common/src/main/java/com/yami/shop/common/bean/AliDaYu.java similarity index 94% rename from yami-shop-common/src/main/java/com/yami/shop/common/bean/ALiDaYu.java rename to yami-shop-common/src/main/java/com/yami/shop/common/bean/AliDaYu.java index 7814298..751c5fa 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/bean/ALiDaYu.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/bean/AliDaYu.java @@ -17,7 +17,7 @@ import lombok.Data; * @author LGH */ @Data -public class ALiDaYu { +public class AliDaYu { private String accessKeyId; diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/MybatisPlusConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/MybatisPlusConfig.java index 727516b..6aad0fd 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/MybatisPlusConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/MybatisPlusConfig.java @@ -14,22 +14,15 @@ import com.baomidou.mybatisplus.core.injector.ISqlInjector; import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector; import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import org.springframework.core.io.support.ResourcePatternResolver; - -import javax.sql.DataSource; /** + * @author lanhai */ @Configuration -//@ConditionalOnBean(DataSource.class) @MapperScan({"com.yami.shop.**.dao"}) public class MybatisPlusConfig { diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBasicConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBasicConfig.java index 503f894..a2014d2 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBasicConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBasicConfig.java @@ -10,7 +10,7 @@ package com.yami.shop.common.config; -import com.yami.shop.common.bean.ALiDaYu; +import com.yami.shop.common.bean.AliDaYu; import com.yami.shop.common.bean.Qiniu; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -36,7 +36,7 @@ public class ShopBasicConfig { /** * 阿里大于短信平台 */ - private ALiDaYu aLiDaYu; + private AliDaYu aLiDaYu; /** * 用于加解密token的密钥 diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBeanConfig.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBeanConfig.java index 4d975b4..0313978 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBeanConfig.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/ShopBeanConfig.java @@ -11,12 +11,15 @@ package com.yami.shop.common.config; import cn.hutool.crypto.symmetric.AES; -import com.yami.shop.common.bean.ALiDaYu; +import com.yami.shop.common.bean.AliDaYu; import com.yami.shop.common.bean.Qiniu; import lombok.AllArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +/** + * @author lanhai + */ @Configuration @AllArgsConstructor public class ShopBeanConfig { @@ -34,7 +37,7 @@ public class ShopBeanConfig { } @Bean - public ALiDaYu aLiDaYu () { + public AliDaYu aLiDaYu () { return shopBasicConfig.getALiDaYu(); } } diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/config/Swagger2Config.java b/yami-shop-common/src/main/java/com/yami/shop/common/config/Swagger2Config.java index 6439311..1f9e1f2 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/config/Swagger2Config.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/config/Swagger2Config.java @@ -42,8 +42,12 @@ public class Swagger2Config { optionalWebConversionServiceProvider,objectMapperProvider); } - // 解决@ParameterObject和@Hidden, JsonIgnore同时使用不生效的问题 - private Optional delegatingMethodParameterCustomizer() { // NOSONAR + /** + * 解决@ParameterObject和@Hidden, JsonIgnore同时使用不生效的问题 + * @return + */ + private Optional delegatingMethodParameterCustomizer() { + // NOSONAR return Optional.of((originalMethodParam, methodParam) -> { // 这个方法类拥有的注解 Annotation[] annotations = originalMethodParam.getParameterType().getAnnotations(); @@ -53,9 +57,8 @@ public class Swagger2Config { typeContainParameterObject = annotationTypes.contains(ParameterObject.class); } - - if (typeContainParameterObject - || (originalMethodParam.hasParameterAnnotations() && originalMethodParam.hasParameterAnnotation(ParameterObject.class))) { + boolean hasParameterAnnotations = (originalMethodParam.hasParameterAnnotations() && originalMethodParam.hasParameterAnnotation(ParameterObject.class)); + if (typeContainParameterObject || hasParameterAnnotations) { try { if (isParameterIgnore(originalMethodParam, methodParam)) { Field field = FieldUtils.getDeclaredField(DelegatingMethodParameter.class, "additionalParameterAnnotations", true); @@ -78,11 +81,12 @@ public class Swagger2Config { } private boolean isParameterIgnore(MethodParameter originalMethodParam, MethodParameter methodParam) throws NoSuchFieldException, SecurityException { + String searchCount = "searchCount"; String parameterName = StrUtil.isBlank(methodParam.getParameterName())? "":methodParam.getParameterName(); String fieldName = parameterName.indexOf('.') == -1 ? parameterName : parameterName.substring(0, parameterName.indexOf('.')); // 解决mybatis-plus返回的查询参数污染的问题 if (originalMethodParam.getParameterType().isAssignableFrom(PageParam.class)) { - if ("searchCount".equals(fieldName)) { + if (searchCount.equals(fieldName)) { return true; } } diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/constants/Constant.java b/yami-shop-common/src/main/java/com/yami/shop/common/constants/Constant.java new file mode 100644 index 0000000..4adb604 --- /dev/null +++ b/yami-shop-common/src/main/java/com/yami/shop/common/constants/Constant.java @@ -0,0 +1,16 @@ +package com.yami.shop.common.constants; + +/** + * @author TRACK + */ +public class Constant { + + /** + * 句号（英文符号） + */ + public static final String PERIOD = "."; + /** + * 逗号 + */ + public static final String COMMA = ","; +} diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/exception/YamiShopBindException.java b/yami-shop-common/src/main/java/com/yami/shop/common/exception/YamiShopBindException.java index 5b063a5..ce8d3d6 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/exception/YamiShopBindException.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/exception/YamiShopBindException.java @@ -12,7 +12,9 @@ package com.yami.shop.common.exception; import com.yami.shop.common.enums.YamiHttpStatus; import org.springframework.http.HttpStatus; - +/** + * @author lanhai + */ public class YamiShopBindException extends RuntimeException{ /** diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/response/ResponseCode.java b/yami-shop-common/src/main/java/com/yami/shop/common/response/ResponseCode.java index 2aa5f53..d189d4d 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/response/ResponseCode.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/response/ResponseCode.java @@ -10,6 +10,9 @@ package com.yami.shop.common.response; +/** + * @author lanhai + */ public interface ResponseCode { int SUCCESS = 1; diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponse.java b/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponse.java index 3865203..79f0d66 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponse.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponse.java @@ -10,12 +10,14 @@ package com.yami.shop.common.response; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; import java.util.Objects; +/** + * @author lanhai + */ @Data public class ServerResponse implements Serializable { diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponseEntity.java b/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponseEntity.java index ee2495d..b38be6a 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponseEntity.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/response/ServerResponseEntity.java @@ -12,6 +12,9 @@ package com.yami.shop.common.response; import lombok.extern.slf4j.Slf4j; +/** + * @author lanhai + */ @Slf4j public class ServerResponseEntity { diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/ImgJsonSerializer.java b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/ImgJsonSerializer.java index 52ad4d9..4a70e7b 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/ImgJsonSerializer.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/ImgJsonSerializer.java @@ -20,6 +20,9 @@ import org.springframework.stereotype.Component; import java.io.IOException; +/** + * @author lanhai + */ @Component public class ImgJsonSerializer extends JsonSerializer { diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/Arith.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/Arith.java index 4e16141..f663f1a 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/Arith.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/Arith.java @@ -11,7 +11,11 @@ package com.yami.shop.common.util; import java.math.BigDecimal; +import java.math.RoundingMode; +/** + * @author lanhai + */ public class Arith { /** * 默认除法运算精度 @@ -33,8 +37,10 @@ public class Arith { */ public static double add(double v1, double v2) { // 必须转换成String - BigDecimal b1 = new BigDecimal(Double.toString(v1)); - BigDecimal b2 = new BigDecimal(Double.toString(v2)); + String s1 = Double.toString(v1); + String s2 = Double.toString(v2); + BigDecimal b1 = new BigDecimal(s1); + BigDecimal b2 = new BigDecimal(s2); return b1.add(b2).doubleValue(); } @@ -46,8 +52,10 @@ public class Arith { * @return 两个参数的差 */ public static double sub(double v1, double v2) { - BigDecimal b1 = new BigDecimal(Double.toString(v1)); - BigDecimal b2 = new BigDecimal(Double.toString(v2)); + String s1 = Double.toString(v1); + String s2 = Double.toString(v2); + BigDecimal b1 = new BigDecimal(s1); + BigDecimal b2 = new BigDecimal(s2); return b1.subtract(b2).doubleValue(); } @@ -59,9 +67,11 @@ public class Arith { * @return 两个参数的积 */ public static double mul(double v1, double v2) { - BigDecimal b1 = new BigDecimal(Double.toString(v1)); - BigDecimal b2 = new BigDecimal(Double.toString(v2)); - return b1.multiply(b2).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue(); + String s1 = Double.toString(v1); + String s2 = Double.toString(v2); + BigDecimal b1 = new BigDecimal(s1); + BigDecimal b2 = new BigDecimal(s2); + return b1.multiply(b2).doubleValue(); } /** @@ -87,9 +97,11 @@ public class Arith { if (scale < 0) { throw new IllegalArgumentException("The scale must be a positive integer or zero"); } - BigDecimal b1 = new BigDecimal(Double.toString(v1)); - BigDecimal b2 = new BigDecimal(Double.toString(v2)); - return b1.divide(b2, scale, BigDecimal.ROUND_HALF_UP).doubleValue(); + String s1 = Double.toString(v1); + String s2 = Double.toString(v2); + BigDecimal b1 = new BigDecimal(s1); + BigDecimal b2 = new BigDecimal(s2); + return b1.divide(b2, scale, RoundingMode.HALF_EVEN).doubleValue(); } /** @@ -103,9 +115,10 @@ public class Arith { if (scale < 0) { throw new IllegalArgumentException("The scale must be a positive integer or zero"); } - BigDecimal b = new BigDecimal(Double.toString(v)); + String s = Double.toString(v); + BigDecimal b = new BigDecimal(s); BigDecimal one = new BigDecimal("1"); - return b.divide(one, scale, BigDecimal.ROUND_HALF_UP).doubleValue(); + return b.divide(one, scale, RoundingMode.HALF_EVEN).doubleValue(); } diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/CacheManagerUtil.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/CacheManagerUtil.java index 743b468..8ded550 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/CacheManagerUtil.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/CacheManagerUtil.java @@ -15,6 +15,9 @@ import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.stereotype.Component; +/** + * @author lanhai + */ @Component @AllArgsConstructor public class CacheManagerUtil { diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/HttpContextUtils.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/HttpContextUtils.java index 18e8d58..6932e94 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/HttpContextUtils.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/HttpContextUtils.java @@ -15,6 +15,9 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +/** + * @author lanhai + */ public class HttpContextUtils { public static HttpServletRequest getHttpServletRequest() { diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/IdUtil.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/IdUtil.java index 85ab58c..5810211 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/IdUtil.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/IdUtil.java @@ -57,18 +57,18 @@ public class IdUtil { * @return */ public static String encode(long id) { - StringBuilder shortURL = new StringBuilder(); + StringBuilder shortUrl = new StringBuilder(); while (id > 0) { int r = (int) (id % SEED); - shortURL.insert(0, CHARS[r]); + shortUrl.insert(0, CHARS[r]); id = id / SEED; } - int len = shortURL.length(); + int len = shortUrl.length(); while (len < ID_MIN_LENGTH) { - shortURL.insert(0, CHARS[0]); + shortUrl.insert(0, CHARS[0]); len++; } - return shortURL.toString(); + return shortUrl.toString(); } /** diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/IPHelper.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/IpHelper.java similarity index 87% rename from yami-shop-common/src/main/java/com/yami/shop/common/util/IPHelper.java rename to yami-shop-common/src/main/java/com/yami/shop/common/util/IpHelper.java index 9edd161..fd276b8 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/IPHelper.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/IpHelper.java @@ -10,15 +10,13 @@ package com.yami.shop.common.util; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - import javax.servlet.http.HttpServletRequest; /** * IP帮助工具 + * @author lanhai */ -public class IPHelper { +public class IpHelper { private static final String UNKNOWN = "unknown"; /** diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/Json.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/Json.java index d6825f9..fa38ae6 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/Json.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/Json.java @@ -12,8 +12,8 @@ package com.yami.shop.common.util; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.json.JsonWriteFeature; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -24,28 +24,15 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +/** + * @author lanhai + */ @Slf4j public class Json { private static ObjectMapper objectMapper = new ObjectMapper(); static { - // 是否缩放排列输出，默认false，有些场合为了便于排版阅读则需要对输出做缩放排列 -// objectMapper.enable(SerializationFeature.INDENT_OUTPUT); - // 序列化日期时以timestamps输出，默认true - // objectMapper.enable(SerializationFeature.INDENT_OUTPUT); - // 序列化枚举是以toString()来输出，默认false，即默认以name()来输出 如：ENUM01("enum_01") 默认为 ENUM01，true则为enum_01 - // objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING); - // 序列化枚举是以ordinal()来输出，默认false 如：ENUM01("enum_01") 默认为 ENUM01，true则为 0 非常危险 - // objectMapper.enable(SerializationFeature.WRITE_ENUMS_USING_INDEX); - // 序列化Map时对key进行排序操作，默认false - // objectMapper.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS); - // 序列化char[]时以json数组输出，默认false - //objectMapper.enable(SerializationFeature.WRITE_CHAR_ARRAYS_AS_JSON_ARRAYS); - //序列化BigDecimal时之间输出原始数字还是科学计数，默认false，即是否以toPlainString()科学计数方式来输出 - // 1E+20 -> 100000000000000000000 -// objectMapper.enable(Feature.WRITE_BIGDECIMAL_AS_PLAIN); - // 如果为空则不输出 objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY); // 对于空的对象转json的时候不抛出错误 @@ -54,17 +41,8 @@ public class Json { objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); // 禁用遇到未知属性抛出异常 objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); - // 视空字符传为null -// objectMapper.enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT); - - // 低层级配置 -// objectMapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true); - // 允许属性名称没有引号 -// objectMapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true); - // 允许单引号 -// objectMapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true); // 取消对非ASCII字符的转码 - objectMapper.configure(JsonGenerator.Feature.ESCAPE_NON_ASCII, false); + objectMapper.configure(JsonWriteFeature.ESCAPE_NON_ASCII.mappedFeature(), false); } diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/util/PageParam.java b/yami-shop-common/src/main/java/com/yami/shop/common/util/PageParam.java index e1a89cd..02b497c 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/util/PageParam.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/util/PageParam.java @@ -16,8 +16,10 @@ import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.media.Schema; import org.springdoc.api.annotations.ParameterObject; -import java.util.Collections; import java.util.List; +/** + * @author lanhai + */ @Schema @ParameterObject public class PageParam extends Page { @@ -111,8 +113,9 @@ public class PageParam extends Page { @Override public Page setSize(long size) { - if (size > 100) { - this.size = 100; + int maxSize = 100; + if (size > maxSize) { + this.size = maxSize; } else { this.size = size; } diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssWrapper.java b/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssWrapper.java index ea94154..bc51fca 100644 --- a/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssWrapper.java +++ b/yami-shop-common/src/main/java/com/yami/shop/common/xss/XssWrapper.java @@ -42,7 +42,7 @@ public class XssWrapper extends HttpServletRequestWrapper { int count = values.length; String[] encodedValues = new String[count]; for (int i = 0; i < count; i++) { - encodedValues[i] = cleanXSS(values[i]); + encodedValues[i] = cleanXss(values[i]); } return encodedValues; } @@ -56,7 +56,7 @@ public class XssWrapper extends HttpServletRequestWrapper { if (StrUtil.isBlank(value)) { return value; } - return cleanXSS(value); + return cleanXss(value); } /** @@ -66,7 +66,7 @@ public class XssWrapper extends HttpServletRequestWrapper { public Object getAttribute(String name) { Object value = super.getAttribute(name); if (value instanceof String && StrUtil.isNotBlank((String) value)) { - return cleanXSS((String) value); + return cleanXss((String) value); } return value; } @@ -80,10 +80,10 @@ public class XssWrapper extends HttpServletRequestWrapper { if (StrUtil.isBlank(value)) { return value; } - return cleanXSS(value); + return cleanXss(value); } - private String cleanXSS(String value) { + private String cleanXss(String value) { return XssUtil.clean(value); } } diff --git a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/adapter/MallWebSecurityConfigurerAdapter.java b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/adapter/MallWebSecurityConfigurerAdapter.java index aaad06f..6b1a617 100644 --- a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/adapter/MallWebSecurityConfigurerAdapter.java +++ b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/adapter/MallWebSecurityConfigurerAdapter.java @@ -18,7 +18,8 @@ import org.springframework.web.cors.CorsUtils; public class MallWebSecurityConfigurerAdapter { @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ - return http.csrf().disable().cors() // We don't need CSRF for token based authentication + // We don't need CSRF for token based authentication + return http.csrf().disable().cors() .and().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) .and().authorizeRequests().requestMatchers(CorsUtils::isPreFlightRequest).permitAll() .and() diff --git a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/config/CorsConfig.java b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/config/CorsConfig.java index 6727c6b..b7176b7 100644 --- a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/config/CorsConfig.java +++ b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/config/CorsConfig.java @@ -22,7 +22,6 @@ public class CorsConfig { public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); configuration.addAllowedOriginPattern("*"); -// configuration.addAllowedOrigin("*"); //修改为添加而不是设置 configuration.addAllowedMethod("*"); //这里很重要，起码需要允许 Access-Control-Allow-Origin diff --git a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/manager/PasswordCheckManager.java b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/manager/PasswordCheckManager.java index 8823b1b..f6a95eb 100644 --- a/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/manager/PasswordCheckManager.java +++ b/yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/manager/PasswordCheckManager.java @@ -11,7 +11,7 @@ package com.yami.shop.security.common.manager; import cn.hutool.core.util.StrUtil; import com.yami.shop.common.exception.YamiShopBindException; -import com.yami.shop.common.util.IPHelper; +import com.yami.shop.common.util.IpHelper; import com.yami.shop.common.util.RedisUtil; import com.yami.shop.security.common.enums.SysTypeEnum; import org.springframework.beans.factory.annotation.Autowired; @@ -40,7 +40,7 @@ public class PasswordCheckManager { private static final String CHECK_VALID_CODE_NUM_PREFIX = "checkUserInputErrorPassword_"; public void checkPassword(SysTypeEnum sysTypeEnum,String userNameOrMobile, String rawPassword, String encodedPassword) { - String checkPrefix = sysTypeEnum.value() + CHECK_VALID_CODE_NUM_PREFIX + IPHelper.getIpAddr(); + String checkPrefix = sysTypeEnum.value() + CHECK_VALID_CODE_NUM_PREFIX + IpHelper.getIpAddr(); int count = 0; if(RedisUtil.hasKey(checkPrefix + userNameOrMobile)){ diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/AreaMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/AreaMapper.java index 9ee9ccc..8ed274a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/AreaMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/AreaMapper.java @@ -10,12 +10,10 @@ package com.yami.shop.dao; -import com.yami.shop.bean.model.Area; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yami.shop.common.util.PageAdapter;import org.apache.ibatis.annotations.Param; - -import java.util.List; - +import com.yami.shop.bean.model.Area; +/** + * @author lanhai + */ public interface AreaMapper extends BaseMapper { } diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/AttachFileMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/AttachFileMapper.java index 503b325..87be88b 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/AttachFileMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/AttachFileMapper.java @@ -10,12 +10,12 @@ package com.yami.shop.dao; -import org.apache.ibatis.annotations.Param; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yami.shop.bean.model.AttachFile; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - +/** + * @author lanhai + */ public interface AttachFileMapper extends BaseMapper { } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/BasketMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/BasketMapper.java index 02cc952..2213865 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/BasketMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/BasketMapper.java @@ -10,36 +10,65 @@ package com.yami.shop.dao; -import java.util.Date; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yami.shop.bean.app.dto.ShopCartItemDto; +import com.yami.shop.bean.app.param.ShopCartParam; +import com.yami.shop.bean.model.Basket; +import org.apache.ibatis.annotations.Param; + import java.util.List; import java.util.Map; -import com.yami.shop.bean.app.dto.BasketItemDto; -import com.yami.shop.bean.app.dto.OrderItemDto; -import com.yami.shop.bean.app.param.ShopCartParam; -import org.apache.ibatis.annotations.Param; - -import com.yami.shop.bean.app.dto.ShopCartItemDto; -import com.yami.shop.bean.model.Basket; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - +/** + * @author lanhai + */ public interface BasketMapper extends BaseMapper { + /** + * 获取购物项 + * @param userId 用户id + * @return 购物项列表 + */ List getShopCartItems(@Param("userId") String userId); + /** + * 根据购物车id列表和用户id删除购物车 + * @param userId 用户id + * @param basketIds 购物车id列表 + */ void deleteShopCartItemsByBasketIds(@Param("userId") String userId, @Param("basketIds") List basketIds); + /** + * 删除所有购物车 + * @param userId 用户id + */ void deleteAllShopCartItems(@Param("userId") String userId); - + + /** + * 获取失效的购物项 + * @param userId 用户id + * @return 失效的购物项 + */ List getShopCartExpiryItems(@Param("userId") String userId); + /** + * 删除失效的购物项 + * @param userId 用户id + */ void cleanExpiryProdList(@Param("userId") String userId); - - List shopCartItemDtoList(@Param("basketIdList")List basketIdList); + /** + * 更新购物车满减活动id + * @param userId 用户id + * @param basketIdShopCartParamMap 购物项map + */ void updateDiscountItemId(@Param("userId")String userId, @Param("basketIdShopCartParamMap") Map basketIdShopCartParamMap); + /** + * 根据商品id获取用户id列表 + * @param prodId + * @return + */ List listUserIdByProdId(@Param("prodId")Long prodId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/BrandMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/BrandMapper.java index 9847eb5..8f715bd 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/BrandMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/BrandMapper.java @@ -10,23 +10,28 @@ package com.yami.shop.dao; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yami.shop.bean.model.Brand; import org.apache.ibatis.annotations.Param; -import com.yami.shop.bean.model.Brand; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface BrandMapper extends BaseMapper { + /** + * 根据品牌名称获取品牌 + * @param brandName 品牌名称 + * @return 品牌信息 + */ Brand getByBrandName(String brandName); /** * 根据分类id获取品牌列表 - * * @param categoryId 分类id - * @return + * @return 品牌列表 */ List listByCategoryId(@Param("categoryId")Long categoryId); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryBrandMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryBrandMapper.java index 84fc8c1..655b135 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryBrandMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryBrandMapper.java @@ -10,19 +10,33 @@ package com.yami.shop.dao; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yami.shop.bean.model.CategoryBrand; import org.apache.ibatis.annotations.Param; -import com.yami.shop.bean.model.CategoryBrand; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface CategoryBrandMapper extends BaseMapper { + /** + * 增加分类品牌 + * @param categoryId 分类id + * @param brandIds 品牌id列表 + */ void insertCategoryBrand(@Param("categoryId") Long categoryId, @Param("brandIds") List brandIds); + /** + * 删除分类 + * @param categoryId 分类id + */ void deleteByCategoryId(Long categoryId); + /** + * 根据品牌名称删除分类品牌 + * @param brandId 品牌id + */ void deleteByBrandId(Long brandId); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryMapper.java index ec7f0f1..5983f23 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryMapper.java @@ -10,17 +10,29 @@ package com.yami.shop.dao; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yami.shop.bean.model.Category; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface CategoryMapper extends BaseMapper { + /** + * 根据父级id获取分类列表 + * + * @param parentId + * @return + */ List listByParentId(Long parentId); + /** + * 根据店铺id获取分类列表 + * + * @param shopId + * @return + */ List tableCategory(Long shopId); - - List listCategoryAndProdByShopId(Long shopId); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryPropMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryPropMapper.java index d6c2a7d..52e3af6 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryPropMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/CategoryPropMapper.java @@ -10,19 +10,33 @@ package com.yami.shop.dao; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yami.shop.bean.model.CategoryProp; import org.apache.ibatis.annotations.Param; -import com.yami.shop.bean.model.CategoryProp; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface CategoryPropMapper extends BaseMapper { + /** + * 插入分类属性 + * @param categoryId + * @param propIds + */ void insertCategoryProp(@Param("categoryId") Long categoryId, @Param("propIds") List propIds); + /** + * 根据分类id删除分类属性 + * @param categoryId + */ void deleteByCategoryId(Long categoryId); + /** + * 根据属性id删除分类属性 + * @param propId + */ void deleteByPropId(Long propId); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/DeliveryMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/DeliveryMapper.java index 04b361f..ce162e8 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/DeliveryMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/DeliveryMapper.java @@ -14,5 +14,8 @@ import com.yami.shop.bean.model.Delivery; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * @author lanhai + */ public interface DeliveryMapper extends BaseMapper { } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/HotSearchMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/HotSearchMapper.java index faa8ec7..5d148dc 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/HotSearchMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/HotSearchMapper.java @@ -10,14 +10,20 @@ package com.yami.shop.dao; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yami.shop.bean.dto.HotSearchDto; import com.yami.shop.bean.model.HotSearch; -import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - import java.util.List; +/** + * @author lanhai + */ public interface HotSearchMapper extends BaseMapper { + /** + * 根据店铺id获取热搜列表 + * @param shopId + * @return + */ List getHotSearchDtoByShopId(Long shopId); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/IndexImgMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/IndexImgMapper.java index 4be0334..fc51958 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/IndexImgMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/IndexImgMapper.java @@ -10,16 +10,26 @@ package com.yami.shop.dao; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yami.shop.bean.model.IndexImg; import org.apache.ibatis.annotations.Param; -import com.yami.shop.bean.model.IndexImg; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface IndexImgMapper extends BaseMapper { - void deleteIndexImgsByIds(@Param("ids") Long[] ids); + /** + * 根据id列表删除图片 + * @param ids + */ + void deleteIndexImgByIds(@Param("ids") Long[] ids); - List listIndexImgs(); + /** + * 获取图片列表 + * @return + */ + List listIndexImg(); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/LoginHistMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/LoginHistMapper.java index b04c849..2bea6c5 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/LoginHistMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/LoginHistMapper.java @@ -14,5 +14,8 @@ import com.yami.shop.bean.model.LoginHist; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * @author lanhai + */ public interface LoginHistMapper extends BaseMapper { } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/MessageMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/MessageMapper.java index 0b7bd7d..14bb6c5 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/MessageMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/MessageMapper.java @@ -14,7 +14,8 @@ import com.yami.shop.bean.model.Message; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * @author lanhai + */ public interface MessageMapper extends BaseMapper { - - void deleteByIds(Long[] ids); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/NoticeMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/NoticeMapper.java index 98de80f..cbe7efe 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/NoticeMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/NoticeMapper.java @@ -24,5 +24,10 @@ import com.yami.shop.bean.model.Notice; */ public interface NoticeMapper extends BaseMapper { + /** + * 分页获取公布的公告 + * @param page + * @return + */ Page pageNotice(Page page); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderItemMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderItemMapper.java index 22a2aca..80bd633 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderItemMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderItemMapper.java @@ -10,21 +10,28 @@ package com.yami.shop.dao; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yami.shop.bean.model.OrderItem; import org.apache.ibatis.annotations.Param; -import com.yami.shop.bean.app.dto.OrderItemDto; -import com.yami.shop.bean.model.OrderItem; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface OrderItemMapper extends BaseMapper { + /** + * 根据订单编号获取订单项 + * @param orderNumber + * @return + */ List listByOrderNumber(@Param("orderNumber") String orderNumber); - + + /** + * 插入订单项 + * @param orderItems + */ void insertBatch(List orderItems); - -// List getPayByOrderNumber(@Param("orderNumber") String orderNumber); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java index e815d8c..740c7bb 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderMapper.java @@ -23,34 +23,113 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; +/** + * @author lanhai + */ public interface OrderMapper extends BaseMapper { + /** + * 根据订单编号获取订单 + * @param orderNumber + * @return + */ Order getOrderByOrderNumber(@Param("orderNumber") String orderNumber); + /** + * 根据参数获取订单 + * @param orderStatus 订单状态 + * @param lessThanUpdateTime 更新时间 + * @return + */ List listOrderAndOrderItems(@Param("orderStatus") Integer orderStatus, @Param("lessThanUpdateTime") DateTime lessThanUpdateTime); + /** + * 取消订单 + * @param orders + */ void cancelOrders(@Param("orders") List orders); + /** + * 订单确认收货 + * @param orders + */ void confirmOrder(@Param("orders") List orders); + /** + * 更新订单为支付成功 + * @param orderNumbers 订单编号列表 + * @param payType 支付类型 + */ void updateByToPaySuccess(@Param("orderNumbers") List orderNumbers, @Param("payType") Integer payType); - List listOrdersDetialByOrder(@Param("order") Order order, @Param("startTime") Date startTime, @Param("endTime") Date endTime); + /** + * 根据参数和时间获取订单列表 + * @param order 参数 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return + */ + List listOrdersDetailByOrder(@Param("order") Order order, @Param("startTime") Date startTime, @Param("endTime") Date endTime); - List listOrdersDetialByOrderParam(@Param("adapter") PageAdapter adapter, @Param("orderParam") OrderParam orderParam); + /** + * 根据分页参数和订单参数获取订单列表 + * @param adapter 分页参数 + * @param orderParam 订单参数 + * @return + */ + List listOrdersDetailByOrderParam(@Param("adapter") PageAdapter adapter, @Param("orderParam") OrderParam orderParam); - Long countOrderDetial(@Param("orderParam") OrderParam orderParam); + /** + * 根据订单参数获取订单数 + * @param orderParam + * @return + */ + Long countOrderDetail(@Param("orderParam") OrderParam orderParam); + /** + * 根据店铺id和用户id获取购买过的商品id列表 + * @param shopId + * @param userId + * @return + */ List listBoughtProdByUserIdAndShopId(@Param("shopId") Long shopId, @Param("userId") String userId); + /** + * 根据参数计算用户消费信息 + * @param shopId + * @param userId + * @return + */ UserShoppingDataDto calculateUserInShopData(@Param("shopId") Long shopId, @Param("userId") String userId); + /** + * 根据用户id和订单状态获取订单列表 + * @param adapter + * @param userId + * @param status + * @return + */ List listMyOrderByUserIdAndStatus(@Param("adapter") PageAdapter adapter, @Param("userId") String userId, @Param("status") Integer status); + /** + * 根据用户id和订单状态获取订单数量 + * @param userId + * @param status + * @return + */ Long countMyOrderByUserIdAndStatus(@Param("userId") String userId, @Param("status") Integer status); + /** + * 删除订单 + * @param orders + */ void deleteOrders(@Param("orders") List orders); + /** + * 根据用户id获取各个状态的订单数量 + * @param userId + * @return + */ OrderCountData getOrderCount(String userId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderRefundMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderRefundMapper.java index 28eb7a1..578e186 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderRefundMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderRefundMapper.java @@ -14,5 +14,8 @@ import com.yami.shop.bean.model.OrderRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * @author lanhai + */ public interface OrderRefundMapper extends BaseMapper { } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderSettlementMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderSettlementMapper.java index a70606e..570c2da 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/OrderSettlementMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/OrderSettlementMapper.java @@ -10,21 +10,41 @@ package com.yami.shop.dao; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yami.shop.bean.model.OrderSettlement; import org.apache.ibatis.annotations.Param; -import com.yami.shop.bean.model.OrderSettlement; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface OrderSettlementMapper extends BaseMapper { - + /** + * 更新订单结算 + * @param orderSettlement + */ void updateByOrderNumberAndUserId(@Param("orderSettlement") OrderSettlement orderSettlement); + /** + * 根据支付单号获取结算信息 + * @param payNo + * @return + */ List getSettlementsByPayNo(@Param("payNo") String payNo); + /** + * 根据支付单号更新结算 + * @param outTradeNo + * @param transactionId + */ void updateSettlementsByPayNo(@Param("outTradeNo") String outTradeNo, @Param("transactionId") String transactionId); + /** + * 更新结算信息为已支付 + * @param payNo + * @param version + * @return + */ int updateToPay(@Param("payNo") String payNo, @Param("version") Integer version); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/PickAddrMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/PickAddrMapper.java index 2faeddd..d87674a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/PickAddrMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/PickAddrMapper.java @@ -10,13 +10,11 @@ package com.yami.shop.dao; -import org.apache.ibatis.annotations.Param; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yami.shop.bean.model.PickAddr; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - +/** + * @author lanhai + */ public interface PickAddrMapper extends BaseMapper { - - void deleteByIds(@Param("ids") Long[] ids); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java index de8730e..b333a40 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdCommMapper.java @@ -19,12 +19,39 @@ import com.yami.shop.bean.model.ProdComm; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +/** + * @author lanhai + */ public interface ProdCommMapper extends BaseMapper { + /** + * 根据商品id获取商品评论信息 + * @param prodId + * @return + */ ProdCommDataDto getProdCommDataByProdId(@Param("prodId") Long prodId); + /** + * 根据评价等级和商品id分页获取商品评价 + * @param page + * @param prodId + * @param evaluate + * @return + */ IPage getProdCommDtoPageByProdId(@Param("page") Page page, @Param("prodId") Long prodId, @Param("evaluate") Integer evaluate); + /** + * 根据用户id分页获取评论列表 + * @param page + * @param userId + * @return + */ IPage getProdCommDtoPageByUserId(Page page, @Param("userId") String userId); + /** + * 根据参数分页获取商品评论 + * @param page + * @param prodComm + * @return + */ IPage getProdCommPage(Page page, @Param("prodComm") ProdComm prodComm); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdImgMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdImgMapper.java index f3de3c4..be66424 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdImgMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdImgMapper.java @@ -14,5 +14,8 @@ import com.yami.shop.bean.model.ProdImg; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * @author lanhai + */ public interface ProdImgMapper extends BaseMapper { } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropMapper.java index 85aeec5..e637497 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropMapper.java @@ -17,15 +17,41 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +/** + * @author lanhai + */ public interface ProdPropMapper extends BaseMapper { + /** + * 根据参数获取商品属性列表 + * @param adapter + * @param prodProp + * @return + */ List listPropAndValue(@Param("adapter") PageAdapter adapter, @Param("prodProp") ProdProp prodProp); + /** + * 根据参数计算商品属性 + * @param prodProp + * @return + */ long countPropAndValue(@Param("prodProp") ProdProp prodProp); + /** + * 删除商品属性 + * @param propId + * @param rule + * @param shopId + * @return + */ int deleteByPropId(@Param("propId") Long propId, @Param("rule") Integer rule, @Param("shopId") Long shopId); - List listByCategoryId(Long categoryId); - + /** + * 根据店铺id和属性名称获取商品属性 + * @param propName + * @param shopId + * @param rule + * @return + */ ProdProp getProdPropByPropNameAndShopId(@Param("propName") String propName, @Param("shopId") Long shopId, @Param("rule") Integer rule); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropValueMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropValueMapper.java index 1aae5fb..9f30c7c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropValueMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdPropValueMapper.java @@ -10,17 +10,27 @@ package com.yami.shop.dao; -import java.util.List; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yami.shop.bean.model.ProdPropValue; import org.apache.ibatis.annotations.Param; -import com.yami.shop.bean.model.ProdPropValue; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface ProdPropValueMapper extends BaseMapper { + /** + * 插入商品属性数值 + * @param propId + * @param prodPropValues + */ void insertPropValues(@Param("propId") Long propId, @Param("prodPropValues") List prodPropValues); + /** + * 删除属性数值 + * @param propId + */ void deleteByPropId(@Param("propId") Long propId); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagReferenceMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagReferenceMapper.java index 8391f06..bfdaceb 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagReferenceMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProdTagReferenceMapper.java @@ -12,9 +12,7 @@ package com.yami.shop.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.yami.shop.bean.model.ProdTag; import com.yami.shop.bean.model.ProdTagReference; -import com.yami.shop.bean.model.Sku; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -26,8 +24,19 @@ import java.util.List; * @date 2019-04-18 16:28:01 */ public interface ProdTagReferenceMapper extends BaseMapper { + /** + * 插入标签 + * @param shopId + * @param prodId + * @param tagList + */ void insertBatch(@Param("shopId") Long shopId, @Param("prodId") Long prodId, @Param("tagList") List tagList); + /** + * 根据属性获取标签id列表 + * @param prodId + * @return + */ List listTagIdByProdId(@Param("prodId") Long prodId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java index 9ea8b4e..9a82e3f 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ProductMapper.java @@ -10,58 +10,118 @@ package com.yami.shop.dao; -import java.util.List; -import java.util.Map; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yami.shop.bean.app.dto.ProductDto; import com.yami.shop.bean.app.dto.TagProductDto; import com.yami.shop.bean.dto.SearchProdDto; +import com.yami.shop.bean.model.Product; import com.yami.shop.common.util.PageParam; import org.apache.ibatis.annotations.Param; -import com.yami.shop.bean.model.Product; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +import java.util.Map; +/** + * @author lanhai + */ public interface ProductMapper extends BaseMapper { - + /** + * 更新商品库存 + * @param product + * @return + */ int updateStocks(@Param("prod") Product product); + /** + * 根据商品名称和店铺id获取商品信息 + * @param prodName + * @param shopId + * @return + */ Product getProductByProdNameAndShopId(@Param("prodName") String prodName, @Param("shopId") Long shopId); + /** + * 返回库存 + * @param prodCollect + */ void returnStock(@Param("prodCollect") Map prodCollect); - IPage pageByPutawayTime(IPage page); + /** + * 根据上架时间分页获取商品 + * @param page + * @return + */ + IPage pageByPutAwayTime(IPage page); + /** + * 根据标签id分页获取商品信息 + * @param page + * @param tagId + * @return + */ IPage pageByTagId(Page page, @Param("tagId") Long tagId); + /** + * 分页获取销量最多的商品 + * @param page + * @return + */ IPage moreBuyProdList(Page page); + /** + * 根据分类id分页获取商品 + * @param page + * @param categoryId + * @return + */ IPage pageByCategoryId(Page page, @Param("categoryId") Long categoryId); - List listProdByCategoryId(@Param("categoryId") Long categoryId); - + /** + * 根据商品名称和排序分页获取商品 + * @param page + * @param prodName + * @param sort + * @param orderBy + * @return + */ IPage getSearchProdDtoPageByProdName(Page page, @Param("prodName") String prodName, @Param("sort") Integer sort, @Param("orderBy") Integer orderBy); + /** + * 根据标签id获取商品 + * @param tagId + * @return + */ TagProductDto tagProdList(@Param("tagId") Long tagId); + /** + * 获取分组商品列表 + * @return + */ List tagProdList(); /** * 查看店铺的所有活动商品 + * @param shopId + * @param page + * @return */ IPage listByShopId(@Param("page") PageParam page, @Param("shopId") Long shopId); /** * 通过优惠券适用商品类型、优惠券id、店铺id获取商品列表 + * @param shopId + * @param page + * @param couponId + * @param suitableProdType + * @return */ IPage listBySuitableProdTypeAndCouponIdAndShopId(@Param("page") PageParam page, @Param("shopId") Long shopId, @Param("suitableProdType") Integer suitableProdType, @Param("couponId") Long couponId); /** * 获取用户的收藏商品列表 - * + * @param page * @param userId * @return */ diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/ShopDetailMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/ShopDetailMapper.java index b589f0c..133ae5a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/ShopDetailMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/ShopDetailMapper.java @@ -14,7 +14,8 @@ import com.yami.shop.bean.model.ShopDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * @author lanhai + */ public interface ShopDetailMapper extends BaseMapper { - - Integer getIsDistributionByShopId(Long shopId); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/SkuMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/SkuMapper.java index c30526c..63f30f2 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/SkuMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/SkuMapper.java @@ -10,30 +10,49 @@ package com.yami.shop.dao; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yami.shop.bean.model.Sku; +import org.apache.ibatis.annotations.Param; + import java.util.List; import java.util.Map; -import org.apache.ibatis.annotations.Param; - -import com.yami.shop.bean.model.Sku; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - +/** + * @author lanhai + */ public interface SkuMapper extends BaseMapper { /** * 批量插入sku * @param prodId 商品id - * @param skus sku列表 + * @param skuList sku列表 */ void insertBatch(@Param("prodId") Long prodId, @Param("skuList") List skuList); + /** + * 根据商品id获取商品sku列表 + * @param prodId + * @return + */ List listByProdId(Long prodId); + /** + * 更新sku库存 + * @param sku + * @return + */ int updateStocks(@Param("sku") Sku sku); - + + /** + * 根据商品id删除sku + * @param prodId + */ void deleteByProdId(@Param("prodId") Long prodId); + /** + * 返回sku库存 + * @param skuCollect + */ void returnStock(@Param("skuCollect") Map skuCollect); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/SmsLogMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/SmsLogMapper.java index 1c0df73..6faaa09 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/SmsLogMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/SmsLogMapper.java @@ -15,7 +15,14 @@ import org.apache.ibatis.annotations.Param; import com.yami.shop.bean.model.SmsLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * @author lanhai + */ public interface SmsLogMapper extends BaseMapper { - + /** + * 根据手机号和短信类型失效短信 + * @param mobile + * @param type + */ void invalidSmsByMobileAndType(@Param("mobile") String mobile, @Param("type") Integer type); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityFreeMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityFreeMapper.java index b61b50e..747401e 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityFreeMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityFreeMapper.java @@ -13,5 +13,8 @@ package com.yami.shop.dao; import com.yami.shop.bean.model.TranscityFree; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * @author lanhai + */ public interface TranscityFreeMapper extends BaseMapper { } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityMapper.java index efb54a4..7786e0d 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/TranscityMapper.java @@ -10,25 +10,39 @@ package com.yami.shop.dao; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yami.shop.bean.model.Transcity; import com.yami.shop.bean.model.TranscityFree; +import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface TranscityMapper extends BaseMapper { - + /** + * 插入运费项中的城市 + * @param transcities + */ void insertTranscities(@Param("transcities") List transcities); + /** + * 插入运费 + * @param transcityFrees + */ void insertTranscityFrees(@Param("transcityFrees") List transcityFrees); - List listTranscityAndArea(@Param("transfeeId") Long transfeeId); - + /** + * 根据运费id删除运费项 + * @param transfeeIds + */ void deleteBatchByTransfeeIds(@Param("transfeeIds") List transfeeIds); + /** + * 根据运费金额项id删除运费金额 + * @param transfeeFreeIds + */ void deleteBatchByTransfeeFreeIds(@Param("transfeeFreeIds") List transfeeFreeIds); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeFreeMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeFreeMapper.java index 11efcdd..94c315d 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeFreeMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeFreeMapper.java @@ -12,6 +12,8 @@ package com.yami.shop.dao; import com.yami.shop.bean.model.TransfeeFree; import com.baomidou.mybatisplus.core.mapper.BaseMapper; - +/** + * @author lanhai + */ public interface TransfeeFreeMapper extends BaseMapper { } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeMapper.java index a0b8b4f..31a9658 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/TransfeeMapper.java @@ -10,23 +10,39 @@ package com.yami.shop.dao; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yami.shop.bean.model.Transfee; import com.yami.shop.bean.model.TransfeeFree; +import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface TransfeeMapper extends BaseMapper { - + /** + * 插入运费金额 + * @param transfees + */ void insertTransfees(List transfees); + /** + * 插入包邮运费项 + * @param transfeeFrees + */ void insertTransfeeFrees(List transfeeFrees); + /** + * 根据运费模板id删除 + * @param transportId + */ void deleteByTransportId(@Param("transportId") Long transportId); + /** + * 根据运费模板id删除包邮运费 + * @param transportId + */ void deleteTransfeeFreesByTransportId(@Param("transportId") Long transportId); diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/TransportMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/TransportMapper.java index 81fba53..b0e86c6 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/TransportMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/TransportMapper.java @@ -10,21 +10,35 @@ package com.yami.shop.dao; -import java.util.List; - -import org.apache.ibatis.annotations.Param; - +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yami.shop.bean.model.TransfeeFree; import com.yami.shop.bean.model.Transport; +import org.apache.ibatis.annotations.Param; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; +/** + * @author lanhai + */ public interface TransportMapper extends BaseMapper { - + /** + * 根据运费模板id获取运费项和运费城市 + * @param id + * @return + */ Transport getTransportAndTransfeeAndTranscity(@Param("id") Long id); + /** + * 根据运费模板id删除运费模板 + * @param ids + */ void deleteTransports(@Param("ids") Long[] ids); + /** + * 运费模板id获取包邮运费项和城市 + * @param transportId + * @return + */ List getTransfeeFreeAndTranscityFreeByTransportId(@Param("transportId") Long transportId); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrMapper.java index abd815a..763ecd6 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrMapper.java @@ -16,8 +16,15 @@ import com.yami.shop.bean.model.UserAddr; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * @author lanhai + */ public interface UserAddrMapper extends BaseMapper { - + /** + * 根据用户id获取默认地址 + * @param userId + * @return + */ UserAddr getDefaultUserAddr(@Param("userId") String userId); /** @@ -30,8 +37,15 @@ public interface UserAddrMapper extends BaseMapper { * 将地址设置为默认地址 * @param addrId * @param userId + * @return */ int setDefaultUserAddr(@Param("addrId") Long addrId, @Param("userId") String userId); + /** + * 根据用户id和地址id获取地址 + * @param userId + * @param addrId + * @return + */ UserAddr getUserAddrByUserIdAndAddrId(@Param("userId") String userId, @Param("addrId") Long addrId); } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrOrderMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrOrderMapper.java index 2dd7a0c..c217477 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrOrderMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/UserAddrOrderMapper.java @@ -13,6 +13,8 @@ package com.yami.shop.dao; import com.yami.shop.bean.model.UserAddrOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; - +/** + * @author lanhai + */ public interface UserAddrOrderMapper extends BaseMapper { } \ No newline at end of file diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/UserCollectionMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/UserCollectionMapper.java index 48e6ccf..591369a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/UserCollectionMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/UserCollectionMapper.java @@ -15,7 +15,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yami.shop.bean.app.dto.UserCollectionDto; import com.yami.shop.bean.model.UserCollection; -import org.apache.commons.lang3.StringUtils; /** * 用户收藏表 @@ -24,6 +23,12 @@ import org.apache.commons.lang3.StringUtils; * @date 2019-04-19 16:57:20 */ public interface UserCollectionMapper extends BaseMapper { + /** + * 分页获取用户收藏 + * @param page + * @param userId + * @return + */ IPage getUserCollectionDtoPageByUserId(Page page, String userId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/dao/UserMapper.java b/yami-shop-service/src/main/java/com/yami/shop/dao/UserMapper.java index f5a2b95..bed2bbe 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/dao/UserMapper.java +++ b/yami-shop-service/src/main/java/com/yami/shop/dao/UserMapper.java @@ -14,9 +14,21 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yami.shop.bean.model.User; import org.apache.ibatis.annotations.Param; +/** + * @author lanhai + */ public interface UserMapper extends BaseMapper { - + /** + * 根据用户邮箱获取用户信息 + * @param userMail + * @return + */ User getUserByUserMail(@Param("userMail") String userMail); + /** + * 根据用户名称获取一个用户信息 + * @param userName + * @return + */ User selectOneByUserName(@Param("userName") String userName); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/AttachFileService.java b/yami-shop-service/src/main/java/com/yami/shop/service/AttachFileService.java index ff5d2ed..88c00ab 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/AttachFileService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/AttachFileService.java @@ -10,18 +10,29 @@ package com.yami.shop.service; -import java.io.IOException; - import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.model.AttachFile; +import java.io.IOException; + /** - * + * @author lanhai * Created by lgh on 2018/07/27. */ public interface AttachFileService extends IService { + /** + * 上传文件 + * @param bytes 字节 + * @param originalName 文件名称 + * @return 文件名称 + * @throws IOException 异常 + */ String uploadFile(byte[] bytes,String originalName) throws IOException; - + + /** + * 删除文件 + * @param fileName 文件名称 + */ void deleteFile(String fileName); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/BasketService.java b/yami-shop-service/src/main/java/com/yami/shop/service/BasketService.java index c94d66c..fd75c1a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/BasketService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/BasketService.java @@ -10,37 +10,79 @@ package com.yami.shop.service; -import java.util.List; -import java.util.Map; - import com.baomidou.mybatisplus.extension.service.IService; -import com.yami.shop.bean.app.dto.*; +import com.yami.shop.bean.app.dto.ShopCartDto; +import com.yami.shop.bean.app.dto.ShopCartItemDto; import com.yami.shop.bean.app.param.ChangeShopCartParam; import com.yami.shop.bean.app.param.OrderItemParam; import com.yami.shop.bean.app.param.ShopCartParam; import com.yami.shop.bean.model.Basket; +import java.util.List; +import java.util.Map; + /** * @author lgh on 2018/10/18. */ public interface BasketService extends IService { + /** + * 根据购物车id列表删除购物项 + * @param userId 用户id + * @param basketIds 购物车id列表 + */ void deleteShopCartItemsByBasketIds(String userId, List basketIds); + /** + * 添加购物车 + * @param param + * @param userId + */ void addShopCartItem(ChangeShopCartParam param, String userId); + /** + * 更新购物车 + * @param basket + */ void updateShopCartItem(Basket basket); + /** + * 删除所有购物车 + * @param userId + */ void deleteAllShopCartItems(String userId); + /** + * 根据用户id获取购物车列表 + * @param userId 用户id + * @return 购物车列表 + */ List getShopCartItems(String userId); + /** + * 获取购物车失效列表 + * @param userId 用户id + * @return 失效商品 + */ List getShopCartExpiryItems(String userId); + /** + * 清除失效的购物项 + * @param userId 用户id + */ void cleanExpiryProdList(String userId); + /** + * 更新满减活动id + * @param userId 用户id + * @param basketIdShopCartParamMap 购物车map + */ void updateBasketByShopCartParam(String userId, Map basketIdShopCartParamMap); + /** + * 删除购物车缓存 + * @param userId + */ void removeShopCartItemsCacheByUserId(String userId); /** @@ -59,8 +101,9 @@ public interface BasketService extends IService { /** * 组装获取用户提交的购物车商品项 - * @param orderItems 提交订单时携带的商品信息 + * @param orderItem 提交订单时携带的商品信息 * @param userId 当前用户的用户id + * @param basketId 购物车id * @return 所有的商品购物项 */ List getShopCartItemsByOrderItems(List basketId, OrderItemParam orderItem,String userId); diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/BrandService.java b/yami-shop-service/src/main/java/com/yami/shop/service/BrandService.java index 6f658c7..69e51cf 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/BrandService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/BrandService.java @@ -16,8 +16,7 @@ import com.yami.shop.bean.model.Brand; import java.util.List; /** - * - * Created by lgh on 2018/07/05. + * @author lanhai */ public interface BrandService extends IService { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryBrandService.java b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryBrandService.java index 696aaf7..e7c844c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryBrandService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryBrandService.java @@ -14,8 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.model.CategoryBrand; /** - * - * Created by lgh on 2018/07/13. + * @author lanhai */ public interface CategoryBrandService extends IService { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryPropService.java b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryPropService.java index 86d59d0..3fa4bf2 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryPropService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryPropService.java @@ -14,8 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.model.CategoryProp; /** - * - * Created by lgh on 2018/07/13. + * @author lanhai */ public interface CategoryPropService extends IService { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryService.java b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryService.java index 290e76d..f29acf3 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/CategoryService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/CategoryService.java @@ -10,13 +10,13 @@ package com.yami.shop.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; -import com.yami.shop.bean.app.dto.CategoryDto; import com.yami.shop.bean.model.Category; +import java.util.List; + /** + * @author lanhai * 商品分类 */ public interface CategoryService extends IService { @@ -30,28 +30,28 @@ public interface CategoryService extends IService { /** * 获取用于页面表单展现的category列表，根据seq排序 + * @param shopId 店铺id * @return */ List tableCategory(Long shopId); /** * 保存分类、品牌、参数 - * @return + * @param category */ - void saveCategroy(Category category); + void saveCategory(Category category); /** * 修改分类、品牌、参数 - * @return + * @param category */ - void updateCategroy(Category category); + void updateCategory(Category category); /** * 删除分类、品牌、参数 以及分类对应的图片 - * @param qiniu - * @return + * @param categoryId 分类id */ - void deleteCategroy(Long categoryId); + void deleteCategory(Long categoryId); /** * 根据店铺id和层级，获取商品分类树 @@ -61,8 +61,4 @@ public interface CategoryService extends IService { */ List treeSelect(Long shopId,int grade); - List listCategoryDtoByShopId(Long shopId); - -// List listCategoryDtoByParentId(Long parentId); - } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/HotSearchService.java b/yami-shop-service/src/main/java/com/yami/shop/service/HotSearchService.java index 35c9e52..527ab94 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/HotSearchService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/HotSearchService.java @@ -13,8 +13,6 @@ package com.yami.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.dto.HotSearchDto; import com.yami.shop.bean.model.HotSearch; -import com.yami.shop.dao.HotSearchMapper; -import org.springframework.beans.factory.annotation.Autowired; import java.util.List; @@ -24,7 +22,16 @@ import java.util.List; */ public interface HotSearchService extends IService { - List getHotSearchDtoByshopId(Long shopId); + /** + * 根据店铺id获取热搜列表 + * @param shopId + * @return + */ + List getHotSearchDtoByShopId(Long shopId); - void removeHotSearchDtoCacheByshopId(Long shopId); + /** + * 根据店铺id删除热搜缓存 + * @param shopId + */ + void removeHotSearchDtoCacheByShopId(Long shopId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/IndexImgService.java b/yami-shop-service/src/main/java/com/yami/shop/service/IndexImgService.java index 3178167..539f754 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/IndexImgService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/IndexImgService.java @@ -21,9 +21,20 @@ import java.util.List; */ public interface IndexImgService extends IService { - void deleteIndexImgsByIds(Long[] ids); + /** + * 根据id列表删除图片 + * @param ids + */ + void deleteIndexImgByIds(Long[] ids); - List listIndexImgs(); + /** + * 获取全部图片列表 + * @return + */ + List listIndexImg(); + /** + * 删除图片缓存 + */ void removeIndexImgCache(); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/MessageService.java b/yami-shop-service/src/main/java/com/yami/shop/service/MessageService.java index a93a9d8..c8eaaf1 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/MessageService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/MessageService.java @@ -19,6 +19,4 @@ import com.yami.shop.bean.model.Message; */ public interface MessageService extends IService { - void deleteByIds(Long[] ids); - } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/NoticeService.java b/yami-shop-service/src/main/java/com/yami/shop/service/NoticeService.java index 49dd563..96ab445 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/NoticeService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/NoticeService.java @@ -26,13 +26,34 @@ import java.util.List; */ public interface NoticeService extends IService { + /** + * 获取公告列表 + * @return + */ List listNotice(); + /** + * 删除公告缓存 + */ void removeNoticeList(); + /** + * 分页获取公布的公告 + * @param page + * @return + */ Page pageNotice(Page page); + /** + * 根据公告id获取公告 + * @param noticeId + * @return + */ Notice getNoticeById(Long noticeId); + /** + * 根据公告id删除公告 + * @param noticeId + */ void removeNoticeById(Long noticeId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/OrderItemService.java b/yami-shop-service/src/main/java/com/yami/shop/service/OrderItemService.java index c948c12..2547fb2 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/OrderItemService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/OrderItemService.java @@ -10,17 +10,22 @@ package com.yami.shop.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.model.OrderItem; +import java.util.List; + /** * * @author lgh on 2018/09/15. */ public interface OrderItemService extends IService { + /** + * 根据订单编号获取订单项 + * @param orderNumber + * @return + */ List getOrderItemsByOrderNumber(String orderNumber); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java b/yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java index 2efaab1..08a8fe7 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java @@ -10,9 +10,7 @@ package com.yami.shop.service; -import java.util.Date; -import java.util.List; - +import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -21,37 +19,103 @@ import com.yami.shop.bean.app.dto.ShopCartOrderMergerDto; import com.yami.shop.bean.model.Order; import com.yami.shop.bean.param.OrderParam; -import cn.hutool.core.date.DateTime; +import java.util.Date; +import java.util.List; /** * @author lgh on 2018/09/15. */ public interface OrderService extends IService { - + /** + * 根据订单编号获取订单 + * @param orderNumber + * @return + */ Order getOrderByOrderNumber(String orderNumber); + /** + * 新增订单缓存 + * @param userId + * @param shopCartOrderMergerDto + * @return + */ ShopCartOrderMergerDto putConfirmOrderCache(String userId ,ShopCartOrderMergerDto shopCartOrderMergerDto); + /** + * 根据用户id获取订单缓存 + * @param userId + * @return + */ ShopCartOrderMergerDto getConfirmOrderCache(String userId); + /** + * 根据用户id删除订单缓存 + * @param userId + */ void removeConfirmOrderCache(String userId); + /** + * 提交订单 + * @param userId + * @param mergerOrder + * @return + */ List submit(String userId, ShopCartOrderMergerDto mergerOrder); + /** + * 发货 + * @param order + */ void delivery(Order order); + /** + * 根据参数获取订单列表 + * @param orderStatus 订单状态 + * @param lessThanUpdateTime 更新时间 + * @return + */ List listOrderAndOrderItems(Integer orderStatus, DateTime lessThanUpdateTime); + /** + * 取消订单 + * @param orders + */ void cancelOrders(List orders); + /** + * 订单确认收货 + * @param orders + */ void confirmOrder(List orders); - List listOrdersDetialByOrder(Order order, Date startTime, Date endTime); + /** + * 根据参数获取订单列表 + * @param order 订单参数 + * @param startTime 开始时间 + * @param endTime 结束时间 + * @return + */ + List listOrdersDetailByOrder(Order order, Date startTime, Date endTime); - IPage pageOrdersDetialByOrderParam(Page page, OrderParam orderParam); + /** + * 根据参数分页获取订单 + * @param page + * @param orderParam + * @return + */ + IPage pageOrdersDetailByOrderParam(Page page, OrderParam orderParam); + /** + * 删除订单 + * @param orders + */ void deleteOrders(List orders); + /** + * 根据用户id获取各个状态的订单数目 + * @param userId + * @return + */ OrderCountData getOrderCount(String userId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/OrderSettlementService.java b/yami-shop-service/src/main/java/com/yami/shop/service/OrderSettlementService.java index 25ed81f..1abf003 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/OrderSettlementService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/OrderSettlementService.java @@ -21,6 +21,8 @@ public interface OrderSettlementService extends IService { /** * 根据内部订单号更新order settlement + * @param outTradeNo 外部单号 + * @param transactionId 支付单号 */ void updateSettlementsByPayNo(String outTradeNo, String transactionId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/PayService.java b/yami-shop-service/src/main/java/com/yami/shop/service/PayService.java index f423163..b88691e 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/PayService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/PayService.java @@ -20,9 +20,20 @@ import java.util.List; */ public interface PayService { - + /** + * 支付 + * @param userId + * @param payParam + * @return + */ PayInfoDto pay(String userId, PayParam payParam); + /** + * 支付成功 + * @param payNo + * @param bizPayNo + * @return + */ List paySuccess(String payNo, String bizPayNo); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/PickAddrService.java b/yami-shop-service/src/main/java/com/yami/shop/service/PickAddrService.java index 720a38a..bd22fcd 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/PickAddrService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/PickAddrService.java @@ -19,6 +19,4 @@ import com.yami.shop.bean.model.PickAddr; */ public interface PickAddrService extends IService { - void deleteByIds(Long[] ids); - } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java index ca5f26b..3fd872a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdCommService.java @@ -18,8 +18,6 @@ import com.yami.shop.bean.app.dto.ProdCommDataDto; import com.yami.shop.bean.app.dto.ProdCommDto; import com.yami.shop.bean.model.ProdComm; -import java.util.List; - /** * 商品评论 @@ -28,12 +26,36 @@ import java.util.List; * @date 2019-04-19 10:43:57 */ public interface ProdCommService extends IService { + /** + * 根据商品id获取商品评论信息 + * @param prodId + * @return + */ ProdCommDataDto getProdCommDataByProdId(Long prodId); + /** + * 根据用户id分页获取商品评论 + * @param page + * @param userId + * @return + */ IPage getProdCommDtoPageByUserId(Page page,String userId); + /** + * 根据商品id和评价等级获取商品评价 + * @param page + * @param prodId + * @param evaluate + * @return + */ IPage getProdCommDtoPageByProdId(Page page, Long prodId, Integer evaluate); + /** + * 根据参数分页获取商品评价 + * @param page + * @param prodComm + * @return + */ IPage getProdCommPage(Page page,ProdComm prodComm); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropService.java index 4fa5473..42e83df 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropService.java @@ -15,11 +15,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.model.ProdProp; -import java.util.List; - /** * - * Created by lgh on 2018/07/06. + * @author lgh on 2018/07/06. */ public interface ProdPropService extends IService { @@ -45,15 +43,11 @@ public interface ProdPropService extends IService { /** * 删除属性、属性值 - * 如果propRule为2，同时删除分类与属性值之间的关联关系 + * 如果propRule为2，同时删除分类与属性值之间的关联关系 + * @param propId + * @param propRule + * @param shopId */ void deleteProdPropAndValues(Long propId,Integer propRule,Long shopId); - /** - * 根据分类id获取分类所关联的属性 - * @param categoryId - * @return - */ - List listByCategoryId(Long categoryId); - } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropValueService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropValueService.java index 39fa3f8..12c2231 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropValueService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdPropValueService.java @@ -14,8 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.model.ProdPropValue; /** - * - * Created by lgh on 2018/07/06. + * @author lanhai */ public interface ProdPropValueService extends IService { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagReferenceService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagReferenceService.java index bfae5fd..4fe0b93 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagReferenceService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagReferenceService.java @@ -23,6 +23,10 @@ import java.util.List; * @date 2019-04-18 16:28:01 */ public interface ProdTagReferenceService extends IService { - + /** + * 根据id获取标签id列表 + * @param prodId + * @return + */ List listTagIdByProdId(Long prodId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagService.java index a6b2304..9b2e06f 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProdTagService.java @@ -23,8 +23,14 @@ import java.util.List; * @date 2019-04-18 10:48:44 */ public interface ProdTagService extends IService { - + /** + * 获取商品分组标签列表 + * @return + */ List listProdTag(); + /** + * 删除商品分组标签缓存 + */ void removeProdTag(); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java index 189e65e..b3c9b30 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ProductService.java @@ -23,6 +23,7 @@ import java.util.List; /** * 商品 + * @author lanhai */ public interface ProductService extends IService { @@ -35,7 +36,7 @@ public interface ProductService extends IService { /** * 更新商品 - * + * @param dbProduct * @param product 商品信息 */ void updateProduct(Product product, Product dbProduct); @@ -48,24 +49,69 @@ public interface ProductService extends IService { */ Product getProductByProdId(Long prodId); - + /** + * 根据商品id删除商品 + * @param prodId + */ void removeProductByProdId(Long prodId); + /** + * 根据商品id删除缓存 + * @param prodId + */ void removeProductCacheByProdId(Long prodId); - IPage pageByPutawayTime(IPage page); + /** + * 根据上架时间倒序分页获取商品 + * @param page + * @return + */ + IPage pageByPutAwayTime(IPage page); + /** + * 根据标签分页获取商品 + * @param page + * @param tagId + * @return + */ IPage pageByTagId(Page page, Long tagId); + /** + * 分页获取销量较高商品 + * @param page + * @return + */ IPage moreBuyProdList(Page page); + /** + * 根据分类id分页获取商品列表 + * @param page + * @param categoryId + * @return + */ IPage pageByCategoryId(Page page, Long categoryId); - List listProdByCategoryId(Long categoryId); - + /** + * 根据商品名称 + * @param page + * @param prodName + * @param sort + * @param orderBy + * @return + */ IPage getSearchProdDtoPageByProdName(Page page, String prodName, Integer sort, Integer orderBy); + /** + * 分组获取商品列表 + * @return + */ List tagProdList(); + /** + * 分页获取收藏商品 + * @param page + * @param userId + * @return + */ IPage collectionProds(PageParam page, String userId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/ShopDetailService.java b/yami-shop-service/src/main/java/com/yami/shop/service/ShopDetailService.java index 8da539a..cd37189 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/ShopDetailService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/ShopDetailService.java @@ -18,9 +18,17 @@ import com.yami.shop.bean.model.ShopDetail; * @author lgh on 2018/08/29. */ public interface ShopDetailService extends IService { - + /** + * 更新店铺信息 + * @param shopDetail + * @param dbShopDetail + */ void updateShopDetail(ShopDetail shopDetail,ShopDetail dbShopDetail); + /** + * 删除店铺详情 + * @param id + */ void deleteShopDetailByShopId(Long id); /** @@ -30,5 +38,9 @@ public interface ShopDetailService extends IService { */ ShopDetail getShopDetailByShopId(Long shopId); + /** + * 根据店铺id删除店铺详情信息 + * @param shopId + */ void removeShopDetailCacheByShopId(Long shopId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/SkuService.java b/yami-shop-service/src/main/java/com/yami/shop/service/SkuService.java index 4bd1b1d..77836e1 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/SkuService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/SkuService.java @@ -10,11 +10,10 @@ package com.yami.shop.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.model.Sku; -import org.springframework.cache.annotation.CacheEvict; + +import java.util.List; /** * @@ -36,5 +35,10 @@ public interface SkuService extends IService { */ Sku getSkuBySkuId(Long skuId); + /** + * 根据商品id和skuId删除缓存 + * @param skuId + * @param prodId + */ void removeSkuCacheBySkuId(Long skuId,Long prodId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/SmsLogService.java b/yami-shop-service/src/main/java/com/yami/shop/service/SmsLogService.java index 84d377b..b47f6d2 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/SmsLogService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/SmsLogService.java @@ -21,6 +21,12 @@ import java.util.Map; * @author lgh on 2018/11/29. */ public interface SmsLogService extends IService { - + /** + * 发送短信 + * @param smsType 短信类型 + * @param userId 用户id + * @param mobile 手机号 + * @param params 内容 + */ void sendSms(SmsType smsType, String userId, String mobile, Map params); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/TransportManagerService.java b/yami-shop-service/src/main/java/com/yami/shop/service/TransportManagerService.java index 368b6e7..cf246ed 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/TransportManagerService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/TransportManagerService.java @@ -13,7 +13,15 @@ package com.yami.shop.service; import com.yami.shop.bean.app.dto.ProductItemDto; import com.yami.shop.bean.model.UserAddr; +/** + * @author lanhai + */ public interface TransportManagerService { - + /** + * 计算运费 + * @param productItem + * @param userAddr + * @return + */ Double calculateTransfee(ProductItemDto productItem, UserAddr userAddr); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/TransportService.java b/yami-shop-service/src/main/java/com/yami/shop/service/TransportService.java index 14f256d..1e51136 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/TransportService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/TransportService.java @@ -13,23 +13,41 @@ package com.yami.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.model.Transport; -import org.springframework.cache.annotation.CacheEvict; /** * * @author lgh on 2018/11/16. */ public interface TransportService extends IService { - + /** + * 插入运费模板和运费项 + * @param transport + */ void insertTransportAndTransfee(Transport transport); + /** + * 根据运费模板和运费项 + * @param transport + */ void updateTransportAndTransfee(Transport transport); + /** + * 根据id列表删除运费模板和运费项 + * @param ids + */ void deleteTransportAndTransfeeAndTranscity(Long[] ids); + /** + * 根据模板id获取运费模板和运费项 + * @param transportId + * @return + */ Transport getTransportAndAllItems(Long transportId); - @CacheEvict(cacheNames = "TransportAndAllItems", key = "#transportId") - default void removeTransportAndAllItemsCache(Long transportId){} + /** + * 删除缓存 + * @param transportId + */ + void removeTransportAndAllItemsCache(Long transportId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrOrderService.java b/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrOrderService.java index 3b72944..7597c8b 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrOrderService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrOrderService.java @@ -12,7 +12,9 @@ package com.yami.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.model.UserAddrOrder; - +/** + * @author lanhai + */ public interface UserAddrOrderService extends IService { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrService.java b/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrService.java index 8cf25cd..d552182 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/UserAddrService.java @@ -12,10 +12,16 @@ package com.yami.shop.service; import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.bean.model.UserAddr; -import org.springframework.cache.annotation.CacheEvict; +/** + * @author lanhai + */ public interface UserAddrService extends IService { - + /** + * 获取用户默认地址 + * @param userId + * @return + */ UserAddr getDefaultUserAddr(String userId); /** @@ -25,9 +31,19 @@ public interface UserAddrService extends IService { */ void updateDefaultUserAddr(Long addrId, String userId); - + /** + * 删除缓存 + * @param addrId + * @param userId + */ void removeUserAddrByUserId(Long addrId, String userId); + /** + * 根据用户id和地址id获取用户地址 + * @param addrId + * @param userId + * @return + */ UserAddr getUserAddrByUserId(Long addrId, String userId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/UserCollectionService.java b/yami-shop-service/src/main/java/com/yami/shop/service/UserCollectionService.java index b6893a6..5a129a6 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/UserCollectionService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/UserCollectionService.java @@ -24,5 +24,11 @@ import com.yami.shop.bean.model.UserCollection; * @date 2019-04-19 16:57:20 */ public interface UserCollectionService extends IService { + /** + * 分页获取用户收藏 + * @param page + * @param userId + * @return + */ IPage getUserCollectionDtoPageByUserId(Page page, String userId); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/UserService.java b/yami-shop-service/src/main/java/com/yami/shop/service/UserService.java index 5643d09..518357c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/UserService.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/UserService.java @@ -19,8 +19,17 @@ import com.yami.shop.bean.param.UserRegisterParam; * @author lgh on 2018/09/11. */ public interface UserService extends IService { - + /** + * 根据用户id获取用户信息 + * @param userId + * @return + */ User getUserByUserId(String userId); + /** + * 校验验证码 + * @param userRegisterParam + * @param checkRegisterSmsFlag + */ void validate(UserRegisterParam userRegisterParam, String checkRegisterSmsFlag); } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/AttachFileServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/AttachFileServiceImpl.java index a411d3f..8624b90 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/AttachFileServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/AttachFileServiceImpl.java @@ -10,14 +10,11 @@ package com.yami.shop.service.impl; -import java.util.Date; - +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.qiniu.common.QiniuException; import com.qiniu.http.Response; import com.qiniu.storage.BucketManager; @@ -29,15 +26,14 @@ import com.yami.shop.common.bean.Qiniu; import com.yami.shop.common.util.Json; import com.yami.shop.dao.AttachFileMapper; import com.yami.shop.service.AttachFileService; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.RandomUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; + /** - * - * Created by lgh on 2018/07/27. + * @author lanhai */ @Service public class AttachFileServiceImpl extends ServiceImpl implements AttachFileService { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/BrandServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/BrandServiceImpl.java index 49c6d7a..b15d077 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/BrandServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/BrandServiceImpl.java @@ -21,8 +21,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * - * Created by lgh on 2018/07/05. + * @author lanhai */ @Service public class BrandServiceImpl extends ServiceImpl implements BrandService { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryBrandServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryBrandServiceImpl.java index f837026..fc48266 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryBrandServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryBrandServiceImpl.java @@ -19,8 +19,7 @@ import com.yami.shop.dao.CategoryBrandMapper; import com.yami.shop.service.CategoryBrandService; /** - * - * Created by lgh on 2018/07/13. + * @author lanhai */ @Service public class CategoryBrandServiceImpl extends ServiceImpl implements CategoryBrandService { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryPropServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryPropServiceImpl.java index 60023fe..5c3ab4a 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryPropServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryPropServiceImpl.java @@ -19,8 +19,7 @@ import com.yami.shop.dao.CategoryPropMapper; import com.yami.shop.service.CategoryPropService; /** - * - * Created by lgh on 2018/07/13. + * @author lanhai */ @Service public class CategoryPropServiceImpl extends ServiceImpl implements CategoryPropService { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java index c07a3e4..a50dc2b 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java @@ -10,31 +10,29 @@ package com.yami.shop.service.impl; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.google.common.collect.Lists; -import com.yami.shop.bean.app.dto.CategoryDto; import com.yami.shop.bean.model.Category; import com.yami.shop.dao.CategoryBrandMapper; import com.yami.shop.dao.CategoryMapper; import com.yami.shop.dao.CategoryPropMapper; import com.yami.shop.service.AttachFileService; import com.yami.shop.service.CategoryService; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import ma.glasnost.orika.MapperFacade; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +/** + * @author lanhai + */ @Service public class CategoryServiceImpl extends ServiceImpl implements CategoryService{ @@ -65,7 +63,7 @@ public class CategoryServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) - public void saveCategroy(Category category) { + public void saveCategory(Category category) { category.setRecTime(new Date()); // 保存分类信息 categoryMapper.insert(category); @@ -75,7 +73,7 @@ public class CategoryServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) - public void updateCategroy(Category category) { + public void updateCategory(Category category) { Category dbCategory = categoryMapper.selectById(category.getCategoryId()); category.setUpdateTime(new Date()); // 保存分类信息 @@ -91,7 +89,7 @@ public class CategoryServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) - public void deleteCategroy(Long categoryId) { + public void deleteCategory(Long categoryId) { Category category = categoryMapper.selectById(categoryId); categoryMapper.deleteById(categoryId); @@ -151,10 +149,4 @@ public class CategoryServiceImpl extends ServiceImpl i } } - @Override - public List listCategoryDtoByShopId(Long shopId) { - List categoryList = categoryMapper.listCategoryAndProdByShopId(shopId); - return mapperFacade.mapAsList(categoryList, CategoryDto.class); - } - } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/HotSearchServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/HotSearchServiceImpl.java index 92737a0..3a8f04d 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/HotSearchServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/HotSearchServiceImpl.java @@ -36,13 +36,13 @@ public class HotSearchServiceImpl extends ServiceImpl getHotSearchDtoByshopId(Long shopId) { + public List getHotSearchDtoByShopId(Long shopId) { return hotSearchMapper.getHotSearchDtoByShopId(shopId); } @Override @CacheEvict(cacheNames = "HotSearchDto", key = "#shopId") - public void removeHotSearchDtoCacheByshopId(Long shopId) { + public void removeHotSearchDtoCacheByShopId(Long shopId) { } } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/IndexImgServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/IndexImgServiceImpl.java index d571fab..428e70f 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/IndexImgServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/IndexImgServiceImpl.java @@ -33,14 +33,14 @@ public class IndexImgServiceImpl extends ServiceImpl i private IndexImgMapper indexImgMapper; @Override - public void deleteIndexImgsByIds(Long[] ids) { - indexImgMapper.deleteIndexImgsByIds(ids); + public void deleteIndexImgByIds(Long[] ids) { + indexImgMapper.deleteIndexImgByIds(ids); } @Override @Cacheable(cacheNames = "indexImg", key = "'indexImg'") - public List listIndexImgs() { - return indexImgMapper.listIndexImgs(); + public List listIndexImg() { + return indexImgMapper.listIndexImg(); } @Override diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/MessageServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/MessageServiceImpl.java index f2816d2..8286993 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/MessageServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/MessageServiceImpl.java @@ -28,9 +28,4 @@ public class MessageServiceImpl extends ServiceImpl impl @Autowired private MessageMapper messageMapper; - @Override - public void deleteByIds(Long[] ids) { - messageMapper.deleteByIds(ids); - } - } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java index b548dcd..4374692 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java @@ -30,11 +30,9 @@ import com.yami.shop.dao.ProductMapper; import com.yami.shop.dao.SkuMapper; import com.yami.shop.service.OrderService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; import org.springframework.cache.annotation.Cacheable; -import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -163,14 +161,14 @@ public class OrderServiceImpl extends ServiceImpl implements } @Override - public List listOrdersDetialByOrder(Order order, Date startTime, Date endTime) { - return orderMapper.listOrdersDetialByOrder(order, startTime, endTime); + public List listOrdersDetailByOrder(Order order, Date startTime, Date endTime) { + return orderMapper.listOrdersDetailByOrder(order, startTime, endTime); } @Override - public IPage pageOrdersDetialByOrderParam(Page page, OrderParam orderParam) { - page.setRecords(orderMapper.listOrdersDetialByOrderParam(new PageAdapter(page), orderParam)); - page.setTotal(orderMapper.countOrderDetial(orderParam)); + public IPage pageOrdersDetailByOrderParam(Page page, OrderParam orderParam) { + page.setRecords(orderMapper.listOrdersDetailByOrderParam(new PageAdapter(page), orderParam)); + page.setTotal(orderMapper.countOrderDetail(orderParam)); return page; } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PickAddrServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/PickAddrServiceImpl.java index 0e4d7ee..2e5d81c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/PickAddrServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/PickAddrServiceImpl.java @@ -28,10 +28,5 @@ public class PickAddrServiceImpl extends ServiceImpl i @Autowired private PickAddrMapper pickAddrMapper; - @Override - public void deleteByIds(Long[] ids) { - pickAddrMapper.deleteByIds(ids); - } - } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropServiceImpl.java index fd9330b..ab76c08 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropServiceImpl.java @@ -27,11 +27,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.validation.Valid; -import java.util.List; import java.util.Objects; /** - * Created by lgh on 2018/07/06. + * @author lanhai */ @Service public class ProdPropServiceImpl extends ServiceImpl implements ProdPropService { @@ -99,9 +98,4 @@ public class ProdPropServiceImpl extends ServiceImpl i categoryPropMapper.deleteByPropId(propId); } } - - @Override - public List listByCategoryId(Long categoryId) { - return prodPropMapper.listByCategoryId(categoryId); - } } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropValueServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropValueServiceImpl.java index fbae2e0..6f5aaa1 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropValueServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropValueServiceImpl.java @@ -19,8 +19,7 @@ import com.yami.shop.dao.ProdPropValueMapper; import com.yami.shop.service.ProdPropValueService; /** - * - * Created by lgh on 2018/07/06. + * @author lanhai */ @Service public class ProdPropValueServiceImpl extends ServiceImpl implements ProdPropValueService { diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java index b2b5b5f..a6365ae 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java @@ -11,7 +11,6 @@ package com.yami.shop.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -40,9 +39,11 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; +/** + * @author lanhai + */ @Service public class ProductServiceImpl extends ServiceImpl implements ProductService { @@ -78,11 +79,6 @@ public class ProductServiceImpl extends ServiceImpl impl productMapper.updateById(product); List dbSkuIds = dbProduct.getSkuList().stream().map(Sku::getSkuId).collect(Collectors.toList()); - // 2019/04/c0244be79909484fb67bc6d5f70cae18.jpg -// if (!Objects.equals(dbProduct.getPic(), product.getPic()) && StrUtil.isNotBlank(dbProduct.getPic())) { -// // 删除数据库中的商品图片 -// attachFileService.deleteFile(dbProduct.getPic()); -// } // 将所有该商品的sku标记为已删除状态 skuMapper.deleteByProdId(product.getProdId()); @@ -160,8 +156,8 @@ public class ProductServiceImpl extends ServiceImpl impl } @Override - public IPage pageByPutawayTime(IPage page) { - return productMapper.pageByPutawayTime(page); + public IPage pageByPutAwayTime(IPage page) { + return productMapper.pageByPutAwayTime(page); } @Override @@ -179,11 +175,6 @@ public class ProductServiceImpl extends ServiceImpl impl return productMapper.pageByCategoryId(page, categoryId); } - @Override - public List listProdByCategoryId(Long categoryId) { - return productMapper.listProdByCategoryId(categoryId); - } - @Override public IPage getSearchProdDtoPageByProdName(Page page, String prodName, Integer sort, Integer orderBy) { IPage searchProdDtoPage = productMapper.getSearchProdDtoPageByProdName(page, prodName, sort, orderBy); diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java index feb6a60..6a9080c 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopDetailServiceImpl.java @@ -69,20 +69,7 @@ public class ShopDetailServiceImpl extends ServiceImpl impleme private final SmsLogMapper smsLogMapper; - private final ALiDaYu aLiDaYu; + private final AliDaYu aLiDaYu; /** * 产品名称:云通信短信API产品,开发者无需替换 diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java index cf0ec91..07f8794 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportManagerServiceImpl.java @@ -20,12 +20,15 @@ import com.yami.shop.service.ProductService; import com.yami.shop.service.SkuService; import com.yami.shop.service.TransportManagerService; import com.yami.shop.service.TransportService; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Objects; - +/** + * @author lanhai + */ @Service public class TransportManagerServiceImpl implements TransportManagerService { @@ -62,20 +65,7 @@ public class TransportManagerServiceImpl implements TransportManagerService { Sku sku = skuService.getSkuBySkuId(productItem.getSkuId()); // 用于计算运费的件数 - Double piece = 0.0; - - if (Objects.equals(TransportChargeType.COUNT.value(), transport.getChargeType())) { - // 按件数计算运费 - piece = Double.valueOf(productItem.getProdCount()); - } else if (Objects.equals(TransportChargeType.WEIGHT.value(), transport.getChargeType())) { - // 按重量计算运费 - double weight = sku.getWeight() == null ? 0 : sku.getWeight(); - piece = Arith.mul(weight, productItem.getProdCount()); - } else if (Objects.equals(TransportChargeType.VOLUME.value(), transport.getChargeType())) { - // 按体积计算运费 - double volume = sku.getVolume() == null ? 0 : sku.getVolume(); - piece = Arith.mul(volume, productItem.getProdCount()); - } + Double piece = getPiece(productItem, transport, sku); //如果有包邮的条件 @@ -89,9 +79,10 @@ public class TransportManagerServiceImpl implements TransportManagerService { continue; } //包邮方式 （0 满x件/重量/体积包邮 1满金额包邮 2满x件/重量/体积且满金额包邮） - if ((transfeeFree.getFreeType() == 0 && piece >= transfeeFree.getPiece()) || + boolean isFree = (transfeeFree.getFreeType() == 0 && piece >= transfeeFree.getPiece()) || (transfeeFree.getFreeType() == 1 && productItem.getProductTotalAmount() >= transfeeFree.getAmount()) || - (transfeeFree.getFreeType() == 2 && piece >= transfeeFree.getPiece() && productItem.getProductTotalAmount() >= transfeeFree.getAmount())) { + (transfeeFree.getFreeType() == 2 && piece >= transfeeFree.getPiece() && productItem.getProductTotalAmount() >= transfeeFree.getAmount()); + if (isFree) { return 0.0; } } @@ -139,5 +130,24 @@ public class TransportManagerServiceImpl implements TransportManagerService { return fee; } + @NotNull + private Double getPiece(ProductItemDto productItem, Transport transport, Sku sku) { + Double piece = 0.0; + + if (Objects.equals(TransportChargeType.COUNT.value(), transport.getChargeType())) { + // 按件数计算运费 + piece = Double.valueOf(productItem.getProdCount()); + } else if (Objects.equals(TransportChargeType.WEIGHT.value(), transport.getChargeType())) { + // 按重量计算运费 + double weight = sku.getWeight() == null ? 0 : sku.getWeight(); + piece = Arith.mul(weight, productItem.getProdCount()); + } else if (Objects.equals(TransportChargeType.VOLUME.value(), transport.getChargeType())) { + // 按体积计算运费 + double volume = sku.getVolume() == null ? 0 : sku.getVolume(); + piece = Arith.mul(volume, productItem.getProdCount()); + } + return piece; + } + } diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java index 48d1410..142eefb 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/TransportServiceImpl.java @@ -180,4 +180,10 @@ public class TransportServiceImpl extends ServiceImpl implements UserAddrOrderService{ diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrServiceImpl.java index 1b0df92..88e27e6 100644 --- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrServiceImpl.java +++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserAddrServiceImpl.java @@ -21,7 +21,9 @@ import com.yami.shop.bean.model.UserAddr; import com.yami.shop.common.exception.YamiShopBindException; import com.yami.shop.dao.UserAddrMapper; import com.yami.shop.service.UserAddrService; - +/** + * @author lanhai + */ @Service public class UserAddrServiceImpl extends ServiceImpl implements UserAddrService { diff --git a/yami-shop-service/src/main/resources/mapper/BasketMapper.xml b/yami-shop-service/src/main/resources/mapper/BasketMapper.xml index dfc1f96..5a2e1a6 100644 --- a/yami-shop-service/src/main/resources/mapper/BasketMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/BasketMapper.xml @@ -61,18 +61,6 @@ WHERE tp.status = 0 OR ts.status = 0 AND tb.user_id = #{userId}) AS temp) - - diff --git a/yami-shop-service/src/main/resources/mapper/CategoryMapper.xml b/yami-shop-service/src/main/resources/mapper/CategoryMapper.xml index 9966678..69ed36d 100644 --- a/yami-shop-service/src/main/resources/mapper/CategoryMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/CategoryMapper.xml @@ -52,15 +52,4 @@ - - diff --git a/yami-shop-service/src/main/resources/mapper/IndexImgMapper.xml b/yami-shop-service/src/main/resources/mapper/IndexImgMapper.xml index 164f4b8..6a480aa 100644 --- a/yami-shop-service/src/main/resources/mapper/IndexImgMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/IndexImgMapper.xml @@ -17,14 +17,14 @@ - + delete from tz_index_img where img_id in #{id} - SELECT * FROM tz_index_img where `status` = 1 diff --git a/yami-shop-service/src/main/resources/mapper/MessageMapper.xml b/yami-shop-service/src/main/resources/mapper/MessageMapper.xml index d494764..83dc2a0 100644 --- a/yami-shop-service/src/main/resources/mapper/MessageMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/MessageMapper.xml @@ -14,11 +14,4 @@ - - - delete from tz_message where id in - - #{id} - - \ No newline at end of file diff --git a/yami-shop-service/src/main/resources/mapper/OrderMapper.xml b/yami-shop-service/src/main/resources/mapper/OrderMapper.xml index 6964db3..eb4fefb 100644 --- a/yami-shop-service/src/main/resources/mapper/OrderMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/OrderMapper.xml @@ -177,7 +177,7 @@ - update tz_order set `status`=6,cancel_time = NOW() where order_id in + update tz_order set `status`=6,cancel_time = NOW() where is_payed = 0 and order_id in #{order.orderId} @@ -197,7 +197,7 @@ - select o.*,oi.*,oi.prod_name as item_prod_name,uao.* from tz_order o left join tz_order_item oi on o.order_number = oi.order_number left join tz_user_addr_order uao on o.addr_order_id = uao.addr_order_id @@ -229,7 +229,7 @@ AS limittable) ORDER BY o.create_time DESC - SELECT *,oi.sku_name as item_sku_name,oi.prod_name as item_prod_name FROM ( SELECT * FROM tz_order @@ -263,7 +263,7 @@ ON o.addr_order_id = uao.addr_order_id - SELECT COUNT(0) FROM tz_order diff --git a/yami-shop-service/src/main/resources/mapper/PickAddrMapper.xml b/yami-shop-service/src/main/resources/mapper/PickAddrMapper.xml index 0249a76..439ad8c 100644 --- a/yami-shop-service/src/main/resources/mapper/PickAddrMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/PickAddrMapper.xml @@ -14,11 +14,5 @@ - - - delete from tz_pick_addr where addr_id in - - #{addrId} - - + \ No newline at end of file diff --git a/yami-shop-service/src/main/resources/mapper/ProdPropMapper.xml b/yami-shop-service/src/main/resources/mapper/ProdPropMapper.xml index a797b85..4bf559c 100644 --- a/yami-shop-service/src/main/resources/mapper/ProdPropMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/ProdPropMapper.xml @@ -48,12 +48,6 @@ delete from tz_prod_prop where prop_id = #{propId} and rule = #{rule} and shop_id = #{shopId} - - diff --git a/yami-shop-service/src/main/resources/mapper/ProductMapper.xml b/yami-shop-service/src/main/resources/mapper/ProductMapper.xml index cd58886..c3382cb 100644 --- a/yami-shop-service/src/main/resources/mapper/ProductMapper.xml +++ b/yami-shop-service/src/main/resources/mapper/ProductMapper.xml @@ -70,15 +70,6 @@ update tz_prod set total_stocks = total_stocks - #{prod.totalStocks} ,version = version + 1 where prod_id = #{prod.prodId} and #{prod.totalStocks} <= total_stocks - - - SELECT FROM tz_prod p diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/aspect/SysLogAspect.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/aspect/SysLogAspect.java index 7dd0a49..991906c 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/aspect/SysLogAspect.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/aspect/SysLogAspect.java @@ -11,7 +11,7 @@ package com.yami.shop.sys.aspect; import cn.hutool.core.date.SystemClock; -import com.yami.shop.common.util.IPHelper; +import com.yami.shop.common.util.IpHelper; import com.yami.shop.common.util.Json; import com.yami.shop.security.admin.util.SecurityUtils; import com.yami.shop.sys.model.SysLog; @@ -62,7 +62,7 @@ public class SysLogAspect { sysLogEntity.setParams(params); //设置IP地址 - sysLogEntity.setIp(IPHelper.getIpAddr()); + sysLogEntity.setIp(IpHelper.getIpAddr()); //用户名 String username = SecurityUtils.getSysUser().getUsername(); diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/Constant.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/Constant.java index 7dcf68d..9f2fdfc 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/Constant.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/Constant.java @@ -12,6 +12,7 @@ package com.yami.shop.sys.constant; /** * 常量 + * @author lanhai */ public class Constant { /** 超级管理员ID */ diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/MenuType.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/MenuType.java index 0e0b483..7dd7545 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/MenuType.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/constant/MenuType.java @@ -2,6 +2,7 @@ package com.yami.shop.sys.constant; /** * 菜单类型 + * @author lanhai */ public enum MenuType { /** diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysLogMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysLogMapper.java index 674bb4c..2bd9a4f 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysLogMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysLogMapper.java @@ -15,6 +15,7 @@ import com.yami.shop.sys.model.SysLog; /** * 系统日志 + * @author lanhai */ public interface SysLogMapper extends BaseMapper { diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysMenuMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysMenuMapper.java index 853ab78..9c68164 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysMenuMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysMenuMapper.java @@ -56,9 +56,14 @@ public interface SysMenuMapper extends BaseMapper{ /** * 根据一级菜单id 获取二级菜单 + * @param parentId 一级菜单id * @return 二级菜单列表 */ List listChildrenMenuByParentId(Long parentId); + /** + * 获取菜单和按钮列表 + * @return + */ List listMenuAndBtn(); } diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMapper.java index febb06e..0f76c33 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMapper.java @@ -17,12 +17,21 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** + * @author lanhai * 角色管理 */ public interface SysRoleMapper extends BaseMapper{ - + /** + * 批量删除 + * @param roleIds + */ void deleteBatch(@Param("roleIds") Long[] roleIds); + /** + * 根据用户id获取角色id列表 + * @param userId + * @return + */ List listRoleIdByUserId(Long userId); } diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMenuMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMenuMapper.java index d182c41..48f0862 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMenuMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysRoleMenuMapper.java @@ -17,12 +17,15 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** + * @author lanhai * 角色与菜单对应关系 */ public interface SysRoleMenuMapper extends BaseMapper { /** * 根据角色ID数组，批量删除 + * @param roleIds + * @return */ int deleteBatch(Long[] roleIds); diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserMapper.java index c1b3260..bd5e90f 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserMapper.java @@ -17,6 +17,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** + * @author lanhai * 系统用户 */ public interface SysUserMapper extends BaseMapper { @@ -24,12 +25,14 @@ public interface SysUserMapper extends BaseMapper { /** * 查询用户的所有权限 * @param userId 用户ID + * @return */ List queryAllPerms(@Param("userId") Long userId); /** * 根据用户id 批量删除用户 * @param userIds + * @param shopId */ void deleteBatch(@Param("userIds") Long[] userIds, @Param("shopId") Long shopId); diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserRoleMapper.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserRoleMapper.java index e030379..b900c1f 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserRoleMapper.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dao/SysUserRoleMapper.java @@ -18,11 +18,14 @@ import java.util.List; /** * 用户与角色对应关系 + * @author lanhai */ public interface SysUserRoleMapper extends BaseMapper { /** * 根据角色ID数组，批量删除 + * @param roleIds + * @return */ int deleteBatch(@Param("roleIds") Long[] roleIds); diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java index 0dc02f0..efbdc51 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java @@ -15,7 +15,9 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; - +/** + * @author lanhai + */ @Data @Schema(description = "更新密码参数") public class UpdatePasswordDto { diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysConfig.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysConfig.java index f2e2c90..1287958 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysConfig.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysConfig.java @@ -18,6 +18,7 @@ import javax.validation.constraints.NotBlank; /** * 系统配置信息 + * @author lanhai */ @Data @TableName("tz_sys_config") diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysLog.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysLog.java index c2886cd..5187dcd 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysLog.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysLog.java @@ -12,7 +12,6 @@ package com.yami.shop.sys.model; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -21,6 +20,7 @@ import java.util.Date; /** * 系统日志 + * @author lanhai */ @Data @TableName("tz_sys_log") diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java index 723f586..e39b524 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java @@ -23,7 +23,7 @@ import java.util.List; /** * 菜单管理 - * + * @author lanhai */ @Data @TableName("tz_sys_menu") diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRole.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRole.java index bce3de4..262eb80 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRole.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRole.java @@ -14,7 +14,6 @@ package com.yami.shop.sys.model; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -25,6 +24,7 @@ import java.util.List; /** * 角色 + * @author lanhai */ @Data @TableName("tz_sys_role") diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRoleMenu.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRoleMenu.java index e046f53..30d8e08 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRoleMenu.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRoleMenu.java @@ -19,7 +19,7 @@ import java.io.Serializable; /** * 角色与菜单对应关系 - * + * @author lanhai */ @Data @TableName("tz_sys_role_menu") diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUser.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUser.java index a8e24e7..a07d5dc 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUser.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUser.java @@ -28,6 +28,7 @@ import java.util.List; /** * 系统用户 + * @author lanhai */ @Data @TableName("tz_sys_user") diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUserRole.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUserRole.java index 0090627..688bec5 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUserRole.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUserRole.java @@ -19,6 +19,7 @@ import java.io.Serializable; /** * 用户与角色对应关系 + * @author lanhai */ @Data @TableName("tz_sys_user_role") diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysMenuService.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysMenuService.java index 57de2be..59a4633 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysMenuService.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysMenuService.java @@ -11,11 +11,11 @@ package com.yami.shop.sys.service; -import java.util.List; - import com.baomidou.mybatisplus.extension.service.IService; import com.yami.shop.sys.model.SysMenu; +import java.util.List; + /** * 菜单管理 @@ -62,5 +62,9 @@ public interface SysMenuService extends IService { */ List listChildrenMenuByParentId(Long parentId); + /** + * 获取菜单和按钮列表 + * @return + */ List listMenuAndBtn(); } diff --git a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java index 4c6ea5b..8a324fe 100644 --- a/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java +++ b/yami-shop-sys/src/main/java/com/yami/shop/sys/service/SysUserService.java @@ -45,6 +45,7 @@ public interface SysUserService extends IService { /** * 根据用户id 批量删除用户 * @param userIds + * @param shopId */ void deleteBatch(Long[] userIds,Long shopId); @@ -65,6 +66,7 @@ public interface SysUserService extends IService { /** * 查询用户的所有权限 * @param userId 用户ID + * @return */ List queryAllPerms(Long userId);