chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备租期

Browse Source
This commit is contained in:
墨大叔 2024-08-06 10:38:17 +08:00
parent 62d4326103
commit 995a89b0dc
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
View File

@ -464,7 +464,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="renewalRentTime">
update sm_device
set rent_time = if(
now() > rent_time,
rent_time is null or now() > rent_time,
date_add(now(), interval #{seconds} second),
date_add(rent_time, interval #{seconds} second)
)

4
smart-switch-service/src/main/java/com/ruoyi/ss/receiveBill/service/impl/ReceiveBillServiceImpl.java
View File

@ -128,7 +128,7 @@ public class ReceiveBillServiceImpl implements ReceiveBillService
ServiceUtil.assertion(device == null || device.getDeviceId() == null, "设备不存在");
// 设备未过期，则不生成账单
if (device.getRentTime() != null && device.getRentTime().isAfter(LocalDateTime.now())) {
if (device.getRentTime() != null && device.getRentTime().isAfter(billTime)) {
return 1;
}
@ -159,7 +159,7 @@ public class ReceiveBillServiceImpl implements ReceiveBillService
bill.setReceivedAmount(amount);
Integer result = transactionTemplate.execute(status -> {
// 用户余额扣减
int subtract = userService.subtractBalance(mch.getUserId(), amount, true, bill.getDescription());
int subtract = userService.subtractBalance(mch.getUserId(), amount, false, bill.getDescription());
ServiceUtil.assertion(subtract != 1, "扣减商户余额失败");
// 插入账单

9
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
View File

@ -258,12 +258,12 @@ public class TransactionBillServiceImpl implements TransactionBillService {
// 根据服务费类型进行对应操作
// 月费
if (ServiceType.MONTH.getType().equals(serviceType)) {
int count = receiveBillService.genBillByMonthAndPay(bo, serviceRate);
ServiceUtil.assertion(count == 0, "商户出账失败，请刷新后重试");
// 服务费 = 0
order.setServiceCharge(BigDecimal.ZERO);
// 商户到账金额 = 交易金额
order.setArrivalAmount(order.getMoney());
int count = receiveBillService.genBillByMonthAndPay(bo, serviceRate);
ServiceUtil.assertion(count == 0, "商户出账失败，请刷新后重试");
}
// 设备订单比例
else if(ServiceType.PERCENT.getType().equals(serviceType)){
@ -309,6 +309,7 @@ public class TransactionBillServiceImpl implements TransactionBillService {
ChannelVO channel = bo.getChannel();
TransactionBill order = new TransactionBill();
bo.setOrder(order);
// 基础信息
order.setUserId(data.getUserId());
order.setSuitTime(data.getSuitTime());
@ -322,7 +323,7 @@ public class TransactionBillServiceImpl implements TransactionBillService {
order.setDeviceRechargeStatus(TransactionBillDeviceRechargeStatus.UN_RECHARGE.getStatus()); // 设备状态：未充值
// 设备信息
order.setDeviceId(device.getDeviceId());
order.setMchId(device.getUserId()); // 到账人ID
order.setMchId(mch.getUserId()); // 到账人ID
order.setDeviceName(device.getDeviceName());
order.setDeviceMac(device.getMac());
// 店铺信息
@ -333,7 +334,7 @@ public class TransactionBillServiceImpl implements TransactionBillService {
}
// 套餐信息
order.setSuitName(suit.getName());
// 用户信息
// 支付用户信息
order.setAccountNo(user.getWxOpenId());
// 渠道费用计算
order.setChannelCost(channel.getCostRate().multiply(order.getMoney()).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));