From 1ffb6c7910cfb4d55b4c169142b67ea872fcf614 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 27 六月 2023 19:55:50 +0800
Subject: [PATCH] BUG联调
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
index 74ff39c..8265d12 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
@@ -1,16 +1,18 @@
package com.ruoyi.member.service.impl.member;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
-import com.ruoyi.member.domain.pojo.member.MemberCoupon;
import com.ruoyi.member.mapper.member.MemberCouponMapper;
import com.ruoyi.member.service.member.MemberCouponService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
+import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
+import com.ruoyi.system.api.domain.vo.MerVerifyCouponGetVo;
+import com.ruoyi.system.api.service.RemoteGoodsService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Date;
import java.util.List;
/**
@@ -26,6 +28,9 @@
@Resource
private MemberCouponMapper memberCouponMapper;
+
+ @Resource
+ private RemoteGoodsService remoteGoodsService;
/**
* @description: TODO
@@ -47,7 +52,7 @@
* @return void
*/
@Override
- public void verifyCoupon(String verifyCoupon){
+ public MerVerifyCouponGetVo getVerifyCoupon(String verifyCoupon){
MemberCoupon memberCoupon = this.getById(verifyCoupon);
if(memberCoupon==null){
throw new ServiceException(AppErrorConstant.COUPON_NO_FIND);
@@ -62,9 +67,14 @@
if(memberCoupon.getCouponType()!=4){
throw new ServiceException(AppErrorConstant.COUPON_TYPE_ERROR);
}
- //更新优惠券为已使用
- memberCoupon.setCouponStatus(2);
- memberCoupon.setUseTime(new Date());
- this.saveOrUpdate(memberCoupon);
+ MerVerifyCouponGetVo merVerifyCouponGetVo = new MerVerifyCouponGetVo();
+ merVerifyCouponGetVo.setUserId(memberCoupon.getUserId());
+ merVerifyCouponGetVo.setMemberCoupon(memberCoupon);
+ String relGoodsIds = memberCoupon.getRelGoodsIds();
+ List<Goods> goodsList = remoteGoodsService.listGoodsByGoodsId(relGoodsIds).getData();
+ if(goodsList!=null){
+ merVerifyCouponGetVo.setGoodsList(goodsList);
+ }
+ return merVerifyCouponGetVo;
}
}
--
Gitblit v1.7.1