wangming il y a 1 mois
Parent
commit
7360519f69
25 fichiers modifiés avec 89 ajouts et 125 suppressions
  1. 12 22
      yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java
  2. 4 1
      yami-shop-api/src/main/java/com/yami/shop/api/controller/AdvertInfoController.java
  3. 5 7
      yami-shop-api/src/main/java/com/yami/shop/api/controller/AreaController.java
  4. 9 11
      yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java
  5. 1 3
      yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java
  6. 0 6
      yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryNoticeController.java
  7. 3 1
      yami-shop-api/src/main/java/com/yami/shop/api/controller/KeywordController.java
  8. 1 1
      yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java
  9. 4 3
      yami-shop-api/src/main/java/com/yami/shop/api/controller/MyShopDetailController.java
  10. 1 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRefundController.java
  11. 0 1
      yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java
  12. 6 4
      yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java
  13. 4 8
      yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java
  14. 15 11
      yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java
  15. 0 1
      yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java
  16. 0 10
      yami-shop-api/src/main/java/com/yami/shop/api/controller/QnhController.java
  17. 1 1
      yami-shop-api/src/main/java/com/yami/shop/api/controller/QrcodeTicketController.java
  18. 1 1
      yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java
  19. 10 6
      yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java
  20. 4 1
      yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopDetailController.java
  21. 0 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java
  22. 6 14
      yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java
  23. 1 1
      yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java
  24. 1 2
      yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionShopController.java
  25. 0 5
      yami-shop-api/src/main/java/com/yami/shop/api/controller/UserRegisterController.java

+ 12 - 22
yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java

@@ -10,39 +10,29 @@
 
 package com.yami.shop.api.controller;
 
-import java.util.Date;
-import java.util.List;
-
-import javax.validation.Valid;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.bean.app.dto.UserAddrDto;
+import com.yami.shop.bean.app.param.AddrParam;
+import com.yami.shop.bean.model.UserAddr;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.delivery.comment.model.Transport2;
 import com.yami.shop.delivery.comment.service.Transport2Service;
 import com.yami.shop.delivery.comment.service.TransportManagerService;
 import com.yami.shop.security.api.util.SecurityUtils;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-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 com.yami.shop.bean.app.dto.UserAddrDto;
-import com.yami.shop.bean.app.param.AddrParam;
-import com.yami.shop.bean.model.UserAddr;
 import com.yami.shop.service.UserAddrService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
 
 
 @RestController

+ 4 - 1
yami-shop-api/src/main/java/com/yami/shop/api/controller/AdvertInfoController.java

@@ -5,7 +5,10 @@ import com.yami.shop.bean.model.AdvertInfo;
 import com.yami.shop.service.IAdvertInfoService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 

+ 5 - 7
yami-shop-api/src/main/java/com/yami/shop/api/controller/AreaController.java

@@ -10,20 +10,18 @@
 
 package com.yami.shop.api.controller;
 
-import java.util.List;
-
+import com.yami.shop.bean.model.Area;
 import com.yami.shop.service.AreaService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.yami.shop.bean.model.Area;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
