teaching
/
2204a-cloud-server
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(): 拼团完善活动修改

1127/masongjia
masongjia 2024-11-27 21:41:32 +08:00
parent 523104d85c
commit 907b0d1356
13 changed files with 320 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.ActivityTeamInfoAddModel;
import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
import lombok.*;
import lombok.experimental.SuperBuilder;
@ -111,4 +112,27 @@ public class ActivityTeamInfo extends BaseEntity {
.strategyId(activityTeamInfoAddModel.getStrategyId())
.build();
}
/**
* 拼团活动修改
* @param activityTeamInfoUpdModel
* @return
*/
public static ActivityTeamInfo activityTeamInfoUpdBulider(ActivityTeamInfoUpdModel activityTeamInfoUpdModel){
return ActivityTeamInfo.builder()
.id(activityTeamInfoUpdModel.getId())
.name(activityTeamInfoUpdModel.getName())
.productId(activityTeamInfoUpdModel.getProductId())
.productImage(activityTeamInfoUpdModel.getProductImage())
.introduction(activityTeamInfoUpdModel.getIntroduction())
.unit(activityTeamInfoUpdModel.getUnit())
.imageList(activityTeamInfoUpdModel.getImageList())
.endTime(activityTeamInfoUpdModel.getEndTime())
.sort(activityTeamInfoUpdModel.getSort())
.content(activityTeamInfoUpdModel.getContent())
.status(activityTeamInfoUpdModel.getStatus())
.strategyType(activityTeamInfoUpdModel.getStrategyType())
.strategyId(activityTeamInfoUpdModel.getStrategyId())
.build();
}
}

17
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamProductSkuInfo.java
View File

@ -6,6 +6,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.ActivityTeamProductSkuInfoUpdModel;
import lombok.*;
import lombok.experimental.SuperBuilder;
@ -57,11 +58,25 @@ public class ActivityTeamProductSkuInfo extends BaseEntity {
*/
public static ActivityTeamProductSkuInfo modelBuild(ActivityTeamProductSkuAddModel activityTeamProductSkuAddModel) {
return ActivityTeamProductSkuInfo.builder()
.productId(activityTeamProductSkuAddModel.getProductId())
.teamId(activityTeamProductSkuAddModel.getTeamId())
.productId(activityTeamProductSkuAddModel.getProductId())
.teamStock(activityTeamProductSkuAddModel.getTeamStock())
.remainStock(activityTeamProductSkuAddModel.getTeamStock())
.teamPrice(activityTeamProductSkuAddModel.getTeamPrice())
.build();
}
/**
* 拼团活动规格修改转型 ActivityTeamProductSkuInfoUpdModel
* @param activityTeamProductSkuInfoUpdModel
* @return
*/
public static ActivityTeamProductSkuInfo ActivityTeamProductSkuInfoUpdBuilder(ActivityTeamProductSkuInfoUpdModel activityTeamProductSkuInfoUpdModel){
return ActivityTeamProductSkuInfo.builder()
.id(activityTeamProductSkuInfoUpdModel.getId())
.teamPrice(activityTeamProductSkuInfoUpdModel.getTeamPrice())
.teamStock(activityTeamProductSkuInfoUpdModel.getTeamStock())
.build();
}
}

27
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoUpdModel.java
View File

