高雪慈 修改

doc/团购活动修改.java

@@ -30,3 +30,5 @@
 
 "详情": "String"
 }
+
+list:

muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java

@@ -1,9 +1,8 @@
 package com.muyu.auth.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.auth.form.LoginBody;
 import com.muyu.auth.form.RegisterBody;
 import com.muyu.auth.service.SysLoginService;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.JwtUtils;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.security.auth.AuthUtil;

muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java

@@ -1,9 +1,9 @@
 package com.muyu.common.core.web.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.DateUtils;
 import com.muyu.common.core.utils.PageUtils;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java

@@ -1,5 +1,5 @@
 package com.muyu.common.security.handler;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.HttpStatus;
 import com.muyu.common.core.exception.DemoModeException;
 import com.muyu.common.core.exception.InnerAuthException;
@@ -7,7 +7,6 @@ import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.exception.auth.NotPermissionException;
 import com.muyu.common.core.exception.auth.NotRoleException;
 import com.muyu.common.core.utils.StringUtils;
-import com.muyu.common.core.domain.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindException;

muyu-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java

@@ -1,7 +1,6 @@
 package com.muyu.gateway.handler;
-
-import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.gateway.service.ValidateCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

muyu-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java

@@ -1,7 +1,6 @@
 package com.muyu.gateway.service;
-
-import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.exception.CaptchaException;
 
 import java.io.IOException;
 

muyu-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -1,5 +1,5 @@
 package com.muyu.gateway.service.impl;
-
+import com.muyu.common.core.domain.Result;
 import com.google.code.kaptcha.Producer;
 import com.muyu.common.core.constant.CacheConstants;
 import com.muyu.common.core.constant.Constants;
@@ -7,7 +7,6 @@ import com.muyu.common.core.exception.CaptchaException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.sign.Base64;
 import com.muyu.common.core.utils.uuid.IdUtils;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.redis.service.RedisService;
 import com.muyu.gateway.config.properties.CaptchaProperties;
 import com.muyu.gateway.model.resp.CaptchaCodeResp;

muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java

@@ -1,5 +1,4 @@
 package com.muyu.file.controller;
-
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.file.FileUtils;
 import com.muyu.file.service.ISysFileService;

muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java

@@ -1,8 +1,7 @@
 package com.muyu.gen.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.text.Convert;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm

@@ -13,7 +13,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java

@@ -1,11 +1,10 @@
 package com.muyu.job.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.Constants;
 import com.muyu.common.core.exception.job.TaskException;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java

@@ -1,8 +1,7 @@
 package com.muyu.job.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java

@@ -7,6 +7,7 @@ import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoSaveModel;
 import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
+import com.muyu.marketing.domain.model.ActivityTeamProductInfoUpdModel;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -129,4 +130,20 @@ public class ActivityTeamInfo extends BaseEntity {
             .strategyId(activityTeamInfoUpdModel.getStrategyId())
             .build();
   }
+
+  public static ActivityTeamInfo updateBuild (ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel){
+    return ActivityTeamInfo.builder()
+            .id(activityTeamProductInfoUpdModel.getTeamId())
+            .productId(activityTeamProductInfoUpdModel.getProductId())
+            .name(activityTeamProductInfoUpdModel.getName())
+            .productImage(activityTeamProductInfoUpdModel.getProductImage())
+            .introduction(activityTeamProductInfoUpdModel.getIntroduction())
+            .unit(activityTeamProductInfoUpdModel.getUnit())
+            .imageList(activityTeamProductInfoUpdModel.getImageList())
+            .endTime(activityTeamProductInfoUpdModel.getEndTime())
+            .strategyType(activityTeamProductInfoUpdModel.getStrategyType())
+            .content(activityTeamProductInfoUpdModel.getContent())
+            .build();
+  }
+
 }

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java

