From 5b4b5e5fffe6536a98423d8b2b0d31e79d709056 Mon Sep 17 00:00:00 2001 From: zyl <648123932@qq.com> Date: Thu, 5 Dec 2024 01:52:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/策略.md | 6 +++++ 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 +++-- .../model/ActivityTeamInfoSaveModel.java | 4 +--- .../domain/resp/TeamInfoFindByIdResp.java | 2 +- .../controller/ActivityTeamController.java | 24 ++++++++++++------- .../impl/ActivityTeamInfoServiceImpl.java | 6 +++-- ...ActivityTeamProductSkuInfoServiceImpl.java | 2 +- .../src/main/resources/bootstrap.yml | 8 ++++--- .../controller/AttributeGroupController.java | 11 +++++++++ .../src/main/resources/bootstrap.yml | 6 +++-- .../src/main/resources/bootstrap.yml | 6 +++-- .../src/main/resources/bootstrap.yml | 6 +++-- .../src/main/resources/bootstrap.yml | 8 ++++--- 17 files changed, 83 insertions(+), 39 deletions(-) create mode 100644 doc/策略.md diff --git a/doc/策略.md b/doc/策略.md new file mode 100644 index 0000000..d732b3b --- /dev/null +++ b/doc/策略.md @@ -0,0 +1,6 @@ +# 功能划分 + 商品详情未参团 + 商品详情已参团 + 拼团成功 + 拼团失败 +## 加入拼团 diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index 26bb01c..33d981a 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: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index b15f786..3ad3f32 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: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +35,8 @@ spring: datasource: ds1: nacos: - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 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 956f52b..a8a2f77 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: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 # 配置文件格式 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 3ec7c15..ccbd4cb 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: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 # 配置文件格式 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 364dc05..7f5d677 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: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 # 配置文件格式 file-extension: yml # 共享配置 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..af8dd35 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,10 +5,8 @@ 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 @@ -82,7 +80,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/resp/TeamInfoFindByIdResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java index 3efe23a..85466f6 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/TeamInfoFindByIdResp.java @@ -2,7 +2,7 @@ package com.muyu.marketing.domain.resp; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.marketing.domain.model.ActivityTeamDetailModel; -import com.muyu.marketing.domain.req.ProjectSkuInfoAddReq; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; 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 9494be5..690fbb6 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 @@ -17,12 +17,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -/** - * 营销团购活动控制层 - * - * @author DongZeLiang - * @date 2024-11-20 14:25 - */ + @RestController @RequestMapping("/team") public class ActivityTeamController { @@ -31,8 +26,8 @@ public class ActivityTeamController { private ActivityTeamInfoService activityTeamInfoService;; /** - * 查询营销团购活动列表 - * @param teamInfoListReq 活动查询入参 + * 团购活动列表 + * @param teamInfoListReq 入参 * @return 活动响应结果 */ @PostMapping("/list") @@ -56,13 +51,24 @@ public class ActivityTeamController { @PostMapping public Result save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) { activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq)); - return Result.success(); + return Result.success("添加成功"); } + /** + * 根据ID查询商品的详情 + * @param id 团购活动ID + * @return 团购详情 + */ @PostMapping("/findById/{id}") public Result findTeamById(@PathVariable Long id){ return Result.success(TeamInfoFindByIdResp.teamInfoFindByIdBuild(activityTeamInfoService.findDetailById(id))); } + + /** + * 修改团购活动信息 + * @param activityTeamInfoUpdReq 团购活动信息 + * @return 是否成功 + */ @PutMapping("/updateByTeamId") public Result updateByTeamId(@RequestBody ActivityTeamInfoUpdReq activityTeamInfoUpdReq){ activityTeamInfoService.update(ActivityTeamInfoUpdModel.activityTeamInfoUpdReqModelBuild(activityTeamInfoUpdReq)); 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..578930a 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 @@ -20,7 +20,7 @@ import java.util.List; @Service public class ActivityTeamInfoServiceImpl extends ServiceImpl - implements ActivityTeamInfoService { + implements ActivityTeamInfoService { @Autowired private ActivityTeamOpenInfoService activityTeamOpenInfoService; @@ -81,6 +81,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl discountPriceModelOptional = teamProductSkuInfoList.stream() .map(activityTeamProductSkuInfo -> { - ProjectSkuInfo projectSkuInfo = projectSkuCache.get(activityTeamProductSkuInfo.getProductId(), activityTeamProductSkuInfo.getProductSku()); + ProjectSkuInfo projectSkuInfo = projectSkuCache.getData(activityTeamProductSkuInfo.getProductId(), activityTeamProductSkuInfo.getProductSku()); return TeamProductDiscountPriceModel.of(projectSkuInfo.getPrice(), activityTeamProductSkuInfo.getTeamPrice()); }).min((o1, o2) -> Double.valueOf(o1.getDiscount() * 100 - o2.getDiscount() * 100).intValue()); 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 699e778..4b15b4e 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-buy + name: muyu-marketing profiles: # 环境配置 active: dev @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 # 配置文件格式 file-extension: yml # 共享配置 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..be15899 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 @@ -114,4 +114,15 @@ public class AttributeGroupController extends BaseController { public Result remove(@PathVariable List ids) { return toAjax(attributeGroupService.removeBatchByIds(ids)); } + + /** + * 修改状态按钮 + * @param attributeGroup + * @return + */ + @PutMapping("/update") + public Result update(@RequestBody AttributeGroup attributeGroup) { + return toAjax(attributeGroupService.updateById(attributeGroup)); + } + } 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 8ece81d..7cf333d 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: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 # 配置文件格式 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 9467547..87c552c 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: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 # 配置文件格式 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 ee5ca7f..29a9e6a 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: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 # 配置文件格式 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 c730a55..244bb47 100644 --- a/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml +++ b/muyu-visual/muyu-monitor/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9100 + port: 9101 # Spring spring: @@ -14,10 +14,12 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 1.94.33.190:8848 + namespace: f69f28cf-0447-4878-907a-2de2cb16bcd0 # 配置文件格式 file-extension: yml # 共享配置