wangming vor 1 Monat
Ursprung
Commit
760a878e64
14 geänderte Dateien mit 23 neuen und 31 gelöschten Zeilen
  1. 1 2
      yami-shop-delivery/yami-shop-delivery-api/src/main/java/com/yami/shop/delivery/api/controller/MyDeliveryController.java
  2. 1 7
      yami-shop-discount/yami-shop-discount-api/src/main/java/com/yami/shop/discount/api/controller/DiscountController.java
  3. 1 1
      yami-shop-distribution/yami-shop-distribution-api/src/main/java/com/yami/shop/distribution/api/controller/DistributionQrCodeController.java
  4. 2 7
      yami-shop-distribution/yami-shop-distribution-api/src/main/java/com/yami/shop/distribution/api/controller/DistributionRegisterController.java
  5. 5 2
      yami-shop-distribution/yami-shop-distribution-api/src/main/java/com/yami/shop/distribution/api/controller/DistributionUserController.java
  6. 1 1
      yami-shop-distribution/yami-shop-distribution-api/src/main/java/com/yami/shop/distribution/api/controller/DistributionUserIncomeController.java
  7. 1 1
      yami-shop-distribution/yami-shop-distribution-api/src/main/java/com/yami/shop/distribution/api/controller/DistributionUserWalletController.java
  8. 1 1
      yami-shop-distribution/yami-shop-distribution-api/src/main/java/com/yami/shop/distribution/api/controller/DistributionWithdrawCashController.java
  9. 1 1
      yami-shop-groupbuy/yami-shop-groupbuy-api/src/main/java/com/yami/shop/groupbuy/api/controller/GroupOrderController.java
  10. 1 1
      yami-shop-groupbuy/yami-shop-groupbuy-api/src/main/java/com/yami/shop/groupbuy/api/controller/GroupTeamController.java
  11. 1 1
      yami-shop-seckill/yami-shop-seckill-api/src/main/java/com/yami/shop/seckill/api/controller/SeckillOrderController.java
  12. 1 2
      yami-shop-seckill/yami-shop-seckill-api/src/main/java/com/yami/shop/seckill/api/service/impl/SeckillCacheManagerImpl.java
  13. 1 1
      yami-shop-user/yami-shop-user-api/src/main/java/com/yami/shop/user/api/controller/ScoreProdController.java
  14. 5 3
      yami-shop-user/yami-shop-user-api/src/main/java/com/yami/shop/user/api/listener/SubmitOrderListener.java

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

@@ -13,13 +13,12 @@ package com.yami.shop.delivery.api.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yami.shop.bean.app.dto.DeliveryDto;
 import com.yami.shop.bean.model.RefundDelivery;
-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;
 import com.yami.shop.delivery.comment.model.DeliveryOrder;
 import com.yami.shop.delivery.comment.service.DeliveryOrderService;
-import com.yami.shop.service.DeliveryService;
 import com.yami.shop.service.RefundDeliveryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 1 - 7
yami-shop-discount/yami-shop-discount-api/src/main/java/com/yami/shop/discount/api/controller/DiscountController.java

@@ -14,28 +14,22 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.app.dto.DiscountDto;
 import com.yami.shop.bean.app.dto.ProductDto;
-import com.yami.shop.bean.app.dto.ProductItemDto;
 import com.yami.shop.bean.enums.DiscountRule;
 import com.yami.shop.bean.model.Product;
-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.discount.api.dto.DiscountSumItemDto;
-import com.yami.shop.discount.api.service.DiscountManagerService;
 import com.yami.shop.discount.comment.model.Discount;
 import com.yami.shop.discount.comment.model.DiscountItem;
 import com.yami.shop.discount.comment.service.DiscountService;
 import com.yami.shop.service.ProductService;
 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.beans.factory.config.YamlMapFactoryBean;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 

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

@@ -5,7 +5,7 @@ import cn.hutool.json.JSONObject;
 import com.yami.shop.bean.app.dto.ResourcesInfoDto;
 import com.yami.shop.bean.model.QrcodeTicket;
 import com.yami.shop.common.bean.Domain;
-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.ShopConfig;
 import com.yami.shop.config.WxConfig;

+ 2 - 7
yami-shop-distribution/yami-shop-distribution-api/src/main/java/com/yami/shop/distribution/api/controller/DistributionRegisterController.java

@@ -14,26 +14,22 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.yami.shop.bean.distribution.UserShoppingDataDto;
 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.IdUtil;
 import com.yami.shop.common.util.Json;
 import com.yami.shop.dao.OrderMapper;
+import com.yami.shop.distribution.api.param.DistributionUserParam;
 import com.yami.shop.distribution.comment.model.DistributionAuditingSet;
 import com.yami.shop.distribution.comment.model.DistributionRecruitSet;
 import com.yami.shop.distribution.comment.model.DistributionUser;
-import com.yami.shop.distribution.api.param.DistributionUserParam;
 import com.yami.shop.distribution.comment.service.DistributionAuditingSetService;
 import com.yami.shop.distribution.comment.service.DistributionRecruitSetService;
 import com.yami.shop.distribution.comment.service.DistributionUserService;
 import com.yami.shop.distribution.comment.vo.DistributionAuditingInfoVO;
 import com.yami.shop.security.api.model.YamiUser;
 import com.yami.shop.security.api.util.SecurityUtils;
