From 7113914ccd7d5c2575977e46bcc493c1d47be8ee Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 18 Jun 2021 14:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E4=BA=92=E5=AF=B9=E8=B1=A1=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/dto/CouponActivityDTO.java         |  5 +++++
 .../promotion/entity/dto/MemberDTO.java       | 22 +++++++++++++++++++
 .../CouponActivityItemServiceImpl.java        |  5 ++++-
 .../CouponActivityServiceImpl.java            |  5 +++++
 .../CouponActivityManagerController.java      |  2 +-
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 framework/src/main/java/cn/lili/modules/promotion/entity/dto/MemberDTO.java

diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java
index 0e997819..888edc6e 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java
@@ -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;
 }
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/MemberDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/MemberDTO.java
new file mode 100644
index 00000000..c7d40695
--- /dev/null
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/MemberDTO.java
@@ -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;
+}
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
index b5993abc..24cf0b7b 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java
@@ -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);
     }
 }
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
index 8bf5734f..10ae007f 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
@@ -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);
         //添加优惠券活动优惠券
diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
index 859db064..2ca35d8b 100644
--- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
@@ -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));
     }