@@ -5,13 +5,10 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
-import java.util.List;
 
 /**
- * @program: 2204a-cloud-server
  * @description: 添加活动模型
  * @author: AoCi Tian
  * @create: 2024-11-26 10:59
@@ -82,7 +79,7 @@ public class ActivityTeamInfoSaveModel {
                 .unit(activityTeamInfoAddModel.getUnit())
                 .imageList(activityTeamInfoAddModel.getImageList())
                 .endTime(activityTeamInfoAddModel.getEndTime())
-                .sort(activityTeamInfoAddModel.getSort())
+                .sort(Long.valueOf(activityTeamInfoAddModel.getSort()))
                 .content(activityTeamInfoAddModel.getContent())
                 .status(activityTeamInfoAddModel.getStatus())
                 .strategyType(activityTeamInfoAddModel.getStrategyType())

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductInfoUpdModel.java

@@ -0,0 +1,66 @@
+package com.muyu.marketing.domain.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ActivityTeamProductInfoUpdModel {
+    /**
+     * 活动ID
+     */
+    private Long teamId;
+    /**
+     * 商品ID
+     */
+    private Long productId;
+    /**
+     * 活动名称
+     */
+    private String name;
+    /**
+     * 商品名称
+     */
+    private String productName;
+    /**
+     * 商品活动图
+     */
+    private String productImage;
+    /**
+     * 活动简介
+     */
+    private String introduction;
+    /**
+     * 商品单位
+     */
+    private String unit;
+    /**
+     * 商品轮播图
+     */
+    private String imageList;
+    /**
+     * 活动结束时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
+    private Date endTime;
+    /**
+     * 策略类型
+     */
+    private String strategyType;
+    /**
+     * 商品SkU集合
+     */
+    public List<ActivityTeamUpdSKuModel> updSkuList;
+    /**
+     * 活动详情
+     */
+    private String content;
+}

muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdSKuModel.java

@@ -0,0 +1,29 @@
+package com.muyu.marketing.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ActivityTeamUpdSKuModel {
+    /**
+     * 商品规格修改集合
+     */
+    public List<ActivityTeamProductSkuReqModel> skuList;
+
+    /**
+     * 删除商品规格idList
+     */
+    public List<Long> delSkuIdList;
+
+    /**
+     * 添加商品规格List
+     */
+    public List<ActivityTeamProductSkuAddModel> addSkuList;
+}

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java

@@ -35,5 +35,5 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
      */
     boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);
 
-
+    public boolean update (ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel);
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java

@@ -46,6 +46,11 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
      */
     public List<ActivityTeamProductSkuModel> findListByTeamId(Long teamId);
 
+
+
     public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList);
 
+    public boolean delByIds(List<Long> id);
+
+    public boolean add (List<ActivityTeamProductSkuAddModel> activityTeamProductSkuReqModelList);
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java

@@ -105,4 +105,31 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
         activityTeamProductSkuInfoService.updateBath(activityTeamInfoUpdModel.getActivityTeamProductSkuModelList());
         return update;
     }
+
+    @Override
+    public boolean update(ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel) {
+        //转换为商品信息
+        ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.updateBuild(activityTeamProductInfoUpdModel);
+        //修改商品信息
+        this.updateById(activityTeamInfo);
+        //修改商品sku信息
+        activityTeamProductInfoUpdModel.getUpdSkuList()
+                .stream()
+                .forEach(activityTeamUpdSKuModel -> {
+                    List<ActivityTeamProductSkuAddModel> addSkuList = activityTeamUpdSKuModel.getAddSkuList();
+                    List<ActivityTeamProductSkuReqModel> skuList = activityTeamUpdSKuModel.getSkuList();
+                    List<Long> delSkuIdList = activityTeamUpdSKuModel.getDelSkuIdList();
+                    if (addSkuList != null){
+                        activityTeamProductSkuInfoService.add(addSkuList);
+                    }
+                    if (skuList != null){
+                        activityTeamProductSkuInfoService.updateBath(skuList);
+                    }
+                    if (delSkuIdList != null){
+                        activityTeamProductSkuInfoService.removeBatchByIds(delSkuIdList);
+                    }
+                });
+        return true;
+    }
+
 }

muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java

@@ -13,10 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 
@@ -29,7 +25,6 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
 
     /**
      * 通过团购活动ID获取团购中最优惠的价格
-     *
      * @param teamId 团购ID
      * @return 优惠价格
      */
@@ -92,12 +87,27 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
         queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId);
         List<ActivityTeamProductSkuInfo> list = this.list(queryWrapper);
         return list.stream().map(ActivityTeamProductSkuModel::FindBuild).toList();
