zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小班进入考试周修改

Browse Source 
优惠券修改
This commit is contained in:
wuchunlei
2024-10-30 16:14:23 +08:00
parent d5d22ae2d9
commit 1e71f8280b
6 changed files with 163 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/peanut/modules/common/controller/CouponController.java
View File

@@ -13,6 +13,7 @@ import com.peanut.modules.master.service.CourseService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -58,6 +59,8 @@ public class CouponController {
Page<CouponEntity> couponPage = couponService.page(new Page<>(page, limit), wrapper);
for (CouponEntity couponEntity : couponPage.getRecords()) {
couponService.setRangeList(couponEntity);
couponEntity.setGrantCount(couponHistoryService.count(new LambdaQueryWrapper<CouponHistory>()
.eq(CouponHistory::getCouponId,couponEntity.getId())));
}
return R.ok().put("couponPage",couponPage);
}
@@ -122,21 +125,13 @@ public class CouponController {
//修改优惠劵
@RequestMapping("/updateCoupon")
public R updateCoupon(@RequestBody CouponEntity couponEntity){
int count = couponHistoryService.count(new LambdaQueryWrapper<CouponHistory>()
.eq(CouponHistory::getCouponId,couponEntity.getId()));
if (count>0){
return R.error("已有用户拥有优惠券");
}
CouponEntity c = couponService.getById(couponEntity.getId());
if (c.getCurrentState()==0){
return R.error("优惠券发放中，请先结束再修改");
}
couponService.updateById(couponEntity);
return R.ok();
}
//删除优惠劵
@RequestMapping("/delCoupon")
@Transactional
public R delCoupon(@RequestBody Map<String,Object> params){
int couponId = Integer.parseInt(params.get("id").toString());
int count = couponHistoryService.count(new LambdaQueryWrapper<CouponHistory>()
@@ -149,6 +144,12 @@ public class CouponController {
return R.error("优惠券发放中，请先结束再删除");
}
couponService.removeById(couponId);
//删除优惠券商品绑定
List<CouponToProduct> ctps = couponToProductService.list(new LambdaQueryWrapper<CouponToProduct>()
.eq(CouponToProduct::getCouponId,couponId));
for (CouponToProduct ctp:ctps){
couponToProductService.removeById(ctp.getId());
}
return R.ok();
}

2
src/main/java/com/peanut/modules/common/entity/CouponEntity.java
View File

@@ -67,6 +67,8 @@ public class CouponEntity {
@TableLogic
private Integer delFlag;
@TableField(exist = false)
private int grantCount;
@TableField(exist = false)
private List<Object> rangeList;
@TableField(exist = false)

9
src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
View File

@@ -333,15 +333,6 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
Date startTime = new Date();
classEntity.setStartTime(startTime);
this.getBaseMapper().updateById(classEntity);
if (classModel.getIsExam()==1){
//根据设置的天数将班级状态从进行中设置成考试中
rabbitTemplate.convertAndSend(
DelayQueueConfig.COMMON_EXCHANGE,
DelayQueueConfig.COMMON_ROUTING_KEY,
"examDays"+","+classEntity.getId(),
messagePostProcessor((classModel.getDays()-classModel.getExamDays())*24*60*60*1000)
);
}
return R.ok();
}

61
src/main/java/com/peanut/modules/common/service/impl/CouponServiceImpl.java
View File

@@ -72,44 +72,39 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, CouponEntity> impl
@Override
public R insertCouponHistory(int couponId, int userId,int getType,String remark) {
CouponEntity couponEntity = couponDao.selectById(couponId);
int historyCount = couponHistoryDao.selectCount(new LambdaQueryWrapper<CouponHistory>()
.eq(CouponHistory::getCouponId,couponId));
//是否超出总发行量
if (historyCount<couponEntity.getTotalCirculation()){
List<CouponHistory> historyList = couponHistoryDao.selectList(new LambdaQueryWrapper<CouponHistory>()
.eq(CouponHistory::getUserId,userId)
if (couponEntity.getCurrentState()==0){
int historyCount = couponHistoryDao.selectCount(new LambdaQueryWrapper<CouponHistory>()
.eq(CouponHistory::getCouponId,couponId));
//是否超出可持有张数
if (historyList.size()<couponEntity.getLimitedCollar()){
CouponHistory couponHistory = new CouponHistory();
couponHistory.setCouponId(couponId);
couponHistory.setUserId(userId);
couponHistory.setGetType(getType);
couponHistory.setRemark(remark);
couponHistory.setEffectType(couponEntity.getEffectType());
if (couponEntity.getEffectType()==1){
couponHistory.setStartTime(new Date());
couponHistory.setEndTime(DateUtils.addDateDays(new Date(),couponEntity.getValidity()));
}else if (couponEntity.getEffectType()==2){
couponHistory.setStartTime(couponEntity.getEffectTime());
couponHistory.setEndTime(couponEntity.getExpireTime());
//是否超出总发行量
if (historyCount<couponEntity.getTotalCirculation()){
List<CouponHistory> historyList = couponHistoryDao.selectList(new LambdaQueryWrapper<CouponHistory>()
.eq(CouponHistory::getUserId,userId)
.eq(CouponHistory::getCouponId,couponId));
//是否超出可持有张数
if (historyList.size()<couponEntity.getLimitedCollar()){
CouponHistory couponHistory = new CouponHistory();
couponHistory.setCouponId(couponId);
couponHistory.setUserId(userId);
couponHistory.setGetType(getType);
couponHistory.setRemark(remark);
couponHistory.setEffectType(couponEntity.getEffectType());
if (couponEntity.getEffectType()==1){
couponHistory.setStartTime(new Date());
couponHistory.setEndTime(DateUtils.addDateDays(new Date(),couponEntity.getValidity()));
}else if (couponEntity.getEffectType()==2){
couponHistory.setStartTime(couponEntity.getEffectTime());
couponHistory.setEndTime(couponEntity.getExpireTime());
}
couponHistoryDao.insert(couponHistory);
return R.ok();
}else {
return R.error("每人限领"+couponEntity.getLimitedCollar()+"张");
}
couponHistoryDao.insert(couponHistory);
if (couponEntity.getEffectType()!=0){
//发放完优惠卷设置过期
rabbitTemplate.convertAndSend(
DelayQueueConfig.COMMON_EXCHANGE,
DelayQueueConfig.COMMON_ROUTING_KEY,
"couponExpire"+","+couponHistory.getId(),
messagePostProcessor(couponHistory.getEndTime().getTime()-new Date().getTime())
);
}
return R.ok();
}else {
return R.error("每人限领"+couponEntity.getLimitedCollar()+"张");
return R.error("优惠券已放完");
}
}else {
return R.error("优惠券已放完");
return R.error("优惠券暂未开始发放");
}
}
private MessagePostProcessor messagePostProcessor(long date) {