From 15041c37e21f29bb37acd5efd4ec1b9bba657c65 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 15 十月 2024 09:42:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java                            |   16 ++++++++++++++++
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java                     |    2 +-
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java |   20 ++++++++++++++++++++
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java          |   12 ++++++++----
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
index f46fc43..1ab909b 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
@@ -58,7 +58,7 @@
     @TableField("vip_id")
     private Integer vipId;
 
-    @ApiModelProperty(value = "1月卡2季卡3年卡")
+    @ApiModelProperty(value = "1月卡2季卡3年卡4集团")
     @TableField("vip_type")
     private Integer vipType;
 
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 382ce1d..0202131 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -158,6 +158,10 @@
     @ApiModelProperty(value = "退款流水号")
     @TableField("refund_code")
     private String refundCode;
+
+    @ApiModelProperty(value = "标题")
+    @TableField("title")
+    private String title;
     @ApiModelProperty(value = "退款原因")
     @TableField(exist = false)
     private String refundReason;
@@ -173,6 +177,18 @@
     @ApiModelProperty(value = "累计电费")
     @TableField("electrovalence")
     private BigDecimal electrovalence;
+    @ApiModelProperty(value = "电流")
+    @TableField("current")
+    private BigDecimal current;
+    @ApiModelProperty(value = "电压")
+    @TableField("voltage")
+    private BigDecimal voltage;
+    @ApiModelProperty(value = "电量")
+    @TableField("electricity")
+    private BigDecimal electricity;
+    @ApiModelProperty(value = "功率")
+    @TableField("power")
+    private BigDecimal power;
 
     @ApiModelProperty(value = "退款状态(1=退款中,2=退款成功)")
     @TableField("refund_status")
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
index d26dc29..4648622 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/listener/IotMessageListener.java
@@ -443,5 +443,25 @@
         String message = iotMessageProduce.sendMessage(platformStopCharging.getCharging_pile_code(), ServiceIdMenu.PLATFORM_STOP_CHARGING.getKey(),messageUtil.platformStopCharging(platformStopCharging));
         return R.ok(message);
     }
+    @ApiOperation(value = "计费模板下发",tags = {"硬件接口"})
+    @GetMapping(value = "/accountingStrategy")
+    public R accountingStrategy() {
+        String code = "3401231001200202";
+        String deviceId = "3401231001200202";
+        List<TAccountingStrategyDetail> accountingStrategyDetails = accountingStrategyDetailClient.getDetailListByCode(code).getData();
+        Map<Integer, TAccountingStrategyDetail> strategyPrice = StrategyUtil.getStrategyPrice(accountingStrategyDetails);
+        // 价格设置
+        AcquisitionBillingModeReply acquisitionBillingModeReply = new AcquisitionBillingModeReply();
+        StrategyUtil.setStrategyPrice(strategyPrice,acquisitionBillingModeReply);
+        // 时段设置
+        StrategyUtil.setTime(accountingStrategyDetails,acquisitionBillingModeReply);
+        TAccountingStrategyDetail accountingStrategyDetail = accountingStrategyDetailClient.getDetailByCode(code).getData();
+        acquisitionBillingModeReply.setBilling_model_code(accountingStrategyDetail.getId().toString());
+        acquisitionBillingModeReply.setCharging_pile_code(code);
+        acquisitionBillingModeReply.setLoss_ratio(BigDecimal.ZERO);
+        System.err.println(acquisitionBillingModeReply);
+        iotMessageProduce.sendMessage(deviceId, ServiceIdMenu.ACQUISITION_BILLING_MODE_REPLY.getKey(),messageUtil.acquisitionBillingModeReply(acquisitionBillingModeReply));
+        return R.ok();
+    }
 
 }
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java
index f999d66..261e9c7 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/utils/tools/StrategyUtil.java
@@ -36,25 +36,29 @@
     public static void setStrategyPrice(Map<Integer, TAccountingStrategyDetail> accountingStrategyDetails,AcquisitionBillingModeReply acquisitionBillingModeReply) {
         accountingStrategyDetails.forEach((k,v)->{
             BigDecimal electrovalence = v.getElectrovalence();
+            BigDecimal serviceCharge = v.getServiceCharge();
             if(Objects.isNull(electrovalence)){
                 electrovalence = BigDecimal.ZERO;
+            }
+            if(Objects.isNull(serviceCharge)){
+                serviceCharge = BigDecimal.ZERO;
             }
             switch (k){
                 case 1:
                     acquisitionBillingModeReply.setSharp_peak_electricity_rate(electrovalence);
-                    acquisitionBillingModeReply.setSharp_peak_service_rate(new BigDecimal(0));
+                    acquisitionBillingModeReply.setSharp_peak_service_rate(serviceCharge);
                     break;
                 case 2:
                     acquisitionBillingModeReply.setPeak_electricity_rate(electrovalence);
-                    acquisitionBillingModeReply.setPeak_service_rate(new BigDecimal(0));
+                    acquisitionBillingModeReply.setPeak_service_rate(serviceCharge);
                     break;
                 case 3:
                     acquisitionBillingModeReply.setFlat_peak_electricity_rate(electrovalence);
-                    acquisitionBillingModeReply.setFlat_peak_service_rate(new BigDecimal(0));
+                    acquisitionBillingModeReply.setFlat_peak_service_rate(serviceCharge);
                     break;
                 default:
                     acquisitionBillingModeReply.setLow_peak_electricity_rate(electrovalence);
-                    acquisitionBillingModeReply.setLow_peak_service_rate(new BigDecimal(0));
+                    acquisitionBillingModeReply.setLow_peak_service_rate(serviceCharge);
                     break;
             }
         });

--
Gitblit v1.7.1