-//        return list.stream().map(activityTeamProductSkuInfo -> ActivityTeamProductSkuModel.FindBuild(activityTeamProductSkuInfo)).toList();
     }
 
     @Transactional
     @Override
     public boolean updateBath(List<ActivityTeamProductSkuReqModel> activityTeamProductSkuReqModelList) {
-        return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList());
+        return this.updateBatchById(activityTeamProductSkuReqModelList
+                .stream()
+                .map(ActivityTeamProductSkuInfo::updateModelBuild)
+                .toList());
+    }
+
+    @Override
+    public boolean delByIds(List<Long> id) {
+        return this.removeBatchByIds(id);
+    }
+
+    @Override
+    public boolean add(List<ActivityTeamProductSkuAddModel> activityTeamProductSkuReqModelList) {
+        return this.saveBatch(activityTeamProductSkuReqModelList
+                .stream()
+                .map(ActivityTeamProductSkuInfo::modelBuild)
+                .toList());
     }
 }

muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectInfoDataRemoteImpl.java

@@ -1,6 +1,5 @@
 package com.muyu.product.cache.datasource.impl;
 
-import com.muyu.common.core.domain.Result;
 import com.muyu.product.cache.datasource.ProjectInfoData;
 import com.muyu.product.domain.ProjectInfo;
 import com.muyu.product.remote.RemoteProjectInfoService;

muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuDataRemoteImpl.java

@@ -1,7 +1,5 @@
 package com.muyu.product.cache.datasource.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.muyu.common.core.domain.Result;
 import com.muyu.product.cache.datasource.ProjectSkuData;
 import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.remote.RemoteProjectSkuService;
@@ -11,7 +9,6 @@ import org.springframework.stereotype.Service;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**

muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuStockDataRemoteImpl.java

@@ -1,6 +1,5 @@
 package com.muyu.product.cache.datasource.impl;
 
-import com.muyu.common.core.domain.Result;
 import com.muyu.product.cache.datasource.ProjectSkuStockData;
 import com.muyu.product.cache.key.SkuStockKey;
 import com.muyu.product.domain.ProjectSkuInfo;

muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/RuleCacheDataRemoteImpl.java

@@ -1,6 +1,5 @@
 package com.muyu.product.cache.datasource.impl;
 
-import com.muyu.common.core.domain.Result;
 import com.muyu.product.cache.datasource.RuleCacheData;
 import com.muyu.product.cache.model.RuleAttrCacheModel;
 import com.muyu.product.cache.model.RuleCacheModel;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java

@@ -1,7 +1,6 @@
 package com.muyu.product.remote;
-
-import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.product.domain.ProjectInfo;
 import com.muyu.product.remote.factory.RemoteProjectInfoFactory;
 import org.springframework.cloud.openfeign.FeignClient;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java

@@ -1,7 +1,6 @@
 package com.muyu.product.remote;
-
-import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.remote.factory.RemoteProjectSkuFactory;
 import org.springframework.cloud.openfeign.FeignClient;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java

@@ -1,13 +1,8 @@
 package com.muyu.product.remote;
-
-import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.common.core.domain.Result;
-import com.muyu.product.domain.ProjectSkuInfo;
+import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.product.domain.RuleAttrInfo;
-import com.muyu.product.remote.factory.RemoteProjectSkuFactory;
 import com.muyu.product.remote.factory.RemoteRuleAttrFactory;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java

@@ -1,13 +1,8 @@
 package com.muyu.product.remote;
-
-import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.common.core.domain.Result;
-import com.muyu.product.domain.ProjectSkuInfo;
+import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.product.domain.RuleInfo;
-import com.muyu.product.remote.factory.RemoteProjectSkuFactory;
 import com.muyu.product.remote.factory.RemoteRuleFactory;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java

@@ -1,10 +1,7 @@
 package com.muyu.product.remote.factory;
 
-import com.muyu.common.core.domain.Result;
 import com.muyu.product.domain.ProjectInfo;
-import com.muyu.product.domain.RuleInfo;
 import com.muyu.product.remote.RemoteProjectInfoService;
