Преглед на файлове

fix(charging): 修正服务费用计算时的小数舍入方式

- 将服务费用乘积后的舍入方式由四舍五入改为向下舍入
- 修正了ChargingReceptionServiceImpl中计算服务费的精度处理
- 确保服务费用计算结果保持一致性和准确性
wzq преди 1 ден
родител
ревизия
1aa286218d

+ 0 - 4
src/main/java/com/zsElectric/boot/business/model/entity/ChargeOrderInfo.java

@@ -28,10 +28,6 @@ public class ChargeOrderInfo extends BaseEntity {
      * 订单类型 0 个人订单 1 企业订单
      */
     private Integer orderType;
-    /**
-     * 集团订单所属当前集团编号
-     */
-    private Integer ecId;
     /**
      * 充电桩编号
      */

+ 1 - 4
src/main/java/com/zsElectric/boot/business/model/entity/UserAccountLog.java

@@ -40,10 +40,7 @@ public class UserAccountLog extends BaseEntity {
      * 账户类型(1个人账户,2企业)
      */
     private Integer accountType;
-    /**
-     * 商家编号
-     */
-    private Long ecId;
+
     /**
      * 变更前余额
      */

+ 1 - 2
src/main/java/com/zsElectric/boot/business/model/form/ChargeOrderInfoForm.java

@@ -34,8 +34,7 @@ public class ChargeOrderInfoForm implements Serializable {
     @Schema(description = "订单类型 1 个人订单 2 集团订单")
     private Integer orderType;
 
-    @Schema(description = "集团订单所属当前集团编号")
-    private Integer ecId;
+
 
     @Schema(description = "充电桩编号")
     @Size(max=255, message="充电桩编号长度不能超过255个字符")

+ 0 - 3
src/main/java/com/zsElectric/boot/business/model/form/UserAccountLogForm.java

@@ -41,9 +41,6 @@ public class UserAccountLogForm implements Serializable {
     @Schema(description = "账户类型(1个人账户,2集团账户)")
     private Integer accountType;
 
-    @Schema(description = "商家编号")
-    private Long ecId;
-
     @Schema(description = "变更前余额")
     private BigDecimal beforeBalance;
 

+ 0 - 2
src/main/java/com/zsElectric/boot/business/model/vo/ChargeOrderInfoVO.java

@@ -30,8 +30,6 @@ public class ChargeOrderInfoVO implements Serializable {
     private Long userId;
     @Schema(description = "订单类型 1 个人订单 2 集团订单")
     private Integer orderType;
-    @Schema(description = "集团订单所属当前集团编号")
-    private Integer ecId;
     @Schema(description = "充电桩编号")
     private String equipmentId;
     @Schema(description = "第三方充电订单号")

+ 1 - 2
src/main/java/com/zsElectric/boot/business/model/vo/UserAccountLogVO.java

@@ -34,8 +34,7 @@ public class UserAccountLogVO implements Serializable {
     private Long changeId;
     @Schema(description = "账户类型(1个人账户,2集团账户)")
     private Integer accountType;
-    @Schema(description = "商家编号")
-    private Long ecId;
+
     @Schema(description = "变更前余额")
     private BigDecimal beforeBalance;
     @Schema(description = "变更余额")

+ 1 - 0
src/main/java/com/zsElectric/boot/business/service/impl/ChargeOrderInfoServiceImpl.java

@@ -192,6 +192,7 @@ public class ChargeOrderInfoServiceImpl extends ServiceImpl<ChargeOrderInfoMappe
             ChargeOrderInfo chargeOrderInfo = new ChargeOrderInfo();
 
             chargeOrderInfo.setUserId(userId);
+            chargeOrderInfo.setConnectorId(formData.getConnectorId());
             chargeOrderInfo.setEquipmentId(formData.getEquipmentId());
             chargeOrderInfo.setEquipAuthSeq(equipAuthSeq);
             chargeOrderInfo.setChargeOrderNo(chargeOrderNo);

+ 0 - 2
src/main/resources/mapper/business/ChargeOrderInfoMapper.xml

@@ -8,7 +8,6 @@
                 id,
                 user_id,
                 order_type,
-                ec_id,
                 equipment_id,
                 charge_order_no,
                 start_time,
@@ -82,7 +81,6 @@
         id,
         user_id,
         order_type,
-        ec_id,
         equipment_id,
         charge_order_no,
         start_time,

+ 0 - 1
src/main/resources/mapper/business/UserAccountLogMapper.xml

@@ -11,7 +11,6 @@
                 change_note,
                 change_id,
                 account_type,
-                ec_id,
                 before_balance,
                 change_balance,
                 create_time