From 6b1f38f07a5d6a1b72e3260ba9135be51884de2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Fri, 16 Aug 2024 22:20:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/iot/receive/ReceiveController.java | 8 +- .../com/ruoyi/iot/service/IotService.java | 9 +- .../com/ruoyi/iot/service/IotServiceImpl.java | 15 +- .../iot/util/{Util.java => IotUtil.java} | 37 +++- .../ss/device/service/DeviceService.java | 11 +- .../service/impl/DeviceAssemblerImpl.java | 6 +- .../service/impl/DeviceServiceImpl.java | 38 +++-- .../com/ruoyi/ss/payBill/domain/PayBill.java | 6 + .../ss/payBill/mapper/PayBillMapper.java | 12 ++ .../ruoyi/ss/payBill/mapper/PayBillMapper.xml | 34 +++- .../service/impl/PayBillServiceImpl.java | 20 +-- .../domain/TransactionBillQuery.java | 3 - .../domain/vo/TransactionBillVO.java | 14 +- .../mapper/TransactionBillMapper.xml | 32 ++-- .../service/TransactionBillService.java | 11 ++ .../service/impl/RechargeDepositAfterPay.java | 3 + .../service/impl/RechargePayHandler.java | 1 - .../impl/TransactionBillServiceImpl.java | 159 +++++++++++++----- .../impl/TransactionBillValidatorImpl.java | 38 ++--- .../app/AppTransactionBillController.java | 69 +++++--- .../web/controller/ss/PayBillController.java | 15 ++ .../web/controller/ss/SmDeviceController.java | 10 +- 22 files changed, 393 insertions(+), 158 deletions(-) rename smart-switch-service/src/main/java/com/ruoyi/iot/util/{Util.java => IotUtil.java} (82%) diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/receive/ReceiveController.java b/smart-switch-service/src/main/java/com/ruoyi/iot/receive/ReceiveController.java index 63d9e7f7..d2d338c6 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/receive/ReceiveController.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/receive/ReceiveController.java @@ -6,7 +6,7 @@ import com.ruoyi.iot.domain.ReceiveBody; import com.ruoyi.iot.domain.ReceiveMsg; import com.ruoyi.iot.service.IotReceiveService; import com.ruoyi.iot.service.IotService; -import com.ruoyi.iot.util.Util; +import com.ruoyi.iot.util.IotUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -51,10 +51,10 @@ public class ReceiveController { @Anonymous public ResponseEntity receive(@RequestBody String body){ log.info("receive方法接收到参数: body String --- {}", body); - ReceiveBody obj = Util.resolveBody(body, false); + ReceiveBody obj = IotUtil.resolveBody(body, false); log.info("receive方法解析对象: body Object --- {}", JSON.toJSONString(obj)); if (obj != null){ - if (Util.checkSignature(obj, token)){ + if (IotUtil.checkSignature(obj, token)){ log.info("receive方法验证签名正确: content {}", JSON.toJSONString(obj)); Object msg = obj.getMsg(); log.info("receive方法-获取到消息体: msg--- {}", JSON.toJSONString(msg)); @@ -86,7 +86,7 @@ public class ReceiveController { @RequestParam(value = "signature") String signature) throws UnsupportedEncodingException { log.info("check方法接收到参数：: msg:{} nonce{} signature:{}",msg,nonce,signature); - if (Util.checkToken(msg,nonce,signature,token)){ + if (IotUtil.checkToken(msg,nonce,signature,token)){ return msg; }else { return "error"; diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java index 14fc3557..7f21b83a 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotService.java @@ -9,6 +9,7 @@ import com.ruoyi.iot.domain.response.CommandResponse; import com.ruoyi.ss.device.domain.Device; import com.ruoyi.ss.device.domain.enums.DeviceOnlineStatus; +import java.math.BigDecimal; import java.util.List; /** @@ -137,12 +138,12 @@ public interface IotService { int create(String mac, String productId); /** - * 设备添加电量 + * 设备添加电量（度） */ - CommandResponse addEle(String deviceName, int ele, String productId); + CommandResponse addEle(String deviceName, BigDecimal ele, String productId); /** - * 直接设置设备电量 + * 直接设置设备电量（度） */ - CommandResponse setEle(String deviceName, int ele, String productId); + CommandResponse setEle(String deviceName, BigDecimal ele, String productId); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java index f9c825c7..f8e8d0f1 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/service/IotServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; import java.util.Collections; import java.util.List; import java.util.Objects; @@ -192,19 +193,19 @@ public class IotServiceImpl implements IotService { @Override - public CommandResponse addEle(String deviceName, int ele, String productId) { - if (ele < 0) { + public CommandResponse addEle(String deviceName, BigDecimal ele, String productId) { + if (ele == null || ele.compareTo(BigDecimal.ZERO) < 0) { throw new ServiceException("充值电量错误：充值电量不允许小于0"); } - return sendCommand(deviceName, IotConstants.COMMAND_ADD_ELE + ele + IotConstants.COMMAND_SEPARATOR, 5, productId); + return sendCommand(deviceName, IotConstants.COMMAND_ADD_ELE + ele.multiply(BigDecimal.valueOf(1000)) + IotConstants.COMMAND_SEPARATOR, 5, productId); } @Override - public CommandResponse setEle(String deviceName, int ele, String productId) { - if (ele < 0) { - throw new ServiceException("充值电量错误：充值电量不允许小于0"); + public CommandResponse setEle(String deviceName, BigDecimal ele, String productId) { + if (ele == null) { + throw new ServiceException("设置电量错误：不允许为空"); } - return sendCommand(deviceName, IotConstants.COMMAND_SET_ELE + ele + IotConstants.COMMAND_SEPARATOR, 5, productId); + return sendCommand(deviceName, IotConstants.COMMAND_SET_ELE + ele.multiply(BigDecimal.valueOf(1000)) + IotConstants.COMMAND_SEPARATOR, 5, productId); } /** diff --git a/smart-switch-service/src/main/java/com/ruoyi/iot/util/Util.java b/smart-switch-service/src/main/java/com/ruoyi/iot/util/IotUtil.java similarity index 82% rename from smart-switch-service/src/main/java/com/ruoyi/iot/util/Util.java rename to smart-switch-service/src/main/java/com/ruoyi/iot/util/IotUtil.java index 298cacde..6dd3717e 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/iot/util/Util.java +++ b/smart-switch-service/src/main/java/com/ruoyi/iot/util/IotUtil.java @@ -11,7 +11,12 @@ import javax.crypto.*; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; import java.security.*; +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** @@ -20,9 +25,9 @@ import java.security.*; * Created by Roy on 2017/5/17. * */ -public class Util { +public class IotUtil { - private static Logger logger = LoggerFactory.getLogger(Util.class); + private static Logger logger = LoggerFactory.getLogger(IotUtil.class); private static MessageDigest mdInst; @@ -137,5 +142,33 @@ public class Util { return len; } + /** + * 解析设备字符串 + */ + public static Map parseDeviceStr(String str) { + // 使用 @ 符号分割字符串 + String[] parts = str.split("@"); + + // 创建一个 Map 来存储结果 + Map resultMap = new HashMap<>(); + + // 正则表达式，用于匹配数字 + Pattern pattern = Pattern.compile("[-+]?\\d*\\.\\d+|\\d+"); + + for (String part : parts) { + Matcher matcher = pattern.matcher(part); + if (matcher.find()) { + // 提取第一个匹配到的数字 + BigDecimal number = new BigDecimal(matcher.group()); + + // 从子字符串中提取键 + String key = part.substring(0, 1); // 假设键是子字符串的第一个字符 + + // 存储到 Map 中 + resultMap.put(key, number); + } + } + return resultMap; + } } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java index c0c66f2b..6888c0f8 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java @@ -285,15 +285,20 @@ public interface DeviceService /** * 清空设备时长、电量 */ - int clearTimeAndEle(DeviceVO device); + int clearTimeAndEle(DeviceVO device, boolean required); /** * 设备归零时长 */ - int resetTime(DeviceVO device); + int resetTime(DeviceVO device, boolean required); /** * 设备归零电量 */ - int resetEle(DeviceVO device); + int resetEle(DeviceVO device, boolean required); + + /** + * 归零电量 + */ + int resetEle(Long deviceId, boolean required); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceAssemblerImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceAssemblerImpl.java index d55f35cc..4bd0fc47 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceAssemblerImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceAssemblerImpl.java @@ -24,10 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -64,6 +61,7 @@ public class DeviceAssemblerImpl implements DeviceAssembler { for (DeviceVO device : list) { List deviceSuitList = group.get(device.getDeviceId()); if (deviceSuitList != null) { + deviceSuitList.sort(Comparator.comparing(o -> o.getSuit().getSort())); device.setSuitList(deviceSuitList.stream().map(DeviceSuitVO::getSuit).collect(Collectors.toList())); } else { device.setSuitList(Collections.emptyList()); diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java index 1f6564fc..91e95331 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java @@ -409,22 +409,22 @@ public class DeviceServiceImpl implements DeviceService } @Override - public int clearTimeAndEle(DeviceVO device) { + public int clearTimeAndEle(DeviceVO device, boolean required) { if (device == null) { return 0; } // 归零时长 - int resetTime = resetTime(device); + int resetTime = this.resetTime(device, required); // 归零剩余电量 - int resetEle = this.resetEle(device); + int resetEle = this.resetEle(device, required); return 1; } @Override - public int resetTime(DeviceVO device) { + public int resetTime(DeviceVO device, boolean required) { LocalDateTime now = LocalDateTime.now(); Integer result = transactionTemplate.execute(status -> { // 归零时间，将过期时间设置为现在 @@ -436,8 +436,14 @@ public class DeviceServiceImpl implements DeviceService ServiceUtil.assertion(update != 1, "修改设备时间失败"); // 物联网设备归零 - CommandResponse res = iotService.setTime(device.getMac(), 1L, device.getModelProductId()); - ServiceUtil.assertion(!res.isSuccess(), "设备归零失败，请检查设备是否在线或联系管理员"); + try { + CommandResponse res = iotService.setTime(device.getMac(), 1L, device.getModelProductId()); + ServiceUtil.assertion( !res.isSuccess(), "设备归零失败，请检查设备是否在线或联系管理员"); + } catch (Exception e) { + if (required) { + throw e; + } + } return update; }); @@ -455,7 +461,7 @@ public class DeviceServiceImpl implements DeviceService } @Override - public int resetEle(DeviceVO device) { + public int resetEle(DeviceVO device, boolean required) { if (device == null) { return 0; } @@ -473,8 +479,14 @@ public class DeviceServiceImpl implements DeviceService ServiceUtil.assertion(update != 1, "更新剩余电量失败"); // 直接设置电量为0 - CommandResponse res = iotService.setEle(device.getMac(), 0, device.getModelProductId()); - ServiceUtil.assertion(!res.isSuccess(), "归零电量失败，请检查设备是否在线或联系管理员"); + try { + CommandResponse res = iotService.setEle(device.getMac(), BigDecimal.valueOf(0), device.getModelProductId()); + ServiceUtil.assertion(!res.isSuccess(), "归零电量失败，请检查设备是否在线或联系管理员"); + } catch (Exception e) { + if (required) { + throw e; + } + } return update; }); @@ -488,6 +500,12 @@ public class DeviceServiceImpl implements DeviceService return result == null ? 0 : result; } + @Override + public int resetEle(Long deviceId, boolean required) { + DeviceVO device = selectSmDeviceByDeviceId(deviceId); + return resetEle(device, required); + } + @Override public boolean addTime(Long deviceId, long seconds, boolean withIot) { @@ -790,7 +808,7 @@ public class DeviceServiceImpl implements DeviceService // 关闭该设备未结束的所有订单 transactionBillService.batchEndBillByDevice(deviceId); - int reset = this.resetTime(device); + int reset = this.resetTime(device, true); ServiceUtil.assertion(reset != 1, "归零失败"); return reset; diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBill.java b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBill.java index 9643bb49..65d4afaf 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBill.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/domain/PayBill.java @@ -61,6 +61,12 @@ public class PayBill extends BaseEntity implements Payable @ApiModelProperty("渠道成本") private BigDecimal channelCost; + @ApiModelProperty("已退款金额") + private BigDecimal refundAmount; + + @ApiModelProperty("退款中金额") + private BigDecimal refundingAmount; + /** * 获取价格（分） */ diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.java index 8bfe7d47..23eda5ac 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.ss.payBill.mapper; +import java.math.BigDecimal; import java.util.List; import com.ruoyi.ss.payBill.domain.PayBill; import com.ruoyi.ss.payBill.domain.PayBillVO; @@ -77,5 +78,16 @@ public interface PayBillMapper */ int updatePayQuery(@Param("data") PayBill data, @Param("query") PayBillQuery query); + /** + * 增加退款金额 + * + * @param payId 支付订单ID + * @param amount 增加的退款金额 + */ + int addRefundingAmount(@Param("payId") Long payId, @Param("amount") BigDecimal amount); + /** + * 记录（转移）已退款金额 + */ + int recordRefundAmount(@Param("payId") Long payId, @Param("amount") BigDecimal amount); } diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.xml index 3ee20a00..bb74d2dc 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.xml +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/payBill/mapper/PayBillMapper.xml @@ -4,7 +4,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + + + select @@ -19,7 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spb.create_time, spb.description, spb.account, - spb.channel_cost + spb.channel_cost, + spb.refund_amount, + spb.refunding_amount from ss_pay_bill spb @@ -32,6 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spb.status = #{query.status} and spb.create_time >= #{query.startCreateTime} and spb.create_time <= #{query.endCreateTime} + + and spb.bst_id in + + #{item} + +