无关风月
2025-03-05 0ccd64289150070d798e6ee94589ac120e0539dc
引流平台
3个文件已修改
25 ■■■■ 已修改文件
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
@@ -70,7 +70,7 @@
    @ApiModelProperty(value = "平台手续费")
    private BigDecimal rechargeAmount;
    @ApiModelProperty(value = "引流平台")
    private String sourceName;
    private String tripartitePlatformName;
    @ApiModelProperty(value = "平台分佣")
    private BigDecimal sharingAmount;
    @ApiModelProperty(value = "开始时间")
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -173,6 +173,18 @@
            tChargingOrderExport.setStartType("扫码");
            tChargingOrderExport.setOne("小程序");
            if (chargingOrderListVO.getRechargePaymentType()!=null){
                if (chargingOrderListVO.getOrderSource()!=null&&chargingOrderListVO.getOrderSource().equals(2)){
                    if (chargingOrderListVO.getTripartitePlatformName().equals("XinDianTu")){
                        tChargingOrderExport.setTwo("新电途");
                        tChargingOrderExport.setOne("互联互通");
                    }
                    if (chargingOrderListVO.getTripartitePlatformName().equals("KuaiDian")){
                        tChargingOrderExport.setTwo("快电");
                        tChargingOrderExport.setOne("互联互通");
                    }
                }else{
                switch (chargingOrderListVO.getRechargePaymentType()){
                    case 1:
                        tChargingOrderExport.setTwo("微信小程序");
@@ -182,6 +194,8 @@
                        break;
                }
            }
            }
            if (chargingOrderListVO.getCreateTime()!=null){
                String s1 = DateUtils.localDateTimeToString(chargingOrderListVO.getCreateTime());
                tChargingOrderExport.setCreateTime(s1);
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -2928,8 +2928,8 @@
            }
            // 累加分佣
            if (tChargingOrder.getSharingAmount()!=null) {
                sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount());
            if (tChargingOrder.getOrderSource()==2) {
                sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
            }
            // 累加电费
            if (tChargingOrder.getElectrovalence()!=null) {
@@ -2937,8 +2937,11 @@
            }
            // 累加服务费
            if (tChargingOrder.getServiceCharge()!=null){
                if (tChargingOrder.getOrderSource()==2) {
                    serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN));
                }else{
                serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge());
                }
            }
            // 累加会员折扣
            if (tChargingOrder.getVipDiscountAmount()!=null){