From c6ece2c701f7852d89a02a22edc55bfd77c0ed48 Mon Sep 17 00:00:00 2001 From: gao <230250245@qq.com> Date: Wed, 27 Nov 2024 22:50:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E9=9B=AA=E6=85=88=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/团购活动修改.java | 2 + .../muyu/auth/controller/TokenController.java | 3 +- .../core/web/controller/BaseController.java | 2 +- .../handler/GlobalExceptionHandler.java | 3 +- .../gateway/handler/ValidateCodeHandler.java | 3 +- .../gateway/service/ValidateCodeService.java | 3 +- .../service/impl/ValidateCodeServiceImpl.java | 3 +- .../file/controller/SysFileController.java | 1 - .../muyu/gen/controller/GenController.java | 3 +- .../main/resources/vm/java/controller.java.vm | 1 - .../muyu/job/controller/SysJobController.java | 3 +- .../job/controller/SysJobLogController.java | 3 +- .../marketing/domain/ActivityTeamInfo.java | 17 +++++ .../model/ActivityTeamInfoSaveModel.java | 5 +- .../ActivityTeamProductInfoUpdModel.java | 66 +++++++++++++++++++ .../domain/model/ActivityTeamUpdSKuModel.java | 29 ++++++++ .../team/service/ActivityTeamInfoService.java | 2 +- .../ActivityTeamProductSkuInfoService.java | 5 ++ .../impl/ActivityTeamInfoServiceImpl.java | 27 ++++++++ ...ActivityTeamProductSkuInfoServiceImpl.java | 24 +++++-- .../impl/ProjectInfoDataRemoteImpl.java | 1 - .../impl/ProjectSkuDataRemoteImpl.java | 3 - .../impl/ProjectSkuStockDataRemoteImpl.java | 1 - .../impl/RuleCacheDataRemoteImpl.java | 1 - .../remote/RemoteProjectInfoService.java | 3 +- .../remote/RemoteProjectSkuService.java | 3 +- .../product/remote/RemoteRuleAttrService.java | 7 +- .../product/remote/RemoteRuleService.java | 7 +- .../factory/RemoteProjectInfoFactory.java | 3 - .../factory/RemoteProjectSkuFactory.java | 1 - .../remote/factory/RemoteRuleAttrFactory.java | 4 -- .../remote/factory/RemoteRuleFactory.java | 3 - .../controller/AttributeGroupController.java | 2 +- .../controller/AttributeInfoController.java | 3 +- .../controller/BrandInfoController.java | 4 +- .../controller/CategoryInfoController.java | 8 +-- .../controller/CommentInfoController.java | 3 +- .../controller/CommentLikeInfoController.java | 3 +- .../controller/ProjectInfoController.java | 3 +- .../controller/ProjectSkuInfoController.java | 3 +- .../controller/RuleAttrInfoController.java | 3 +- .../controller/RuleInfoController.java | 3 +- .../com/muyu/shop/cart/cache/CartCache.java | 1 - .../cart/controller/CartInfoController.java | 1 - .../controller/SysConfigController.java | 5 +- .../system/controller/SysDeptController.java | 3 +- .../controller/SysDictDataController.java | 3 +- .../controller/SysDictTypeController.java | 3 +- .../controller/SysDistrictController.java | 3 +- .../controller/SysLogininforController.java | 3 +- .../system/controller/SysMenuController.java | 3 +- .../controller/SysNoticeController.java | 3 +- .../controller/SysOperlogController.java | 3 +- .../system/controller/SysPostController.java | 3 +- .../controller/SysProfileController.java | 1 - .../system/controller/SysRoleController.java | 3 +- .../system/controller/SysUserController.java | 1 - .../controller/SysUserOnlineController.java | 3 +- 58 files changed, 201 insertions(+), 118 deletions(-) create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductInfoUpdModel.java create mode 100644 muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdSKuModel.java diff --git a/doc/团购活动修改.java b/doc/团购活动修改.java index 64b1b79..a4c4284 100644 --- a/doc/团购活动修改.java +++ b/doc/团购活动修改.java @@ -30,3 +30,5 @@ "详情": "String" } + +list: diff --git a/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java b/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java index 960a13f..a1659e1 100644 --- a/muyu-auth/src/main/java/com/muyu/auth/controller/TokenController.java +++ b/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; diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java index 3789a82..096e4fd 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java +++ b/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; diff --git a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java b/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java index 8d4201d..cc6252d 100644 --- a/muyu-common/muyu-common-security/src/main/java/com/muyu/common/security/handler/GlobalExceptionHandler.java +++ b/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; diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java b/muyu-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java index f3b3206..6bb1ed1 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java +++ b/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; diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java b/muyu-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java index 25ed94e..d9edfa3 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/service/ValidateCodeService.java +++ b/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; diff --git a/muyu-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java b/muyu-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java index 879d887..576ee14 100644 --- a/muyu-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/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; diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java b/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java index 5f5ce31..5942f24 100644 --- a/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java +++ b/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; diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java b/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java index 7fe822a..fc8834c 100644 --- a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/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; diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm b/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm index 7acde82..aa68b0c 100644 --- a/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm +++ b/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; diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java b/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java index 692dee7..c084c90 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java +++ b/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; diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java b/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java index a15bdfd..aecf294 100644 --- a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java +++ b/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; diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java index 323ad45..2baa821 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java +++ b/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(); + } + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java index beb468f..5ee2627 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoSaveModel.java +++ b/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()) diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductInfoUpdModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductInfoUpdModel.java new file mode 100644 index 0000000..4d27944 --- /dev/null +++ b/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 updSkuList; + /** + * 活动详情 + */ + private String content; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdSKuModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdSKuModel.java new file mode 100644 index 0000000..da174aa --- /dev/null +++ b/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 skuList; + + /** + * 删除商品规格idList + */ + public List delSkuIdList; + + /** + * 添加商品规格List + */ + public List addSkuList; +} diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java index f1409d4..8b5dff1 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java +++ b/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 { */ boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel); - + public boolean update (ActivityTeamProductInfoUpdModel activityTeamProductInfoUpdModel); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java index 3bf453a..d64d530 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamProductSkuInfoService.java +++ b/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 findListByTeamId(Long teamId); + + public boolean updateBath(List activityTeamProductSkuReqModelList); + public boolean delByIds(List id); + + public boolean add (List activityTeamProductSkuReqModelList); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java index a75f0e0..8eee4a5 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java +++ b/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 { + List addSkuList = activityTeamUpdSKuModel.getAddSkuList(); + List skuList = activityTeamUpdSKuModel.getSkuList(); + List delSkuIdList = activityTeamUpdSKuModel.getDelSkuIdList(); + if (addSkuList != null){ + activityTeamProductSkuInfoService.add(addSkuList); + } + if (skuList != null){ + activityTeamProductSkuInfoService.updateBath(skuList); + } + if (delSkuIdList != null){ + activityTeamProductSkuInfoService.removeBatchByIds(delSkuIdList); + } + }); + return true; + } + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java index f1c3369..f33e101 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamProductSkuInfoServiceImpl.java +++ b/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 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 activityTeamProductSkuReqModelList) { - return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList()); + return this.updateBatchById(activityTeamProductSkuReqModelList + .stream() + .map(ActivityTeamProductSkuInfo::updateModelBuild) + .toList()); + } + + @Override + public boolean delByIds(List id) { + return this.removeBatchByIds(id); + } + + @Override + public boolean add(List activityTeamProductSkuReqModelList) { + return this.saveBatch(activityTeamProductSkuReqModelList + .stream() + .map(ActivityTeamProductSkuInfo::modelBuild) + .toList()); } } diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectInfoDataRemoteImpl.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectInfoDataRemoteImpl.java index 8fb9521..7a3d119 100644 --- a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectInfoDataRemoteImpl.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuDataRemoteImpl.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuDataRemoteImpl.java index 5ca234c..3d064c9 100644 --- a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuDataRemoteImpl.java +++ b/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; /** diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuStockDataRemoteImpl.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuStockDataRemoteImpl.java index 2869967..558e872 100644 --- a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/ProjectSkuStockDataRemoteImpl.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/RuleCacheDataRemoteImpl.java b/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/RuleCacheDataRemoteImpl.java index 09b63f8..5d55712 100644 --- a/muyu-modules/muyu-product/muyu-product-cache/src/main/java/com/muyu/product/cache/datasource/impl/RuleCacheDataRemoteImpl.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java index fd88ca8..1c80460 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectInfoService.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java index 177ced8..7074bbf 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteProjectSkuService.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java index 6268dd2..56ede04 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleAttrService.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java index 14a5ad3..0880247 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/RemoteRuleService.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java index e07d42f..c62222b 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectInfoFactory.java +++ b/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; /** diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectSkuFactory.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectSkuFactory.java index 78fab1b..b73c9ab 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteProjectSkuFactory.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java index 2a11137..247e197 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleAttrFactory.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java index 9a99497..9a34a3f 100644 --- a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/product/remote/factory/RemoteRuleFactory.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java index 71e0b2b..2182ee6 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeGroupController.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java index 4b09002..4e54002 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/AttributeInfoController.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java index 29d4305..3c216e7 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/BrandInfoController.java +++ b/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 diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java index 55dbaef..52b089e 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryInfoController.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java index 9500949..55d6333 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentInfoController.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java index 9e7b5b6..98da388 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CommentLikeInfoController.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java index f1e3d62..70bbc19 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectInfoController.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java index 6ad77df..7fc994b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProjectSkuInfoController.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java index 422428b..3079414 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleAttrInfoController.java +++ b/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; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java index 9fec49d..3e9d463 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/RuleInfoController.java +++ b/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; diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/CartCache.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/CartCache.java index 8255f54..a07052a 100644 --- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-cache/src/main/java/com/muyu/shop/cart/cache/CartCache.java +++ b/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; diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java index 7666472..351735b 100644 --- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/java/com/muyu/shop/cart/controller/CartInfoController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java index fdabe7a..429dcd9 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/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; /** * 参数配置 信息操作处理 * @@ -26,7 +25,7 @@ import java.util.List; @RestController @RequestMapping("/config") public class SysConfigController extends BaseController { - + @Autowired private SysConfigService configService; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java index f1ed572..d1a86e0 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java index 418ce2a..d46b000 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index 4d1325c..87ee1e6 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDistrictController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDistrictController.java index b2fde36..f3aec2d 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDistrictController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index 7a4e5ac..a91b905 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java index c22f798..f9a6497 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java index 9706350..f4d561e 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java index add3ba5..c86fef4 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java index f9da917..4164f48 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java index ae49255..4f5201f 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java index 63df7a9..db5f3a5 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java index 9811a0e..f465a3f 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/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; diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java index 26f7883..c8a2925 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/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;