From f4773fec3be393e75f9e80c8116b682f14801088 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 23 五月 2024 15:48:19 +0800
Subject: [PATCH] 写用户端接口
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java | 5 ++
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java | 3 +
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java | 7 +++
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java | 13 ++++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java | 11 +++++
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java | 20 ++++++++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java | 2 +
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java | 27 +++++++++++++
8 files changed, 87 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
index 5c1456f..ea08a92 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/MemberAddressController.java
@@ -82,4 +82,15 @@
iMemberAddressService.addMemberAddress(memberAddressDTO);
return R.ok();
}
+
+ @PostMapping("/delMemberAddress")
+ @ResponseBody
+ @ApiOperation(value = "用户删除地址")
+ public R<T> delMemberAddress(MemberAddressDTO memberAddressDTO) {
+ iMemberAddressService.delMemberAddress(memberAddressDTO);
+ return R.ok();
+ }
+
+
+
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java
index dc67b0b..2f267e9 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/IMemberAddressService.java
@@ -18,4 +18,6 @@
List<MemberAddress> getMemberAddressList(MemberAddressDTO memberAddressDTO);
void addMemberAddress(MemberAddressDTO memberAddressDTO);
+
+ void delMemberAddress(MemberAddressDTO memberAddressDTO);
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
index cf8affc..ac3324b 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberAddressServiceImpl.java
@@ -59,7 +59,12 @@
memberAddress.setRecipientPhone(memberAddressDTO.getRecipientPhone());
memberAddress.setDetailedAddress(memberAddressDTO.getDetailedAddress());
memberAddress.setIsDefault(memberAddressDTO.getIsDefault());
- iMemberAddressService.save(memberAddress);
+ iMemberAddressService.saveOrUpdate(memberAddress);
}
+
+ @Override
+ public void delMemberAddress(MemberAddressDTO memberAddressDTO) {
+ iMemberAddressService.removeById(memberAddressDTO.getId());
+ }
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java
index 344fd49..50edc05 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/CouponMemberController.java
@@ -1,9 +1,19 @@
package com.ruoyi.promotion.controller;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
+import com.ruoyi.promotion.domain.pojo.CouponMember;
+import com.ruoyi.promotion.service.ICouponMemberService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -17,4 +27,14 @@
@RequestMapping("/coupon-member")
public class CouponMemberController {
+ @Resource
+ private ICouponMemberService iCouponMemberService;
+
+ @PostMapping("/getCouponMemberList")
+ @ResponseBody
+ @ApiOperation(value = "获取用户优惠卷")
+ public R<List<CouponMember>> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
+ return R.ok(iCouponMemberService.getCouponMemberList(couponMemberDTO));
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
index 7b9ec22..f439f56 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.promotion.domain.pojo.PromotionVideo;
import com.ruoyi.promotion.service.IPromotionVideoService;
import java.util.List;
@@ -29,6 +30,7 @@
private IPromotionVideoService iPromotionVideoService;
@PostMapping("/getPromotionVideoList")
+ @InnerAuth
public R<List<PromotionVideo>> getPromotionVideoList() {
List<PromotionVideo> list = iPromotionVideoService.list(new LambdaQueryWrapper<PromotionVideo>().eq(PromotionVideo::getDelFlag,0));
return R.ok(list);
@@ -37,6 +39,7 @@
@PostMapping("/getPromotionVideoOne")
@ResponseBody
+ @InnerAuth
public R<PromotionVideo> getPromotionVideoOne(@RequestBody Long promotionVideoId) {
PromotionVideo promotionVideoOne=iPromotionVideoService.getById(promotionVideoId);
return R.ok(promotionVideoOne);
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java
new file mode 100644
index 0000000..1419fd0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/dto/CouponMemberDTO.java
@@ -0,0 +1,13 @@
+package com.ruoyi.promotion.controller.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CouponMemberDTO {
+ @ApiModelProperty(value = "会员id")
+ private Long memberId;
+
+ @ApiModelProperty(value = "优惠券状态-1删除0已过期1已领取2已使用")
+ private Integer couponStatus;
+}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
index 7e4a567..141037c 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
@@ -1,7 +1,10 @@
package com.ruoyi.promotion.service;
+import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +16,6 @@
*/
public interface ICouponMemberService extends IService<CouponMember> {
+ List<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO);
+
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
index c087358..c12eec3 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
@@ -1,10 +1,18 @@
package com.ruoyi.promotion.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.promotion.controller.dto.CouponMemberDTO;
import com.ruoyi.promotion.domain.pojo.CouponMember;
+import com.ruoyi.promotion.domain.pojo.PromotionBanner;
import com.ruoyi.promotion.mapper.CouponMemberMapper;
import com.ruoyi.promotion.service.ICouponMemberService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -17,4 +25,23 @@
@Service
public class CouponMemberServiceImpl extends ServiceImpl<CouponMemberMapper, CouponMember> implements ICouponMemberService {
+ @Resource
+ private ICouponMemberService iCouponMemberService;
+ @Override
+ public List<CouponMember> getCouponMemberList(CouponMemberDTO couponMemberDTO) {
+ LambdaQueryWrapper<CouponMember> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(CouponMember::getCouponStatus,1);
+ wrapper.eq(CouponMember::getDelFlag,0);
+ List<CouponMember> couponMemberList=iCouponMemberService.list(wrapper);
+ for (CouponMember couponMember:couponMemberList){
+ if(LocalDateTime.now().isAfter(couponMember.getEndDate())){
+ couponMember.setCouponStatus(0);
+ iCouponMemberService.updateById(couponMember);
+ }
+ }
+ LambdaQueryWrapper<CouponMember> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(CouponMember::getCouponStatus,couponMemberDTO.getCouponStatus());
+ wrapper1.eq(CouponMember::getDelFlag,0);
+ return iCouponMemberService.list(wrapper1);
+ }
}
--
Gitblit v1.7.1