-import com.yami.shop.security.comment.enums.App;
-import com.yami.shop.security.comment.model.AppConnect;
 import com.yami.shop.security.comment.service.AppConnectService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -43,7 +39,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 
 /**

+ 5 - 2
yami-shop-distribution/yami-shop-distribution-api/src/main/java/com/yami/shop/distribution/api/controller/DistributionUserController.java

@@ -12,7 +12,7 @@ package com.yami.shop.distribution.api.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.PageParam;
 import com.yami.shop.distribution.comment.dto.AchievementDataDto;
 import com.yami.shop.distribution.comment.dto.DistributionOrderDto;
@@ -22,7 +22,10 @@ import com.yami.shop.distribution.comment.model.DistributionLevel;
 import com.yami.shop.distribution.comment.model.DistributionLevelSet;
 import com.yami.shop.distribution.comment.model.DistributionMsg;
 import com.yami.shop.distribution.comment.model.DistributionUser;
-import com.yami.shop.distribution.comment.service.*;
+import com.yami.shop.distribution.comment.service.DistributionLevelService;
+import com.yami.shop.distribution.comment.service.DistributionLevelSetService;
+import com.yami.shop.distribution.comment.service.DistributionUserIncomeService;
+import com.yami.shop.distribution.comment.service.DistributionUserService;
 import com.yami.shop.security.api.util.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -2,7 +2,7 @@ package com.yami.shop.distribution.api.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.PageParam;
 import com.yami.shop.distribution.comment.dto.DistributionUserIncomeDto;
 import com.yami.shop.distribution.comment.dto.DistributionUserIncomeOrderDto;

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

@@ -12,7 +12,7 @@ package com.yami.shop.distribution.api.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.PageParam;
 import com.yami.shop.distribution.comment.dto.DistributionUserWalletBillDto;
 import com.yami.shop.distribution.comment.dto.DistributionUserWalletDto;

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

@@ -13,7 +13,7 @@ package com.yami.shop.distribution.api.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.PageParam;
 import com.yami.shop.distribution.api.param.DistributionWithdrawCashSaceParam;
 import com.yami.shop.distribution.comment.dto.DistributionWithdrawCashDto;

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

@@ -18,7 +18,7 @@ import com.yami.shop.bean.enums.ProdStatusEnums;
 import com.yami.shop.bean.event.CalculateTransfeeEvent;
 import com.yami.shop.bean.model.Sku;
 import com.yami.shop.bean.model.UserAddr;
-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.groupbuy.comment.api.dto.ApiGroupActivityDto;
 import com.yami.shop.groupbuy.comment.api.dto.ApiGroupSkuInfoDto;

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

@@ -13,7 +13,7 @@ package com.yami.shop.groupbuy.api.controller;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qiniu.util.StringUtils;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.groupbuy.comment.api.dto.ApiGroupProdDto;
 import com.yami.shop.groupbuy.comment.api.dto.ApiGroupSkuDto;
 import com.yami.shop.groupbuy.comment.api.dto.ApiGroupTeamDto;

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

@@ -16,7 +16,7 @@ import com.yami.shop.bean.event.CalculateTransfeeEvent;
 import com.yami.shop.bean.model.Product;
 import com.yami.shop.bean.model.Sku;
 import com.yami.shop.bean.model.UserAddr;
-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.seckill.api.mq.redis.RedissonMsgHandler;
 import com.yami.shop.seckill.api.param.ConfirmParam;

+ 1 - 2
yami-shop-seckill/yami-shop-seckill-api/src/main/java/com/yami/shop/seckill/api/service/impl/SeckillCacheManagerImpl.java

@@ -1,7 +1,7 @@
 package com.yami.shop.seckill.api.service.impl;
 
 import cn.hutool.core.lang.Snowflake;
-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.common.util.RedisUtil;
 import com.yami.shop.seckill.api.service.SeckillCacheManager;
@@ -9,7 +9,6 @@ import com.yami.shop.seckill.comment.service.SeckillSkuService;
 import lombok.AllArgsConstructor;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import java.util.Objects;

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

@@ -4,7 +4,7 @@ import com.yami.shop.bean.app.dto.ProductDto;
 import com.yami.shop.bean.enums.ProdType;
 import com.yami.shop.bean.model.Product;
 import com.yami.shop.bean.model.Sku;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.service.ProductService;
 import com.yami.shop.service.SkuService;
 import com.yami.shop.user.comment.service.UserLevelService;

+ 5 - 3
yami-shop-user/yami-shop-user-api/src/main/java/com/yami/shop/user/api/listener/SubmitOrderListener.java

@@ -14,9 +14,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yami.shop.bean.app.dto.ShopCartOrderMergerDto;
 import com.yami.shop.bean.enums.ScoreLogType;
 import com.yami.shop.bean.event.SubmitScoreOrderEvent;
-import com.yami.shop.bean.model.*;
+import com.yami.shop.bean.model.UserExtension;
 import com.yami.shop.bean.order.SubmitOrderOrder;
-import com.yami.shop.common.exception.YamiShopBindException;
+import com.yami.shop.common.exception.GlobalException;
 import com.yami.shop.security.api.util.SecurityUtils;
 import com.yami.shop.service.UserExtensionService;
 import com.yami.shop.user.comment.model.UserScoreDetail;
@@ -29,7 +29,9 @@ import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 确认订单信息时的用户积分操作