caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

交互对象调整

Browse Source
This commit is contained in:
Chopper 2021-06-18 14:23:51 +08:00
parent daa6236b37
commit 7113914ccd
5 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java
View File

@ -4,6 +4,8 @@ import cn.lili.modules.promotion.entity.dos.CouponActivity;
import cn.lili.modules.promotion.entity.dos.CouponActivityItem;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.beans.factory.annotation.Required;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@ -18,4 +20,7 @@ public class CouponActivityDTO extends CouponActivity {
@ApiModelProperty(value = "优惠券列表")
private List<CouponActivityItem> couponActivityItems;
@ApiModelProperty(value = "会员列表")
private List<MemberDTO> memberDTOS;
}

22
framework/src/main/java/cn/lili/modules/promotion/entity/dto/MemberDTO.java Normal file
View File

@ -0,0 +1,22 @@
package cn.lili.modules.promotion.entity.dto;
import lombok.Data;
/**
* 会员dto
*
* @author Chopper
* @version v1.0
* 2021-06-18 11:30
*/
@Data
public class MemberDTO {
/**
* 会员昵称
*/
private String nickName;
/**
* id
*/
private String id;
}

5
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
View File

@ -3,6 +3,7 @@ package cn.lili.modules.promotion.serviceimpl;
import cn.lili.modules.promotion.entity.dos.CouponActivityItem;
import cn.lili.modules.promotion.mapper.CouponActivityItemMapper;
import cn.lili.modules.promotion.service.CouponActivityItemService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
@ -18,6 +19,8 @@ import java.util.List;
public class CouponActivityItemServiceImpl extends ServiceImpl<CouponActivityItemMapper, CouponActivityItem> implements CouponActivityItemService {
@Override
public List<CouponActivityItem> getCouponActivityList(String activityId) {
return this.list(this.lambdaQuery().eq(CouponActivityItem::getActivityId, activityId));
LambdaQueryWrapper<CouponActivityItem> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(CouponActivityItem::getActivityId, activityId);
return this.list(lambdaQueryWrapper);
}
}

5
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
View File

@ -1,5 +1,6 @@
package cn.lili.modules.promotion.serviceimpl;
import cn.hutool.json.JSONUtil;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.DateUtil;
import cn.lili.modules.member.entity.dos.Member;
@ -50,6 +51,10 @@ public class CouponActivityServiceImpl extends ServiceImpl<CouponActivityMapper,
public CouponActivityDTO addCouponActivity(CouponActivityDTO couponActivityDTO) {
//检测优惠券活动是否可以添加
this.checkParam(couponActivityDTO);
// 如果有会员，则写入会员信息
if (couponActivityDTO.getMemberDTOS() == null || couponActivityDTO.getMemberDTOS().size() == 0) {
couponActivityDTO.setActivityScopeInfo(JSONUtil.toJsonStr(couponActivityDTO.getMemberDTOS()));
}
//添加优惠券活动
this.save(couponActivityDTO);
//添加优惠券活动优惠券

2
manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
View File

@ -49,7 +49,7 @@ public class CouponActivityManagerController {
@ApiOperation(value = "添加优惠券活动")
@PostMapping
@PutMapping(consumes = "application/json", produces = "application/json")
public ResultMessage<CouponActivity> addCouponActivity(@RequestBody CouponActivityDTO couponActivityDTO) {
public ResultMessage<CouponActivity> addCouponActivity(@RequestBody(required = false) CouponActivityDTO couponActivityDTO) {
couponActivityDTO.setPromotionStatus(PromotionStatusEnum.NEW.name());
return ResultUtil.data(couponActivityService.addCouponActivity(couponActivityDTO));
}