update

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java

@@ -15,6 +15,7 @@ import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.domain.PileMerchantInfo;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.service.OrderBasicInfoService;
+import com.jsowell.pile.service.OrderSplitRecordService;
 import com.jsowell.pile.service.PileMerchantInfoService;
 import com.jsowell.pile.service.PileStationInfoService;
 import com.jsowell.pile.util.UserUtils;
@@ -50,6 +51,9 @@ public class OrderBasicInfoController extends BaseController {
 	@Autowired
 	private PileStationInfoService pileStationInfoService;
 
+	@Autowired
+	private OrderSplitRecordService orderSplitRecordService;
+
 	/**
 	 * 查询订单列表
 	 * 订单列表页，带数据权限校验
@@ -224,4 +228,21 @@ public class OrderBasicInfoController extends BaseController {
 		}
 		return response;
 	}
+
+	/**
+	 * 查询订单分账数据
+	 * @param dto
+	 * @return
+	 */
+	@PostMapping("/queryOrderSplitData")
+	public RestApiResponse<?> queryOrderSplitData(@RequestBody QueryOrderSplitDTO dto) {
+		RestApiResponse<?> response = null;
+		try {
+			orderSplitRecordService.queryOrderSplitData(dto);
+		} catch (Exception e) {
+
+		}
+		logger.info("查询订单分账数据 params:{}, result:{}", JSON.toJSONString(dto), response);
+		return response;
+	}
 }

jsowell-admin/src/main/resources/application-dev.yml

@@ -247,3 +247,8 @@ parking:
     parkId: 61578
     # 机构ID(分配)
     orgId: BTTEST01
+
+# 充电算法平台配置
+chargeAlgorithm:
+  url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
+  clientId: e488bac5f70b496fa2d82065089e5f81

jsowell-admin/src/main/resources/application-prd.yml

@@ -242,3 +242,8 @@ parking:
     parkId: 66291
     # 机构ID(分配)
     orgId: DCWYPROD20250210
+
+# 充电算法平台配置
+chargeAlgorithm:
+  url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
+  clientId: e488bac5f70b496fa2d82065089e5f81

jsowell-admin/src/main/resources/application-sit.yml

@@ -245,3 +245,8 @@ parking:
     parkId: 61578
     # 机构ID(分配)
     orgId: BTTEST01
+
+# 充电算法平台配置
+chargeAlgorithm:
+  url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
+  clientId: e488bac5f70b496fa2d82065089e5f81

jsowell-admin/src/main/resources/application.yml

@@ -126,3 +126,8 @@ wulian:
     getSimInfo: api.v2.card.info
     WuLianSimRenew: api.v2.order.renew
 
+# 充电算法平台配置
+chargeAlgorithm:
+  url: http://150.158.199.92:58910/gateway/api/user/battery/algorithm/json
+  clientId: e488bac5f70b496fa2d82065089e5f81
+

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

@@ -0,0 +1,44 @@
+package com.jsowell.pile.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 查询订单分润DTO
+ *
+ * @author Lemon
+ * @Date 2025/4/11 10:15:51
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class QueryOrderSplitDTO {
+    private int pageNo;
+    private int pageSize;
+
+    /**
+     * 站点id
+     */
+    private String stationId;
+
+    /**
+     * 汇付会员id
+     */
+    private String adapayMemberId;
+
+    /**
+     * 开始时间
+     * 默认本月1号
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     * 默认今天日期
+     */
+    private String endTime;
+
+}

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java