+import java.util.List;
 
 /**
  *

+ 9 - 11
yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java

@@ -10,27 +10,25 @@
 
 package com.yami.shop.api.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yami.shop.bean.vo.ListCategoryForUserVO;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
 import com.yami.shop.bean.app.dto.CategoryDto;
 import com.yami.shop.bean.model.Category;
+import com.yami.shop.bean.vo.ListCategoryForUserVO;
 import com.yami.shop.service.CategoryService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import ma.glasnost.orika.MapperFacade;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 商品分类信息管理实现

+ 1 - 3
yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryController.java

@@ -10,12 +10,10 @@
 
 package com.yami.shop.api.controller;
 
-import com.google.gson.Gson;
-import com.yami.shop.bean.app.dto.DeliveryDto;
 import com.yami.shop.bean.app.dto.SimpleDeliveryDto;
 import com.yami.shop.bean.model.Delivery;
 import com.yami.shop.bean.model.Order;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.delivery.comment.api.paotui.PaoTuiApi;
 import com.yami.shop.delivery.comment.api.paotui.model.request.OrderDetailRequest;
 import com.yami.shop.delivery.comment.api.paotui.model.response.OrderStatusResponse;

+ 0 - 6
yami-shop-api/src/main/java/com/yami/shop/api/controller/DeliveryNoticeController.java

@@ -1,11 +1,7 @@
 package com.yami.shop.api.controller;
 
-import com.yami.shop.bean.app.dto.SimpleDeliveryDto;
 import com.yami.shop.bean.app.param.OrderRefundParam;
-import com.yami.shop.bean.model.Delivery;
 import com.yami.shop.bean.model.Order;
-import com.yami.shop.bean.model.OrderRefund;
-import com.yami.shop.delivery.comment.api.paotui.PaoTuiApi;
 import com.yami.shop.delivery.comment.api.paotui.model.request.NoticeModel;
 import com.yami.shop.service.OrderRefundService;
 import com.yami.shop.service.OrderService;
@@ -19,8 +15,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/delivery/notice")
 @Api(tags = "物流通知接口")

+ 3 - 1
yami-shop-api/src/main/java/com/yami/shop/api/controller/KeywordController.java

@@ -6,7 +6,9 @@ import com.yami.shop.service.IKeywordService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;

+ 1 - 1
yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java

@@ -19,7 +19,7 @@ import com.yami.shop.bean.enums.RefundStatusEnum;
 import com.yami.shop.bean.enums.RefundType;
 import com.yami.shop.bean.model.*;
 import com.yami.shop.common.config.Constant;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.Arith;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.config.ShopConfig;

+ 4 - 3
yami-shop-api/src/main/java/com/yami/shop/api/controller/MyShopDetailController.java

@@ -15,16 +15,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.collect.Maps;
 import com.yami.shop.bean.app.param.SendSmsParam;
 import com.yami.shop.bean.dto.ShopDetailDto;
-import com.yami.shop.bean.param.ShopDetailParam;
 import com.yami.shop.bean.enums.SmsType;
 import com.yami.shop.bean.model.ShopAuditing;
 import com.yami.shop.bean.model.ShopDetail;
+import com.yami.shop.bean.param.ShopDetailParam;
 import com.yami.shop.common.exception.GlobalException;
-import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.security.api.util.SecurityUtils;
 import com.yami.shop.security.comment.model.UpdatePasswordDto;
 import com.yami.shop.security.comment.model.UsernameAndPasswordDto;
-import com.yami.shop.service.*;
+import com.yami.shop.service.ShopAuditingService;
+import com.yami.shop.service.ShopDetailService;
+import com.yami.shop.service.SmsLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

+ 1 - 2
yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderRefundController.java

@@ -15,7 +15,7 @@ import com.yami.shop.bean.enums.ReturnMoneyStsType;
 import com.yami.shop.bean.model.*;
 import com.yami.shop.bean.param.OrderDto;
 import com.yami.shop.common.config.Constant;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.Arith;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.delivery.comment.api.paotui.PaoTuiApi;
@@ -35,7 +35,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

+ 0 - 1
yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java

@@ -18,7 +18,6 @@ import com.yami.shop.bean.model.Order;
 import com.yami.shop.bean.model.RefundDelivery;
 import com.yami.shop.bean.pay.PayInfoDto;
 import com.yami.shop.common.exception.GlobalException;
-import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.security.api.model.YamiUser;
 import com.yami.shop.security.api.util.SecurityUtils;
 import com.yami.shop.service.*;

+ 6 - 4
yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java

@@ -12,17 +12,19 @@ package com.yami.shop.api.controller;
 
 import com.alipay.api.AlipayApiException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.yami.shop.bean.bo.PayInfoBo;
-import com.yami.shop.bean.model.RefundDelivery;
-import com.yami.shop.common.enums.PayType;
 import com.yami.shop.bean.model.Order;
 import com.yami.shop.bean.model.OrderItem;
+import com.yami.shop.bean.model.RefundDelivery;
+import com.yami.shop.common.enums.PayType;
 import com.yami.shop.service.*;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;

+ 4 - 8
yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdCommController.java

@@ -13,29 +13,25 @@ package com.yami.shop.api.controller;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yami.shop.bean.app.dto.ProdCommDto;
+import com.yami.shop.bean.app.param.ProdCommParam;
 import com.yami.shop.bean.enums.OrderStatus;
 import com.yami.shop.bean.model.Order;
 import com.yami.shop.bean.model.OrderItem;
-import com.yami.shop.common.exception.YamiShopBindException;
-import com.yami.shop.common.util.PageParam;
-import com.yami.shop.bean.app.dto.ProdCommDataDto;
-import com.yami.shop.bean.app.dto.ProdCommDto;
-import com.yami.shop.bean.app.param.ProdCommParam;
 import com.yami.shop.bean.model.ProdComm;
+import com.yami.shop.common.exception.GlobalException;
+import com.yami.shop.common.util.PageParam;
 import com.yami.shop.security.api.util.SecurityUtils;
 import com.yami.shop.service.OrderItemService;
 import com.yami.shop.service.OrderService;
 import com.yami.shop.service.ProdCommService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.Date;
 import java.util.Objects;
 
 @RestController

+ 15 - 11
yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java

@@ -10,26 +10,30 @@
 
 package com.yami.shop.api.controller;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yami.shop.bean.app.dto.*;
+import com.yami.shop.bean.app.dto.ProdCommDataDto;
+import com.yami.shop.bean.app.dto.ProdCommDto;
+import com.yami.shop.bean.app.dto.ProductDto;
 import com.yami.shop.bean.dto.ProdByCategoryIdAndShopIdDTO;
-import com.yami.shop.bean.model.*;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.bean.model.Product;
+import com.yami.shop.bean.model.Sku;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.PageParam;
-import com.yami.shop.service.*;
+import com.yami.shop.service.ProdCommService;
+import com.yami.shop.service.ProductService;
+import com.yami.shop.service.SkuService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import ma.glasnost.orika.MapperFacade;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import ma.glasnost.orika.MapperFacade;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/prod")

+ 0 - 1
yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java

@@ -10,7 +10,6 @@
 
 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;

+ 0 - 10
yami-shop-api/src/main/java/com/yami/shop/api/controller/QnhController.java

@@ -1,23 +1,13 @@
 package com.yami.shop.api.controller;
 
-import cn.hutool.Hutool;
-import cn.hutool.core.date.DateUtil;
 import com.yami.shop.bean.app.param.QnhPushParam;
-import com.yami.shop.bean.model.Order;
-import com.yami.shop.bean.model.OrderItem;
-import com.yami.shop.bean.param.OrderDto;
 import com.yami.shop.common.util.R;
 import com.yami.shop.service.IQnhService;
-import com.yami.shop.service.OrderItemService;
-import com.yami.shop.service.OrderService;
-import com.yami.shop.service.impl.FeiEYunApi;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 千牛汇信息管理实现

+ 1 - 1
yami-shop-api/src/main/java/com/yami/shop/api/controller/QrcodeTicketController.java

@@ -11,7 +11,7 @@ package com.yami.shop.api.controller;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yami.shop.bean.model.QrcodeTicket;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.IdUtil;
 import com.yami.shop.config.WxConfig;
 import com.yami.shop.service.QrcodeTicketService;

+ 1 - 1
yami-shop-api/src/main/java/com/yami/shop/api/controller/SearchController.java

@@ -14,9 +14,9 @@ package com.yami.shop.api.controller;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.app.param.SearchParam;
-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.annotations.Api;

+ 10 - 6
yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java

@@ -11,20 +11,24 @@
 package com.yami.shop.api.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.map.MapUtil;
 import com.google.common.collect.Lists;
 import com.yami.shop.bean.app.dto.*;
 import com.yami.shop.bean.app.param.ChangeShopCartParam;
 import com.yami.shop.bean.app.param.ShopCartParam;
 import com.yami.shop.bean.event.ShopCartEvent;
-import com.yami.shop.bean.model.*;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.bean.model.Basket;
+import com.yami.shop.bean.model.Product;
+import com.yami.shop.bean.model.Sku;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.Arith;
 import com.yami.shop.security.api.util.SecurityUtils;
-import com.yami.shop.service.*;
-import io.swagger.annotations.*;
+import com.yami.shop.service.BasketService;
+import com.yami.shop.service.ProductService;
+import com.yami.shop.service.SkuService;
+import com.yami.shop.service.UserCollectionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import org.apache.ibatis.annotations.Delete;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

+ 4 - 1
yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopDetailController.java

@@ -22,7 +22,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Objects;

+ 0 - 2
yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java

@@ -10,7 +10,6 @@
 
 package com.yami.shop.api.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yami.shop.bean.app.dto.SkuDto;
 import com.yami.shop.bean.model.Sku;
 import com.yami.shop.service.SkuService;
@@ -22,7 +21,6 @@ import ma.glasnost.orika.MapperFacade;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;

+ 6 - 14
yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java

@@ -10,26 +10,18 @@
 
 package com.yami.shop.api.controller;
 
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.util.StrUtil;
-import com.yami.shop.common.util.IPHelper;
-import com.yami.shop.security.api.util.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.google.common.collect.Maps;
 import com.yami.shop.bean.app.param.SendSmsParam;
 import com.yami.shop.bean.enums.SmsType;
 import com.yami.shop.service.SmsLogService;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.Date;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/sms")

+ 1 - 1
yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionController.java

@@ -18,7 +18,7 @@ import com.yami.shop.bean.app.dto.ProductDto;
 import com.yami.shop.bean.app.dto.UserCollectionDto;
 import com.yami.shop.bean.model.Product;
 import com.yami.shop.bean.model.UserCollection;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.security.api.util.SecurityUtils;
 import com.yami.shop.service.BasketService;

+ 1 - 2
yami-shop-api/src/main/java/com/yami/shop/api/controller/UserCollectionShopController.java

@@ -14,9 +14,8 @@ package com.yami.shop.api.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.app.dto.UserCollectionShopDto;
-import com.yami.shop.bean.model.UserCollection;
 import com.yami.shop.bean.model.UserCollectionShop;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.security.api.util.SecurityUtils;
 import com.yami.shop.service.ShopDetailService;

+ 0 - 5
yami-shop-api/src/main/java/com/yami/shop/api/controller/UserRegisterController.java

@@ -12,7 +12,6 @@ package com.yami.shop.api.controller;
 
 
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
-import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -23,7 +22,6 @@ import com.yami.shop.bean.app.param.UserRegisterParam;
 import com.yami.shop.bean.enums.SmsType;
 import com.yami.shop.bean.model.User;
 import com.yami.shop.common.exception.GlobalException;
-import com.yami.shop.common.exception.YamiShopBindException;
 import com.yami.shop.common.util.IPHelper;
 import com.yami.shop.common.util.PrincipalUtil;
 import com.yami.shop.common.util.RedisUtil;
@@ -31,8 +29,6 @@ import com.yami.shop.config.WxConfig;
 import com.yami.shop.security.api.model.YamiUser;
 import com.yami.shop.security.api.service.YamiUserDetailsService;
 import com.yami.shop.security.api.util.SecurityUtils;
-import com.yami.shop.security.comment.enums.App;
-import com.yami.shop.security.comment.exception.BadCredentialsException;
 import com.yami.shop.security.comment.handler.LoginAuthSuccessHandler;
 import com.yami.shop.security.comment.model.AppConnect;
 import com.yami.shop.security.comment.service.AppConnectService;
@@ -43,7 +39,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.PutMapping;