From 5fed8d7869f2cd5232881c8b49c297123f29b1d8 Mon Sep 17 00:00:00 2001 From: wangyaowen050211 <14768499+wangyaowen050211@user.noreply.gitee.com> Date: Wed, 27 Nov 2024 10:29:23 +0800 Subject: [PATCH] =?UTF-8?q?11.26=E5=8A=9F=E8=83=BD=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=92=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-auth/src/main/resources/bootstrap.yml | 6 +- muyu-gateway/src/main/resources/bootstrap.yml | 9 +- .../src/main/resources/bootstrap.yml | 6 +- .../muyu-gen/src/main/resources/bootstrap.yml | 6 +- .../muyu-job/src/main/resources/bootstrap.yml | 6 +- .../marketing/domain/ActivityTeamInfo.java | 22 ++++- .../domain/ActivityTeamProductSkuInfo.java | 4 +- .../model/ActivityTeamInfoAddModel.java | 2 + .../model/ActivityTeamProductSkuAddModel.java | 10 ++- .../model/TeamProductDiscountPriceModel.java | 2 +- .../marketing/domain/req/TeamInfoListReq.java | 3 +- .../domain/req/TeamProjectSkuInfoAddReq.java | 4 +- .../marketing/MuYuMarketIngApplication.java | 1 + .../controller/ActivityTeamController.java | 35 ++++++-- .../team/service/ActivityTeamInfoService.java | 10 ++- .../impl/ActivityTeamInfoServiceImpl.java | 90 +++++++++++++++++++ ...ActivityTeamProductSkuInfoServiceImpl.java | 1 - .../TeamStrategyExemptionServiceImpl.java | 4 +- .../src/main/resources/bootstrap.yml | 8 +- .../domain/resp/AttributeGroupUpdResp.java | 4 - .../src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 6 +- 24 files changed, 209 insertions(+), 48 deletions(-) diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index b309a3d..b001cc1 100644 --- a/muyu-auth/src/main/resources/bootstrap.yml +++ b/muyu-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index d7367b4..87714a0 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/muyu-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +35,8 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang dataId: sentinel-muyu-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml index 0cb85bd..ae645b3 100644 --- a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-file/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml index b628931..abd4ff9 100644 --- a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml index 618f3e8..3a46045 100644 --- a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-job/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang # 配置文件格式 file-extension: yml # 共享配置 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 e94e0db..a02a958 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 @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; +import com.muyu.marketing.domain.model.ActivityTeamInfoupdMoudel; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel; import lombok.*; import lombok.experimental.SuperBuilder; @@ -54,7 +56,7 @@ public class ActivityTeamInfo extends BaseEntity { /** * 活动排序 */ - private long sort; + private Integer sort; /** * 活动详情 */ @@ -93,4 +95,22 @@ public class ActivityTeamInfo extends BaseEntity { .strategyId(activityTeamInfoAddModel.getStrategyId()) .build(); } + public static ActivityTeamInfo updreq(ActivityTeamInfoupdMoudel activityTeamInfoupdMoudel){ + return ActivityTeamInfo.builder() + .id(activityTeamInfoupdMoudel.getId()) + .name(activityTeamInfoupdMoudel.getName()) + .productId(activityTeamInfoupdMoudel.getProductId()) + .productImage(activityTeamInfoupdMoudel.getProductImage()) + .introduction(activityTeamInfoupdMoudel.getIntroduction()) + .unit(activityTeamInfoupdMoudel.getUnit()) + .imageList(activityTeamInfoupdMoudel.getImageList()) + .endTime(activityTeamInfoupdMoudel.getEndTime()) + .sort(activityTeamInfoupdMoudel.getSort()) + .content(activityTeamInfoupdMoudel.getContent()) + .status(activityTeamInfoupdMoudel.getStatus()) + .strategyType(activityTeamInfoupdMoudel.getStrategyType()) + .strategyId(activityTeamInfoupdMoudel.getStrategyId()) + .build(); + } + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java index 43521d0..7ab5b17 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java @@ -26,7 +26,7 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { /** * 活动ID */ - private long teamId; + private Long teamId; /** * 商品ID */ @@ -60,6 +60,6 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { .teamStock(activityTeamProductSkuAddModel.getTeamStock()) .remainStock(activityTeamProductSkuAddModel.getTeamStock()) .teamPrice(activityTeamProductSkuAddModel.getTeamPrice()) - .build() + .build(); } } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java index 8dcbfe4..0031e27 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java @@ -101,4 +101,6 @@ public class ActivityTeamInfoAddModel { .toList() ).build(); } + + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java index 7d3ca35..eccd9ae 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java @@ -1,6 +1,8 @@ package com.muyu.marketing.domain.model; +import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; +import com.muyu.marketing.domain.TeamStrategyExemption; import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq; import lombok.AllArgsConstructor; import lombok.Builder; @@ -36,7 +38,7 @@ public class ActivityTeamProductSkuAddModel { /** * 规格SKU */ - private String sku; + private String productSku; /** * 拼团价格 @@ -48,12 +50,16 @@ public class ActivityTeamProductSkuAddModel { */ private Long teamStock; + private Long remainStock; + public static ActivityTeamProductSkuAddModel addReqBuild(TeamProjectSkuInfoAddReq teamProjectSkuInfoAddReq, Supplier productId){ + return ActivityTeamProductSkuAddModel.builder() .productId(productId.get()) - .sku(teamProjectSkuInfoAddReq.getSku()) + .productSku(teamProjectSkuInfoAddReq.getProductSku()) .teamStock(teamProjectSkuInfoAddReq.getTeamStock()) .teamPrice(teamProjectSkuInfoAddReq.getTeamPrice()) .build(); } + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java index 61f9d08..0dccf61 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/TeamProductDiscountPriceModel.java @@ -44,7 +44,7 @@ public class TeamProductDiscountPriceModel { * @return 优惠力度 */ public static TeamProductDiscountPriceModel of(BigDecimal productPrice, BigDecimal teamPrice) { - TeamProductDiscountPriceModel.builder() + return TeamProductDiscountPriceModel.builder() .productPrice(productPrice) .teamPrice(teamPrice) .discount( diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java index fcfc308..4dab2b5 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java @@ -3,9 +3,10 @@ package com.muyu.marketing.domain.req; import com.muyu.common.core.web.page.PageDomain; import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; import lombok.*; +import lombok.experimental.SuperBuilder; @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoAddReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoAddReq.java index 7be1dee..7cbc6ad 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoAddReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamProjectSkuInfoAddReq.java @@ -19,7 +19,9 @@ public class TeamProjectSkuInfoAddReq { /** * 规格SKU */ - private String sku; + private Long id; + + private String productSku; /** * 拼团价格 diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java index de0a3db..d23645d 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/MuYuMarketIngApplication.java @@ -6,6 +6,7 @@ import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; + /** * 系统模块 * diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java index 342b35d..f14de83 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java @@ -1,19 +1,19 @@ package com.muyu.marketing.team.controller; - - +import com.dtflys.forest.annotation.Post; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; +import com.muyu.marketing.domain.model.ActivityTeamInfoupdMoudel; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuUpdModel; import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; +import com.muyu.marketing.domain.req.ActivityTeamInfoupdReq; import com.muyu.marketing.domain.req.TeamInfoListReq; +import com.muyu.marketing.domain.resp.ActivityTeamInfoByIdResp; import com.muyu.marketing.domain.resp.TeamInfoListResp; import com.muyu.marketing.team.service.ActivityTeamInfoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -28,7 +28,10 @@ import java.util.List; public class ActivityTeamController { @Autowired - private ActivityTeamInfoService activityTeamInfoService;; + private ActivityTeamInfoService activityTeamInfoService; + + + /** * 查询营销团购活动列表 @@ -58,4 +61,22 @@ public class ActivityTeamController { activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq)); return Result.success(); } + + @GetMapping("/{teamId}") + public Result getByid(@PathVariable Long teamId){ + return Result.success(activityTeamInfoService.getupdId(teamId) ) ; + + } + + @PostMapping("/upd") + public Result upd( @RequestBody ActivityTeamInfoupdReq activityTeamInfoupdReq){ + boolean gettoupd = activityTeamInfoService.gettoupd(ActivityTeamInfoupdMoudel.updreq(activityTeamInfoupdReq)); + if(gettoupd){ + return Result.success("修改成功"); + }else{ + return Result.success("修改成功"); + } + + } + } 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 21d9f00..586f98a 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 @@ -1,11 +1,11 @@ package com.muyu.marketing.team.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; -import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; -import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; -import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; +import com.muyu.marketing.domain.model.*; +import com.muyu.marketing.domain.resp.ActivityTeamInfoByIdResp; import java.util.List; @@ -24,4 +24,8 @@ public interface ActivityTeamInfoService extends IService { * @param activityTeamInfoAddModel 团购添加模型 */ public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel); + ActivityTeamInfoByIdResp getupdId(Long teamId); + + boolean gettoupd( ActivityTeamInfoupdMoudel updsku); + } 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 c65d649..29bf67f 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 @@ -8,7 +8,11 @@ import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; +import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; import com.muyu.marketing.domain.model.*; +import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq; +import com.muyu.marketing.domain.req.TeamProjectSkuUpdReq; +import com.muyu.marketing.domain.resp.ActivityTeamInfoByIdResp; import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper; import com.muyu.marketing.team.service.ActivityTeamInfoService; import com.muyu.marketing.team.service.ActivityTeamOpenInfoService; @@ -82,4 +86,90 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl activityTeamProductSkuAddModel.setTeamId(activityTeamInfo.getId())); this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList); } + + @Override + public ActivityTeamInfoByIdResp getupdId(Long teamId) { + ActivityTeamInfo byId = this.getById(teamId); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,teamId); + + List list = activityTeamProductSkuInfoService.list(queryWrapper); + + List teamProjectSkuInfoAddReqs = list.stream().map(activityTeamProductSkuInfo -> { + TeamProjectSkuInfoAddReq build = TeamProjectSkuInfoAddReq.builder() + .productSku(activityTeamProductSkuInfo.getProductSku()) + .teamStock(activityTeamProductSkuInfo.getTeamStock()) + .teamPrice(activityTeamProductSkuInfo.getTeamPrice()) + .id(activityTeamProductSkuInfo.getId()) + .build(); + return build; + }).toList(); + + return ActivityTeamInfoByIdResp.builder() + .name(byId.getName()) + .name(byId.getName()) + .productId(byId.getProductId()) + .productImage(byId.getProductImage()) + .introduction(byId.getIntroduction()) + .unit(byId.getUnit()) + .imageList(byId.getImageList()) + .endTime(byId.getEndTime()) + .sort(byId.getSort()) + .teamProjectSkuInfoAddReqList(teamProjectSkuInfoAddReqs) + .content(byId.getContent()) + .status(byId.getStatus()) + .strategyType(byId.getStrategyType()) + .strategyId(byId.getStrategyId()) + .build(); + + } + +// private Long id; +// +// private String productSku; +// +// /** +// * 拼团价格 +// */ +// private BigDecimal teamPrice; +// +// /** +// * 拼团库存 +// */ +// private Long teamStock; + + @Override + public boolean gettoupd(ActivityTeamInfoupdMoudel updsku) { + boolean updateById = this.updateById(ActivityTeamInfo.updreq(updsku)); + + + if(updateById){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ActivityTeamProductSkuInfo::getTeamId,updateById); + List list = this.activityTeamProductSkuInfoService.list(queryWrapper); + + +// list.stream().map( +// activityTeamProductSkuInfo -> { +// TeamProjectSkuUpdReq build = TeamProjectSkuUpdReq.builder() +// .id(activityTeamProductSkuInfo.getId()) +// .productSku(activityTeamProductSkuInfo.getProductSku()) +// .teamPrice(activityTeamProductSkuInfo.getTeamPrice()) +// .teamStock(activityTeamProductSkuInfo.getTeamStock()) +// .build(); +// return build; +// }).toList(); + + + activityTeamProductSkuInfoService.saveBatch(list); + + } + return updateById; + + } + + + + } 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 6e87518..bd6e036 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,7 +13,6 @@ import com.muyu.product.cache.ProjectSkuCache; import com.muyu.product.domain.ProjectSkuInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java index 829f618..f4f3939 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/TeamStrategyExemptionServiceImpl.java @@ -1,13 +1,11 @@ package com.muyu.marketing.team.service.impl; - import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.marketing.domain.TeamStrategyExemption; import com.muyu.marketing.team.mapper.TeamStrategyExemptionMapper; import com.muyu.marketing.team.service.TeamStrategyExemptionService; import org.springframework.stereotype.Service; - @Service public class TeamStrategyExemptionServiceImpl extends ServiceImpl implements TeamStrategyExemptionService { - + } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml index 78b5a7b..902be02 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: muyu-marketing + name: muyu-activity profiles: # 环境配置 active: dev @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpdResp.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpdResp.java index 3585e3b..a711aa0 100644 --- a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpdResp.java +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/product/domain/resp/AttributeGroupUpdResp.java @@ -16,16 +16,12 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class AttributeGroupUpdResp { - /** 属性组编号 */ private Long id; - /** 组名称 */ private String name; - /** 状态 */ private String states; - /** * 属性ID集合 */ diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml index e8bd02d..f8a48a0 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml index 8e54ec5..b54ac87 100644 --- a/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-shop-cart/muyu-shop-cart-server/src/main/resources/bootstrap.yml @@ -16,10 +16,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml index a66fd4c..2a0aca5 100644 --- a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-system/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml index 1276c8e..931abfd 100644 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 124.221.130.240:8848 + namespace: cloud-wang # 配置文件格式 file-extension: yml # 共享配置