-import com.muyu.product.remote.RemoteRuleService;
 import org.springframework.cloud.openfeign.FallbackFactory;
 
 /**

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectSkuFactory.java

@@ -1,6 +1,5 @@
 package com.muyu.product.remote.factory;
 
-import com.muyu.common.core.domain.Result;
 import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.remote.RemoteProjectSkuService;
 import org.springframework.cloud.openfeign.FallbackFactory;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java

@@ -1,11 +1,7 @@
 package com.muyu.product.remote.factory;
-
 import com.muyu.common.core.domain.Result;
-import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.domain.RuleAttrInfo;
-import com.muyu.product.remote.RemoteProjectSkuService;
 import com.muyu.product.remote.RemoteRuleAttrService;
-import com.muyu.product.remote.RemoteRuleService;
 import org.springframework.cloud.openfeign.FallbackFactory;
 
 import java.util.List;

muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java

@@ -1,9 +1,6 @@
 package com.muyu.product.remote.factory;
 
-import com.muyu.common.core.domain.Result;
-import com.muyu.product.domain.ProjectSkuInfo;
 import com.muyu.product.domain.RuleInfo;
-import com.muyu.product.remote.RemoteProjectSkuService;
 import com.muyu.product.remote.RemoteRuleService;
 import org.springframework.cloud.openfeign.FallbackFactory;
 

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java

@@ -3,6 +3,7 @@ package com.muyu.product.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.muyu.common.core.domain.Result;
 import com.muyu.product.domain.model.AttributeGroupSaveModel;
 import com.muyu.product.domain.resp.AttributeGroupPageResp;
 import com.muyu.product.domain.resp.AttributeGroupUpdResp;
@@ -16,7 +17,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,7 +13,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -14,7 +14,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
@@ -25,7 +24,6 @@ import com.muyu.product.domain.req.BrandInfoQueryReq;
 import com.muyu.product.domain.req.BrandInfoSaveReq;
 import com.muyu.product.domain.req.BrandInfoEditReq;
 import com.muyu.product.service.BrandInfoService;
-import com.muyu.common.core.web.page.TableDataInfo;
 
 /**
  * 品牌信息Controller

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java

@@ -1,13 +1,9 @@
 package com.muyu.product.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
-import java.util.function.Supplier;
 import javax.servlet.http.HttpServletResponse;
 
 import com.muyu.common.security.utils.SecurityUtils;
-import com.muyu.product.domain.AttributeGroup;
-import com.muyu.product.domain.AttributeInfo;
-import com.muyu.product.domain.BrandInfo;
 import com.muyu.product.domain.model.CategoryInfoSaveModel;
 import com.muyu.product.domain.resp.CategoryCommonElementResp;
 import com.muyu.product.domain.resp.CategoryParentCommonElementResp;
@@ -21,14 +17,12 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;
 import com.muyu.product.domain.CategoryInfo;
-import com.muyu.product.domain.req.CategoryInfoQueryReq;
 import com.muyu.product.domain.req.CategoryInfoSaveReq;
 import com.muyu.product.domain.req.CategoryInfoEditReq;
 import com.muyu.product.service.CategoryInfoService;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,7 +13,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,7 +13,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -15,7 +15,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,7 +13,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -13,7 +13,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java

@@ -1,5 +1,5 @@
 package com.muyu.product.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -17,7 +17,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/CartCache.java

@@ -1,7 +1,6 @@
 package com.muyu.shop.cart.cache;
 
 import com.muyu.common.cache.abs.HashCacheAbs;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.exception.ServiceException;
 import com.muyu.common.core.text.Convert;
 import com.muyu.shop.cart.cache.key.CartHashKey;

muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java

@@ -8,7 +8,6 @@ import com.muyu.shop.cart.domain.resp.CartDetailResp;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java

@@ -1,6 +1,5 @@
 package com.muyu.system.controller;
 
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
@@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
-
+import com.muyu.common.core.domain.Result;
 /**
  * 参数配置 信息操作处理
  *

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java

@@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java

@@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java

@@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDistrictController.java

@@ -1,5 +1,5 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -17,7 +17,6 @@ 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 com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.log.annotation.Log;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java

@@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.CacheConstants;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java

@@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.UserConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;
 import com.muyu.common.security.annotation.RequiresPermissions;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java

@@ -1,7 +1,6 @@
 package com.muyu.system.controller;
-
-import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.domain.Result;
+import com.muyu.common.core.web.controller.BaseController;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java

@@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java

@@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java

@@ -1,5 +1,4 @@
 package com.muyu.system.controller;
-
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.file.FileTypeUtils;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java

@@ -1,8 +1,7 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.poi.ExcelUtil;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java

@@ -1,5 +1,4 @@
 package com.muyu.system.controller;
-
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.poi.ExcelUtil;

muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java

@@ -1,9 +1,8 @@
 package com.muyu.system.controller;
-
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.constant.CacheConstants;
 import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.web.controller.BaseController;
-import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.web.page.TableDataInfo;
 import com.muyu.common.log.annotation.Log;
 import com.muyu.common.log.enums.BusinessType;