|
@@ -14,7 +14,6 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
-import java.util.Collections;
|
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
@@ -102,11 +101,11 @@ public class SysUserBillServiceImpl implements ISysUserBillService {
|
|
/**
|
|
/**
|
|
* 增加收入流水
|
|
* 增加收入流水
|
|
*
|
|
*
|
|
- * @param userId userId
|
|
|
|
- * @param title 账单标题
|
|
|
|
- * @param number 明细数字
|
|
|
|
- * @param balance 剩余
|
|
|
|
- * @param remark 备注
|
|
|
|
|
|
+ * @param userId userId
|
|
|
|
+ * @param title 账单标题
|
|
|
|
+ * @param number 明细数字
|
|
|
|
+ * @param balance 剩余
|
|
|
|
+ * @param remark 备注
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -151,6 +150,9 @@ public class SysUserBillServiceImpl implements ISysUserBillService {
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
SysMember sysMember = sysMemberMapper.selectSysMemberById(dto.getId());
|
|
SysMember sysMember = sysMemberMapper.selectSysMemberById(dto.getId());
|
|
|
|
+ if (sysMember.getIntegral().compareTo(dto.getIntegral()) < 0) {
|
|
|
|
+ throw new RuntimeException("积分不足");
|
|
|
|
+ }
|
|
BigDecimal surplusIntegral = sysMember.getIntegral().subtract(dto.getIntegral());
|
|
BigDecimal surplusIntegral = sysMember.getIntegral().subtract(dto.getIntegral());
|
|
expend(dto.getId(), "会员兑换", dto.getIntegral(), surplusIntegral, sdf.format(date) + "消耗" + dto.getIntegral() + "积分," + "兑换" + dto.getGiftName() + "成功");
|
|
expend(dto.getId(), "会员兑换", dto.getIntegral(), surplusIntegral, sdf.format(date) + "消耗" + dto.getIntegral() + "积分," + "兑换" + dto.getGiftName() + "成功");
|
|
sysMember.setIntegral(surplusIntegral);
|
|
sysMember.setIntegral(surplusIntegral);
|