@ -1,12 +1,17 @@
package com.muyu.marketing.domain.model;
import com.muyu.marketing.domain.req.ActivityTeamInfoUpdRequest;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.Date;
import java.util.List;
/**
* 拼团活动修改模型
*/
@Data
@SuperBuilder
@NoArgsConstructor
@ -64,10 +69,28 @@ public class ActivityTeamInfoUpdModel {
* 策略ID
*/
private long strategyId;
/**
* 修改活动规格模型
*/
private ActivityTeamProductSkuInfoUpdModel activityTeamProductSkuInfoUpdModel;
private ActivityTeamProductSkuInfoAllUpdModel activityTeamProductSkuInfoAllUpdModel;
public static ActivityTeamInfoUpdModel ActivityTeamInfoUpdModelBulider(ActivityTeamInfoUpdRequest activityTeamInfoUpdRequest){
return ActivityTeamInfoUpdModel.builder()
.id(activityTeamInfoUpdRequest.getId())
.name(activityTeamInfoUpdRequest.getName())
.productId(activityTeamInfoUpdRequest.getProductId())
.productImage(activityTeamInfoUpdRequest.getProductImage())
.introduction(activityTeamInfoUpdRequest.getIntroduction())
.unit(activityTeamInfoUpdRequest.getUnit())
.imageList(activityTeamInfoUpdRequest.getImageList())
.endTime(activityTeamInfoUpdRequest.getEndTime())
.sort(activityTeamInfoUpdRequest.getSort())
.content(activityTeamInfoUpdRequest.getContent())
.status(activityTeamInfoUpdRequest.getStatus())
.strategyType(activityTeamInfoUpdRequest.getStrategyType())
.strategyId(activityTeamInfoUpdRequest.getStrategyId())
.activityTeamProductSkuInfoAllUpdModel(ActivityTeamProductSkuInfoAllUpdModel.activityTeamProductSkuInfoAllUpdModelBulider(activityTeamInfoUpdRequest.getActivityTeamProductSkuInfoAllUpdRequest()))
.build();
}
}

2
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuAddModel.java
View File

@ -12,7 +12,7 @@ import java.util.function.Function;
import java.util.function.Supplier;
/**
* 团购spu库存添加模型
* 团购SKU库存添加模型
*
* @author DongZeLiang
* @date 2024-11-26 09:36

41
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoAllUpdModel.java 100644
View File

@ -0,0 +1,41 @@
package com.muyu.marketing.domain.model;
import com.muyu.marketing.domain.req.ActivityTeamProductSkuInfoAllUpdRequest;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.List;
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamProductSkuInfoAllUpdModel {
/**
* 商品SkU集合
*/
private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
/**
* 拼团活动规格ID
*/
private List<Long> listId;
/**
* 拼团活动规则修改
*/
private List<ActivityTeamProductSkuInfoUpdModel> activityTeamProductSkuInfoUpdModelList;
public static ActivityTeamProductSkuInfoAllUpdModel activityTeamProductSkuInfoAllUpdModelBulider(ActivityTeamProductSkuInfoAllUpdRequest activityTeamProductSkuInfoAllUpdRequest){
return ActivityTeamProductSkuInfoAllUpdModel.builder()
.activityTeamProductSkuAddModelList(activityTeamProductSkuInfoAllUpdRequest.getActivityTeamProductSkuAddModelList())
.listId(activityTeamProductSkuInfoAllUpdRequest.getListId())
.activityTeamProductSkuInfoUpdModelList(activityTeamProductSkuInfoAllUpdRequest.getActivityTeamProductSkuInfoUpdModelList())
.build();
}
}

18
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamProductSkuInfoUpdModel.java
View File

@ -1,17 +1,31 @@
package com.muyu.marketing.domain.model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.List;
import java.math.BigDecimal;
/**
* 拼团活动规格修改模型
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamProductSkuInfoUpdModel {
/**
* 团购规格ID
*/
private long id;
/**
* 拼团价格
*/
private BigDecimal teamPrice;
/**
* 拼团库存
*/
private Long teamStock;
}

78
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoUpdRequest.java 100644
View File

@ -0,0 +1,78 @@
package com.muyu.marketing.domain.req;
import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoAllUpdModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.Date;
/**
* 拼团活动修改
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamInfoUpdRequest {
/**
* 主键
*/
private long id;
/**
* 拼团名称
*/
private String name;
/**
* 商品ID
*/
private long productId;
/**
* 商品活动图
*/
private String productImage;
/**
* 活动简介
*/
private String introduction;
/**
* 单位
*/
private String unit;
/**
* 轮播图
*/
private String imageList;
/**
* 活动结束时间
*/
private Date endTime;
/**
* 活动排序
*/
private long sort;
/**
* 活动详情
*/
private String content;
/**
* 活动状态
*/
private String status;
/**
* 策略类型
*/
private String strategyType;
/**
* 策略ID
*/
private long strategyId;
/**
* 修改活动规格模型
*/
private ActivityTeamProductSkuInfoAllUpdRequest activityTeamProductSkuInfoAllUpdRequest;
}

