diff --git a/doc/团购活动修改.java b/doc/团购活动修改.java index 64b1b79..4c0a325 100644 --- a/doc/团购活动修改.java +++ b/doc/团购活动修改.java @@ -30,3 +30,38 @@ "详情": "String" } + { + "id": "Long",//活动ID + "productId": "Long",//商品ID + "name": "String",//活动名称 + "pname": "String",//商品名称 + "productImage": "String",//商品图片 + "introduction": "String",//活动简介 + "unit": "String",//商品单位 + "imageList": [//商品的轮播图 + "String", "String" + ], + "endTime": "date",//活动时间 + "strategyType": "String",//策略类型 + "ActivityTeamProductSkuUpdDelAddModel": {// 商品规格 + "ActivityTeamProductSkuUpdListModel": [ // 修改商品规格List + { + "id": "Long",//团购规格ID + "teamPrice": "BigDecimal",//拼团价格 + "teamStock": "Long"//拼团库存 + } + ], + "ActivityTeamProductSkuDelListModel" : ["id", "id"],//删除商品规格IdList + "ActivityTeamProductSkuAddListModel": [//添加商品规格List + { + + "sku": "String",//商品SKU + "productPrice": "BigDecimal",//商品价格 + "teamPrice": "BigDecimal",//拼团价格 + "teamStock": "Long"// 拼团库存 + } + ] + }, + + "content": "String"//详情 + } diff --git a/muyu-auth/src/main/resources/bootstrap.yml b/muyu-auth/src/main/resources/bootstrap.yml index 26bb01c..0aac661 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: 150.158.86.96:8848 + namespace: 2204a config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a # 配置文件格式 file-extension: yml # 共享配置 diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index b15f786..f81350a 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: 150.158.86.96:8848 + namespace: 2204a config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +35,8 @@ spring: datasource: ds1: nacos: - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a 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..1413712 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: 150.158.86.96:8848 + namespace: 2204a config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a # 配置文件格式 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..968ca53 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: 150.158.86.96:8848 + namespace: 2204a config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a # 配置文件格式 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..2620243 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: 150.158.86.96:8848 + namespace: 2204a config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a # 配置文件格式 file-extension: yml # 共享配置 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 4e8aba0..2b858de 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 @@ -5,6 +5,7 @@ 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.ActivityTeamProductSkuAddModel; +import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel; import com.muyu.marketing.domain.model.ActivityTeamProductSkuReqModel; import lombok.*; import lombok.experimental.SuperBuilder; @@ -73,4 +74,13 @@ public class ActivityTeamProductSkuInfo extends BaseEntity { .build(); } + public static ActivityTeamProductSkuInfo updModelBuild(ActivityTeamProductSkuModel activityTeamProductSkuModel){ + return ActivityTeamProductSkuInfo.builder() + .id(activityTeamProductSkuModel.getId()) + .teamPrice(activityTeamProductSkuModel.getTeamPrice()) + .teamStock(activityTeamProductSkuModel.getTeamStock()) + .remainStock(activityTeamProductSkuModel.getTeamStock()) + .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..69a32ad 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 @@ -82,7 +82,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/ActivityTeamProductSkuAddListModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddListModel.java new file mode 100644 index 0000000..98ced8c --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddListModel.java @@ -0,0 +1,44 @@ +package com.muyu.marketing.domain.model; + + +import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.function.Supplier; + +/** + * 团购spu库存添加模型 + * + * @author DongZeLiang + * @date 2024-11-26 09:36 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ActivityTeamProductSkuAddListModel { + + /** + * 规格SKU + */ + private String sku; + + /** + * 商品价格 + */ + private BigDecimal productPrice; + /** + * 拼团价格 + */ + private BigDecimal teamPrice; + + /** + * 拼团库存 + */ + private Long teamStock; + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuDelListModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuDelListModel.java new file mode 100644 index 0000000..2662f0b --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuDelListModel.java @@ -0,0 +1,30 @@ +package com.muyu.marketing.domain.model;/** + * @Author：尚志豪 + * @Package：com.muyu.marketing.domain.model + * @Project：2204a-cloud-server-DongZeLiang + * @name：ActivityTeamProductSkuDelModel + * @Date：2024/11/27 17:03 + */ + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @program: 2204a-cloud-server-DongZeLiang + * @description: 删除商品规格 + * @author: CuiFu Bo + * @create: 2024-11-27 17:03 + **/ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ActivityTeamProductSkuDelListModel { + + /** + * id + */ + private Long id; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdDelAddModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdDelAddModel.java new file mode 100644 index 0000000..8f0a577 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdDelAddModel.java @@ -0,0 +1,35 @@ +package com.muyu.marketing.domain.model; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 商品活动,修改,删除,添加,模型 + * + * @author DongZeLiang + * @date 2024-11-26 15:35 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ActivityTeamProductSkuUpdDelAddModel { + /** + * 修改商品规格LIST + */ + private List activityTeamProductSkuUpdModelList; + /** + * 删除商品规格LIST + */ + private List activityTeamProductSkuDelModelList; + + /** + * 添加商品规格LIST + */ + private List ActivityTeamProductSkuAddListModelList; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdListModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdListModel.java new file mode 100644 index 0000000..048312a --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuUpdListModel.java @@ -0,0 +1,37 @@ +package com.muyu.marketing.domain.model; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * 拼团活动商品SKU + * + * @author DongZeLiang + * @date 2024-11-27 14:18 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ActivityTeamProductSkuUpdListModel { + + /** + * 商品规格ID + */ + private Long id; + + /** + * 团购价格 + */ + private BigDecimal teamPrice; + + /** + * 团购库存 + */ + private Long teamStock; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdateModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdateModel.java new file mode 100644 index 0000000..060d8b1 --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamUpdateModel.java @@ -0,0 +1,85 @@ +package com.muyu.marketing.domain.model; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.marketing.domain.ActivityTeamInfo; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.List; +import java.util.function.Function; + +/** + * @program: 2204a-cloud-server + * @description: 活动回显总模型 + * @author: AoCi Tian + * @create: 2024-11-26 16:00 + **/ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ActivityTeamUpdateModel { + /** + * 拼团id + */ + private Long id; + /** + * 拼团名称 + */ + private String name; + /** + * 商品ID + */ + private Long productId; + /** + * 商品活动图 + */ + 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 Long sort; + /** + * 商品规格 + */ + private List activityTeamProductSkuUpdDelAddModelList; + /** + * 活动详情 + */ + private String content; + /** + * 活动状态 + */ + private String status; + /** + * 策略类型 + */ + private String strategyType; + /** + * 策略ID + */ + private Long strategyId; + +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java index 5481f4b..33d5ddb 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ActivityTeamDetailResp.java @@ -2,7 +2,6 @@ package com.muyu.marketing.domain.resp; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.marketing.domain.req.TeamProjectSkuInfoAddReq; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectFindSkuInfoResp.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectFindSkuInfoResp.java index cf0af4e..78e93d3 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectFindSkuInfoResp.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/resp/ProjectFindSkuInfoResp.java @@ -1,7 +1,5 @@ package com.muyu.marketing.domain.resp; -import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; -import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel; import com.muyu.marketing.domain.model.ActivityTeamProductSkuModel; import lombok.AllArgsConstructor; import lombok.Data; 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..c99b334 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,6 @@ 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 342b35d..f22f8ed 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 @@ -3,17 +3,14 @@ package com.muyu.marketing.team.controller; 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.*; import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; import com.muyu.marketing.domain.req.TeamInfoListReq; import com.muyu.marketing.domain.resp.TeamInfoListResp; import com.muyu.marketing.team.service.ActivityTeamInfoService; +import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService; 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 +25,9 @@ import java.util.List; public class ActivityTeamController { @Autowired - private ActivityTeamInfoService activityTeamInfoService;; + private ActivityTeamInfoService activityTeamInfoService; + @Autowired + private ActivityTeamProductSkuInfoService skuInfoService; /** * 查询营销团购活动列表 @@ -53,9 +52,40 @@ public class ActivityTeamController { * @param activityTeamInfoSaveReq 添加请求对象 * @return 结果集 */ - @PostMapping + @PostMapping("/save") public Result save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) { activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq)); return Result.success(); } + + /** + * 根据id查询 + */ + @PostMapping("/detail") + public List findListByTeamId(Long teamId){ + List list = skuInfoService.findListByTeamId(teamId); + return list; + } + /** + * 批量删除 + */ + @PostMapping("/delBatch") + public boolean delBatch(@RequestBody List ids){ + return skuInfoService.delBatch(ids); + } + + /** + * 批量添加用户 + */ + @PostMapping("/batchAdd") + public boolean batchAdd(@RequestBody List activityTeamProductSkuAddListModelList) { + return skuInfoService.saveBatch(activityTeamProductSkuAddListModelList); + } + /** + * 批量修改用户 + */ + @PostMapping("/batchUpd") + public boolean batchUp(@RequestBody List activityTeamProductSkuUpdListModels) { + return skuInfoService.updateBatch(activityTeamProductSkuUpdListModels); + } } 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..a6a3c35 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 @@ -48,4 +48,23 @@ public interface ActivityTeamProductSkuInfoService extends IService activityTeamProductSkuReqModelList); + /** + * 根据 业务模型 运行团购商品修改 + */ + public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel); + + public boolean batchUpdate(List activityTeamProductSkuModelList); + + /** + * 批量删除 + */ + public boolean delBatch(List ids); + /** + * 批量添加用户 + */ + boolean saveBatch(List activityTeamProductSkuAddListModelList); + /** + * 批量修改用户 + */ + boolean updateBatch(List activityTeamProductSkuUpdListModels); } 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..770d731 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 @@ -1,6 +1,7 @@ package com.muyu.marketing.team.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.exception.ServiceException; import com.muyu.marketing.domain.ActivityTeamProductSkuInfo; @@ -100,4 +101,51 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl activityTeamProductSkuReqModelList) { return this.updateBatchById(activityTeamProductSkuReqModelList.stream().map(ActivityTeamProductSkuInfo::updateModelBuild).toList()); } + + @Override + public boolean update(ActivityTeamProductSkuUpdModel activityTeamProductSkuUpdModel) { + + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ActivityTeamProductSkuInfo::getTeamStock,activityTeamProductSkuUpdModel.getTeamStock()); + updateWrapper.set(ActivityTeamProductSkuInfo::getRemainStock,activityTeamProductSkuUpdModel.getTeamStock()); + updateWrapper.set(ActivityTeamProductSkuInfo::getTeamPrice,activityTeamProductSkuUpdModel.getTeamPrice()); + updateWrapper.eq(ActivityTeamProductSkuInfo::getId,activityTeamProductSkuUpdModel.getId()); + this.update(updateWrapper); + return false; + } + + @Override + public boolean batchUpdate(List activityTeamProductSkuModelList) { + return this.updateBatchById( + activityTeamProductSkuModelList.stream() + .map(ActivityTeamProductSkuInfo::updModelBuild) + .toList() + ); + } + + /** + * 批量删除 + * @param ids + * @return + */ + @Override + public boolean delBatch(List ids) { + return this.removeByIds(ids); + } + /** + * 批量添加用户 + */ + @Override + public boolean saveBatch(List activityTeamProductSkuAddListModelList) { + return this.saveBatch(activityTeamProductSkuAddListModelList); + } + /** + * 批量修改用户 + */ + @Override + public boolean updateBatch(List activityTeamProductSkuUpdListModels) { + return this.updateBatch(activityTeamProductSkuUpdListModels); + } + + } 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..692be0b 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: 150.158.86.96:8848 + namespace: 2204a config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a # 配置文件格式 file-extension: yml # 共享配置 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..79136b1 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: 150.158.86.96:8848 + namespace: 2204a config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a # 配置文件格式 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..dca23dd 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: 150.158.86.96:8848 + namespace: 2204a config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a # 配置文件格式 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..8503005 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: 150.158.86.96:8848 + namespace: 2204a config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a # 配置文件格式 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..f121a94 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: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a config: # 配置中心地址 - server-addr: 120.46.147.226:8848 + server-addr: 150.158.86.96:8848 + namespace: 2204a # 配置文件格式 file-extension: yml # 共享配置