修改
This commit is contained in:
@@ -7,6 +7,7 @@ import com.aliyun.dysmsapi20170525.models.SendSmsResponseBody;
|
|||||||
import com.aliyun.tea.TeaException;
|
import com.aliyun.tea.TeaException;
|
||||||
import com.aliyun.teautil.Common;
|
import com.aliyun.teautil.Common;
|
||||||
import com.aliyun.teautil.models.RuntimeOptions;
|
import com.aliyun.teautil.models.RuntimeOptions;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import com.peanut.common.utils.R;
|
import com.peanut.common.utils.R;
|
||||||
import com.peanut.config.DelayQueueConfig;
|
import com.peanut.config.DelayQueueConfig;
|
||||||
@@ -223,13 +224,20 @@ public class MyUserServiceImpl extends ServiceImpl<MyUserDao, MyUserEntity> impl
|
|||||||
|
|
||||||
Integer isSale = book.getIsSale();
|
Integer isSale = book.getIsSale();
|
||||||
|
|
||||||
if (isSale == 1) {
|
if(!ObjectUtils.isEmpty(coupon)){
|
||||||
salePrice = book.getSalePrice().subtract(coupon.getCouponAmount());
|
if (isSale == 1) {
|
||||||
}else {
|
salePrice = book.getSalePrice().subtract(coupon.getCouponAmount());
|
||||||
salePrice = book.getPrice().subtract(coupon.getCouponAmount());
|
}else {
|
||||||
|
salePrice = book.getPrice().subtract(coupon.getCouponAmount());
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
if (isSale == 1) {
|
||||||
|
salePrice = book.getSalePrice();
|
||||||
|
}else {
|
||||||
|
salePrice = book.getPrice();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//查询用户
|
//查询用户
|
||||||
MyUserEntity user = this.getById(Integer.valueOf(userId));
|
MyUserEntity user = this.getById(Integer.valueOf(userId));
|
||||||
Double peanutCoin = user.getPeanutCoin() - salePrice.doubleValue();
|
Double peanutCoin = user.getPeanutCoin() - salePrice.doubleValue();
|
||||||
@@ -273,10 +281,12 @@ public class MyUserServiceImpl extends ServiceImpl<MyUserDao, MyUserEntity> impl
|
|||||||
userEbookBuyEntity.setPayType("point");
|
userEbookBuyEntity.setPayType("point");
|
||||||
userEbookBuyEntity.setPayTime(new Date());
|
userEbookBuyEntity.setPayTime(new Date());
|
||||||
userEbookBuyService.save(userEbookBuyEntity);
|
userEbookBuyService.save(userEbookBuyEntity);
|
||||||
|
if(!ObjectUtils.isEmpty(coupon)){
|
||||||
|
CouponHistoryEntity historyEntity = this.couponHistoryService.getOne(new QueryWrapper<CouponHistoryEntity>().eq("member_id", userId).eq("coupon_id", couponId));
|
||||||
|
historyEntity.setUseStatus(2);
|
||||||
|
this.couponHistoryService.updateById(historyEntity);
|
||||||
|
}
|
||||||
|
|
||||||
CouponHistoryEntity historyEntity = this.couponHistoryService.getOne(new QueryWrapper<CouponHistoryEntity>().eq("member_id", userId).eq("coupon_id", couponId));
|
|
||||||
historyEntity.setUseStatus(2);
|
|
||||||
this.couponHistoryService.updateById(historyEntity);
|
|
||||||
|
|
||||||
return "购买成功!";
|
return "购买成功!";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user