36
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamProductSkuInfoAllUpdRequest.java 100644
View File

@ -0,0 +1,36 @@
package com.muyu.marketing.domain.req;
import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoUpdModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.List;
/**
* 拼团活动规则修改参数
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
public class ActivityTeamProductSkuInfoAllUpdRequest {
/**
* 商品SkU集合
*/
private List<ActivityTeamProductSkuAddModel> activityTeamProductSkuAddModelList;
/**
* 拼团活动规格ID
*/
private List<Long> listId;
/**
* 拼团活动规则修改
*/
private List<ActivityTeamProductSkuInfoUpdModel> activityTeamProductSkuInfoUpdModelList;
}

18
muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java
View File

@ -7,7 +7,9 @@ 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.ActivityTeamInfoModel;
import com.muyu.marketing.domain.model.ActivityTeamInfoUpdModel;
import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq;
import com.muyu.marketing.domain.req.ActivityTeamInfoUpdRequest;
import com.muyu.marketing.domain.req.TeamInfoListReq;
import com.muyu.marketing.domain.resp.ActivityTeamInfoResponse;
import com.muyu.marketing.domain.resp.TeamInfoListResp;
@ -60,13 +62,25 @@ public class ActivityTeamController {
}
/**
* 拼团活动回显
* 拼团活动详情信息
* @param id
* @return
*/
@GetMapping("/Echo/{id}")
@GetMapping("/detail/{id}")
public Result echo(@PathVariable Long id){
ActivityTeamInfoResponse activityTeamInfoResponse = activityTeamInfoService.activityTeamInfoModel(id);
return Result.success(activityTeamInfoResponse);
}
/**
* 修改拼团活动
* @param activityTeamInfoUpdRequest
* @return
*/
@PostMapping("/updateById")
public Result updateById(@RequestBody ActivityTeamInfoUpdRequest activityTeamInfoUpdRequest){
this.activityTeamInfoService.activityTeamInfoUpd(ActivityTeamInfoUpdModel.ActivityTeamInfoUpdModelBulider(activityTeamInfoUpdRequest));
return Result.success("修改成功");
}
}

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

@ -3,10 +3,7 @@ package com.muyu.marketing.team.service;
import com.baomidou.mybatisplus.extension.service.IService;
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.ActivityTeamInfoModel;
import com.muyu.marketing.domain.model.*;
import com.muyu.marketing.domain.resp.ActivityTeamInfoResponse;
import java.util.List;
@ -35,10 +32,12 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
*/
public ActivityTeamInfoResponse activityTeamInfoModel(Long id);
/**
* 修改拼团活动
* 拼团活动修改
* @param activityTeamInfoUpdModel
*/
public void updactivityTeamInfo(ActivityTeamInfoAddModel activityTeamInfoAddModel,Long id);
public void activityTeamInfoUpd(ActivityTeamInfoUpdModel activityTeamInfoUpdModel);

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

@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.marketing.domain.ActivityTeamProductSkuInfo;
import com.muyu.marketing.domain.TeamStrategyExemptionHundred;
import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel;
import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
import com.muyu.marketing.domain.model.TeamProductStockModel;
import com.muyu.marketing.domain.model.*;
import java.util.List;
@ -50,4 +47,22 @@ public interface ActivityTeamProductSkuInfoService extends IService<ActivityTeam
*/
public List<ActivityTeamProductSkuInfoModel> ActivityTeamProductSkuInfoModelList(Long teamId);
/**
* 拼团活动规格批量修改
* @param activityTeamProductSkuInfoUpdModelList
*/
public void activityTeamProductSkuInfoUpd(List<ActivityTeamProductSkuInfoUpdModel> activityTeamProductSkuInfoUpdModelList);
/**
* 拼团活动规格批量删除
* @param id
*/
public void activityTeamProductSkuInfoDel(List<Long> id);
// /**
// * 拼团活动规格添加
// */
// public void activityTeamProductSkuInfoAdd();
}

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