@@ -1,6 +1,8 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.OrderSplitRecord;
+import com.jsowell.pile.dto.QueryOrderSplitDTO;
+import com.jsowell.pile.vo.web.OrderSplitRecordVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -41,4 +43,6 @@ public interface OrderSplitRecordMapper {
     List<OrderSplitRecord> queryByOrderCodeList(@Param("orderCodeList") List<String> orderCodeList);
 
     List<OrderSplitRecord> queryOrderSplitRecordByMemberId(@Param("adapayMemberId") String adapayMemberId, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    List<OrderSplitRecordVO> queryOrderSplitData(@Param("dto") QueryOrderSplitDTO dto);
 }

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

@@ -4,6 +4,7 @@ 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.QueryOrderSplitDTO;
 import com.jsowell.pile.dto.SplitOrderDTO;
 import com.jsowell.pile.vo.OrderInfoDetailVO;
 import com.jsowell.pile.vo.web.OrderSplitDailySummaryData;
@@ -69,8 +70,10 @@ public interface OrderSplitRecordService {
      */
     List<SplitOrdersInfoVO> getSplitOrdersInfoList(SplitOrderDTO dto);
 
+    public List<OrderSplitRecordVO> queryOrderSplitData(QueryOrderSplitDTO dto);
+
     /**
-     * 根据汇付会员id查询时间段内东单分账记录
+     * 根据汇付会员id查询时间段内订单分账记录
      */
     List<OrderSplitRecord> queryOrderSplitRecordByMemberId(String adapayMemberId, String startTime, String endTime);
 }

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

@@ -12,6 +12,7 @@ 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.QueryOrderSplitDTO;
 import com.jsowell.pile.dto.SplitOrderDTO;
 import com.jsowell.pile.mapper.OrderSplitRecordMapper;
 import com.jsowell.pile.service.AdapayMemberAccountService;
@@ -251,6 +252,20 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
         return null;
     }
 
+    /**
+     * 后管页面查询某站点下订单分账数据
+     * @param dto
+     * @return
+     */
+    @Override
+    public List<OrderSplitRecordVO> queryOrderSplitData(QueryOrderSplitDTO dto) {
+        List<OrderSplitRecordVO> orderSplitRecordVOS = orderSplitRecordMapper.queryOrderSplitData(dto);
+        // 根据 orderCode 分组
+        Map<String, List<OrderSplitRecordVO>> collect = orderSplitRecordVOS.stream()
+                .collect(Collectors.groupingBy(OrderSplitRecordVO::getOrderCode));
+        return null;
+    }
+
     @Override
     public List<OrderSplitRecord> queryOrderSplitRecordByMemberId(String adapayMemberId, String startTime, String endTime) {
         return orderSplitRecordMapper.queryOrderSplitRecordByMemberId(adapayMemberId, startTime, endTime);

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

@@ -11,6 +11,22 @@ public class OrderSplitRecordVO {
      */
     private String orderCode;
 
+    /**
+     * 站点id
+     */
+    private String stationId;
+
+    /**
+     * 订单金额
+     */
+    private String orderAmount;
+
+    /**
+     * 手续费
+     * 不承担手续费的账户为0
+     */
+    private String feeAmount;
+
     /**
      * 分账状态
      */

jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml

@@ -799,4 +799,25 @@
       #{item}
     </foreach>
   </select>
+
+  <select id="queryOrderSplitData" resultType="com.jsowell.pile.vo.web.OrderSplitRecordVO">
+    SELECT
+      t1.order_code AS orderCode,
+      t1.station_id AS stationId,
+      t2.order_amount AS orderAmount,
+      t1.settle_amount AS settleAmount,
+      t1.adapay_member_id AS adapayMemberId,
+      t1.electricity_split_ratio AS electricitySplitRatio,
+      t1.electricity_split_amount AS electricitySplitAmount,
+      t1.service_split_ratio AS serviceSplitRatio,
+      t1.service_split_amount AS serviceSplitAmount,
+      t1.fee_amount AS feeAmount
+    FROM
+      order_split_record t1
+        JOIN order_basic_info t2 ON t1.order_code = t2.order_code
+        AND t1.del_flag = '0'
+    WHERE
+      t1.station_id = #{dto.stationId,jdbcType=VARCHAR}
+      AND t1.trade_date BETWEEN #{dto.startTime,jdbcType=VARCHAR} AND #{dto.endTime,jdbcType=VARCHAR}
+  </select>
 </mapper>