Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/dto/SplitOrderDTO.java

@@ -0,0 +1,32 @@
+package com.jsowell.pile.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 查询分润订单流水DTO
+ *
+ * @author Lemon
+ * @Date 2025/3/6 10:07:00
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class SplitOrderDTO {
+    private Integer pageNo;
+    private Integer pageSize;
+
+    /**
+     * 分润类型（1-直接分润；2-间接分润）
+     */
+    private Integer splitType;
+
+    /**
+     * 交易时间
+     */
+    private Integer tradeDate;
+
+}

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java

@@ -4,9 +4,11 @@ import com.jsowell.adapay.dto.PaymentConfirmParam;
 import com.jsowell.adapay.dto.SplitData;
 import com.jsowell.adapay.response.PaymentConfirmResponse;
 import com.jsowell.pile.domain.OrderSplitRecord;
+import com.jsowell.pile.dto.SplitOrderDTO;
 import com.jsowell.pile.vo.OrderInfoDetailVO;
 import com.jsowell.pile.vo.web.OrderSplitDailySummaryData;
 import com.jsowell.pile.vo.web.OrderSplitRecordVO;
+import com.jsowell.pile.vo.web.SplitOrdersInfoVO;
 
 import java.util.List;
 import java.util.Map;
@@ -59,5 +61,12 @@ public interface OrderSplitRecordService {
      * 查询时间段内的订单分账记录
      */
     List<OrderSplitDailySummaryData> queryOrderSplitData(String merchantId, String stationId, String startTime, String endTime);
+
+    /**
+     * 查询分润订单流水
+     * @param dto
+     * @return
+     */
+    List<SplitOrdersInfoVO> getSplitOrdersInfoList(SplitOrderDTO dto);
 }
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java

@@ -12,14 +12,12 @@ import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.domain.AdapayMemberAccount;
 import com.jsowell.pile.domain.OrderSplitRecord;
+import com.jsowell.pile.dto.SplitOrderDTO;
 import com.jsowell.pile.mapper.OrderSplitRecordMapper;
 import com.jsowell.pile.service.AdapayMemberAccountService;
 import com.jsowell.pile.service.OrderSplitRecordService;
 import com.jsowell.pile.vo.OrderInfoDetailVO;
-import com.jsowell.pile.vo.web.ExtraOrderIncomeVO;
-import com.jsowell.pile.vo.web.OrderSplitDailySummaryData;
-import com.jsowell.pile.vo.web.OrderSplitRecordVO;
-import com.jsowell.pile.vo.web.OtherSplitDetail;
+import com.jsowell.pile.vo.web.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -243,6 +241,16 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
         return resultList;
     }
 
+    /**
+     * 查询分润订单流水
+     * @param dto
+     * @return
+     */
+    @Override
+    public List<SplitOrdersInfoVO> getSplitOrdersInfoList(SplitOrderDTO dto) {
+        return null;
+    }
+
     /**
      * 根据merchantId, 查询从他人分账的金额
      * extra income

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitOrdersInfoVO.java

@@ -0,0 +1,53 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 订单分润流水VO
+ *
+ * @author Lemon
+ * @Date 2025/3/6 10:02:11
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class SplitOrdersInfoVO {
+    /**
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 结算金额
+     */
+    private String settlementAmount;
+
+    /**
+     * 分润类型
+     */
+    private String shareProfitType;
+
+    /**
+     * 电费分润比例
+     */
+    private String electricSplitScale;
+
+    /**
+     * 电费分润金额
+     */
+    private String electricSplitAmount;
+
+    /**
+     * 服务费分润比例
+     */
+    private String serviceSplitScale;
+
+    /**
+     * 服务费分润金额
+     */
+    private String serviceSplitAmount;
+}

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/XinYunPlatformServiceImpl.java

@@ -9,10 +9,7 @@ import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
 import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
-import com.jsowell.common.enums.ykc.OrderStatusEnum;
-import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum;
-import com.jsowell.common.enums.ykc.ReturnCodeEnum;
-import com.jsowell.common.enums.ykc.StartModeEnum;
+import com.jsowell.common.enums.ykc.*;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.JWTUtils;
@@ -267,6 +264,13 @@ public class XinYunPlatformServiceImpl implements ThirdPartyPlatformService {
                         info.setTotalMoney(new BigDecimal(realTimeMonitorData.getChargingAmount()));
 
                         ConnectorStatusInfos.add(info);
+                    }else {
+                        // 2025.3.6发现如果是已经充电完成，但是没拔枪的订单，缓存中会无数据，getChargingRealTimeData方法返回的结果为空，会少一条数据
+                        connectorStatusInfo = new ConnectorStatusInfo();
+                        connectorStatusInfo.setConnectorID(connectorInfoVO.getPileConnectorCode());
+                        connectorStatusInfo.setStatus(Integer.parseInt(PileConnectorStatusEnum.OCCUPIED_CHARGING.getValue()));
+
+                        ConnectorStatusInfos.add(connectorStatusInfo);
                     }
                 } else {
                     // 其他

jsowell-ui/src/router/index.js

@@ -186,7 +186,7 @@ export const constantRoutes = [
     children: [
       {
         path: "financeDetail",
-        component: () => import("@/views/financial/financeDetail"),
+        component: () => import("@/views/financial/financeDetail-新.vue"),
         name: "financeDetail",
         meta: { title: "财务详情", activeMenu: "/financial/merchant" },
       },