@ -104,10 +104,26 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
}
@Override
public void updactivityTeamInfo(ActivityTeamInfoAddModel activityTeamInfoAddModel,Long id) {
this.updateById(ActivityTeamInfo.updModelBuild(activityTeamInfoAddModel,id));
public void activityTeamInfoUpd(ActivityTeamInfoUpdModel activityTeamInfoUpdModel) {
this.updateById(ActivityTeamInfo.activityTeamInfoUpdBulider(activityTeamInfoUpdModel));
this.activityTeamProductSkuInfoService.activityTeamProductSkuInfoDel(activityTeamInfoUpdModel
.getActivityTeamProductSkuInfoAllUpdModel().getListId());
List<ActivityTeamProductSkuAddModel> teamProductSkuAddModelList =
activityTeamInfoUpdModel.getActivityTeamProductSkuInfoAllUpdModel().getActivityTeamProductSkuAddModelList();
teamProductSkuAddModelList.forEach(
activityTeamProductSkuAddModel -> activityTeamProductSkuAddModel.setTeamId(activityTeamInfoUpdModel.getId()));
this.activityTeamProductSkuInfoService.batchSave(teamProductSkuAddModelList);
this.activityTeamProductSkuInfoService.activityTeamProductSkuInfoUpd(activityTeamInfoUpdModel
.getActivityTeamProductSkuInfoAllUpdModel().getActivityTeamProductSkuInfoUpdModelList());
}
}

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

@ -1,13 +1,11 @@
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;
import com.muyu.marketing.domain.model.ActivityTeamProductSkuAddModel;
import com.muyu.marketing.domain.model.ActivityTeamProductSkuInfoModel;
import com.muyu.marketing.domain.model.TeamProductDiscountPriceModel;
import com.muyu.marketing.domain.model.TeamProductStockModel;
import com.muyu.marketing.domain.model.*;
import com.muyu.marketing.team.mapper.ActivityTeamProductSkuInfoMapper;
import com.muyu.marketing.team.service.ActivityTeamProductSkuInfoService;
import com.muyu.product.cache.ProjectSkuCache;
@ -78,9 +76,7 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
if (activityTeamProductSkuAddModelList == null || activityTeamProductSkuAddModelList.isEmpty()) {
throw new ServiceException("入参添加商品规格模型，不可为空");
}
this.saveBatch(
activityTeamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::modelBuild).toList()
);
this.saveBatch(activityTeamProductSkuAddModelList.stream().map(ActivityTeamProductSkuInfo::modelBuild).toList());
}
@ -98,4 +94,26 @@ public class ActivityTeamProductSkuInfoServiceImpl extends ServiceImpl<ActivityT
// List<ActivityTeamProductSkuInfoModel> activityTeamProductSkuInfoModels = list.stream().map(ActivityTeamProductSkuInfoModel::reqSkuBulider).toList();
// return activityTeamProductSkuInfoModels;
}
@Override
public void activityTeamProductSkuInfoUpd(List<ActivityTeamProductSkuInfoUpdModel> activityTeamProductSkuInfoUpdModelList) {
List<ActivityTeamProductSkuInfo> list = activityTeamProductSkuInfoUpdModelList
.stream().map(ActivityTeamProductSkuInfo::ActivityTeamProductSkuInfoUpdBuilder)
.toList();
this.updateBatchById(list);
}
@Override
public void activityTeamProductSkuInfoDel(List<Long> id) {
this.removeBatchByIds(id);
}
// @Override
// public void activityTeamProductSkuInfoAdd() {
//
// }
}