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

fix():营销团购活动的修改

1125/liuheping
刘河平 2024-11-29 15:48:00 +08:00
parent efab73e637
commit 906e79ab91
6 changed files with 113 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
muyu-gateway/src/main/java/com/muyu/gateway/config/CorsConfig.java 100644
View File

@ -0,0 +1,58 @@
package com.muyu.gateway.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.web.cors.reactive.CorsUtils;
import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebFilter;
import org.springframework.web.server.WebFilterChain;
import reactor.core.publisher.Mono;
/**
* 跨域配置
*
* @author ruoyi
*/
@Configuration
public class CorsConfig
{
/**
* 这里为支持的请求头，如果有自定义的header字段请自己添加
*/
private static final String ALLOWED_HEADERS = "X-Requested-With, Content-Type, Authorization, credential, X-XSRF-TOKEN, token, Admin-Token, App-Token";
private static final String ALLOWED_METHODS = "GET,POST,PUT,DELETE,OPTIONS,HEAD";
private static final String ALLOWED_ORIGIN = "*";
private static final String ALLOWED_EXPOSE = "*";
private static final String MAX_AGE = "18000L";
@Bean
public WebFilter corsFilter()
{
return (ServerWebExchange ctx, WebFilterChain chain) -> {
ServerHttpRequest request = ctx.getRequest();
if (CorsUtils.isCorsRequest(request))
{
ServerHttpResponse response = ctx.getResponse();
HttpHeaders headers = response.getHeaders();
headers.add("Access-Control-Allow-Headers", ALLOWED_HEADERS);
headers.add("Access-Control-Allow-Methods", ALLOWED_METHODS);
headers.add("Access-Control-Allow-Origin", ALLOWED_ORIGIN);
headers.add("Access-Control-Expose-Headers", ALLOWED_EXPOSE);
headers.add("Access-Control-Max-Age", MAX_AGE);
headers.add("Access-Control-Allow-Credentials", "true");
if (request.getMethod() == HttpMethod.OPTIONS)
{
response.setStatusCode(HttpStatus.OK);
return Mono.empty();
}
}
return chain.filter(ctx);
};
}
}

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

@ -30,7 +30,7 @@ public class ActivityTeamInfo extends BaseEntity {
/**
* 商品ID
*/
private Long productId;
private Long projectId;
/**
* 商品活动图
*/
@ -80,7 +80,7 @@ public class ActivityTeamInfo extends BaseEntity {
public static ActivityTeamInfo addModelBuild(ActivityTeamInfoAddModel activityTeamInfoAddModel){
return ActivityTeamInfo.builder()
.name(activityTeamInfoAddModel.getName())
.productId(activityTeamInfoAddModel.getProductId())
.projectId(activityTeamInfoAddModel.getProductId())
.productImage(activityTeamInfoAddModel.getProductImage())
.introduction(activityTeamInfoAddModel.getIntroduction())
.unit(activityTeamInfoAddModel.getUnit())

2
muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityProductUpdReq.java
View File

@ -26,7 +26,7 @@ public class ActivityProductUpdReq {
/**
* 商品ID
*/
private Long productId;
private Long projectId;
/**
* 商品活动图
*/

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

@ -3,6 +3,7 @@ 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.ActivityTeamInfo;
import com.muyu.marketing.domain.model.ActivityProductUpdModel;
import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel;
import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
@ -73,4 +74,17 @@ public class ActivityTeamController {
activityTeamInfoService.edit(activityProductUpdReq);
return Result.success();
}
/**
* 团购活动列表
*/
@GetMapping("/teamList")
public Result<TableDataInfo<ActivityTeamInfo>> teamList(){
List<ActivityTeamInfo> list = activityTeamInfoService.list();
TableDataInfo<ActivityTeamInfo> tableDataInfo = new TableDataInfo<>();
tableDataInfo.setRows(list);
tableDataInfo.setTotal(list.size());
return Result.success(tableDataInfo);
}
}

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

@ -9,6 +9,7 @@ import com.muyu.marketing.domain.model.ActivityTeamInfoListModel;
import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel;
import com.muyu.marketing.domain.req.ActivityProductUpdReq;
import com.muyu.marketing.domain.resp.ActivityTeamInfoDetailResp;
import com.muyu.marketing.domain.resp.TeamInfoListResp;
import java.util.List;
@ -39,4 +40,10 @@ public interface ActivityTeamInfoService extends IService<ActivityTeamInfo> {
* @param activityProductUpdReq
*/
void edit(ActivityProductUpdReq activityProductUpdReq);
/**
* 列表
* @param activityTeamInfo
* @return
*/
}

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

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.core.exception.ServiceException;
import com.muyu.common.core.utils.ObjUtils;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.utils.bean.BeanUtils;
import com.muyu.common.core.web.page.TableDataInfo;
@ -14,6 +15,7 @@ import com.muyu.marketing.domain.req.ActivityProductUpdReq;
import com.muyu.marketing.domain.resp.ActivityProductUpdResp;
import com.muyu.marketing.domain.resp.ActivityTeamInfoDetailResp;
import com.muyu.marketing.domain.resp.ActivityTeamProductSkuResp;
import com.muyu.marketing.domain.resp.TeamInfoListResp;
import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;
import com.muyu.marketing.team.service.ActivityTeamInfoService;
import com.muyu.marketing.team.service.ActivityTeamOpenInfoService;
@ -37,6 +39,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
@Autowired
private ActivityTeamProductSkuInfoService activityTeamProductSkuInfoService;
// @Autowired
// private ActivityTeamInfoMapper activityTeamInfoMapper;
@ -178,7 +181,35 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl<ActivityTeamInfoMap
}).toList();
//批量添加SKU集合
activityTeamProductSkuInfoService.batchSave(activityTeamProductSkuAddList);
}
//修改活动信息
ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.builder()
.id(activityProductUpdReq.getId())
.name(activityProductUpdReq.getName())
.projectId(activityProductUpdReq.getProjectId())
.productImage(activityProductUpdReq.getProductImage())
.introduction(activityProductUpdReq.getIntroduction())
.unit(activityProductUpdReq.getUnit())
.imageList(activityProductUpdReq.getImageList())
.endTime(activityProductUpdReq.getEndTime())
.sort(activityProductUpdReq.getSort())
.content(activityProductUpdReq.getContent())
.status(activityProductUpdReq.getStatus())
.strategyType(activityProductUpdReq.getStrategyType())
.strategyId(activityProductUpdReq.getStrategyId())
.build();
//修改拼团活动
updateById(activityTeamInfo);
}
/**
* 查询拼团活动列表
* @param activityTeamInfo
* @return
*/
}