add 新增 根据订单号查询订单分账信息接口

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

@@ -291,4 +291,24 @@ public class OrderBasicInfoController extends BaseController {
 		return response;
 	}
 
+
+	/**
+	 * 根据订单号查询订单分账信息
+	 * @param request
+	 * @param orderCode
+	 * @return
+	 */
+	@GetMapping("/queryOrderSplitDetail/{orderCode}")
+	public RestApiResponse<?> queryOrderSplitDetail(HttpServletRequest request, @PathVariable("orderCode") String orderCode) {
+		RestApiResponse<?> response = null;
+		try {
+			orderSplitRecordService.queryOrderSplitDetail(orderCode);
+		} catch (Exception e) {
+			logger.error("根据订单号查询订单分账信息 error", e);
+			response = new RestApiResponse<>(e);
+		}
+		logger.info("根据订单号查询订单分账信息 params:{}, result:{}", orderCode, response);
+		return response;
+	}
+
 }

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

@@ -85,5 +85,12 @@ public interface OrderSplitRecordService {
     List<SplitAggregateDataVO> queryStationAggregateData(QueryOrderSplitDTO dto);
 
     List<SplitConfigOrderVO> queryStationAggregateData(SplitConfigStationDTO dto);
+
+    /**
+     * 根据订单号查询订单分账信息
+     * @param orderCode
+     * @return
+     */
+    List<SplitRecordInfoVO> queryOrderSplitDetail(String orderCode);
 }
 

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

@@ -452,6 +452,52 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
         return resultList;
     }
 
+    /**
+     * 根据订单号查询订单分账信息
+     * @param orderCode
+     * @return
+     */
+    @Override
+    public List<SplitRecordInfoVO> queryOrderSplitDetail(String orderCode) {
+        List<SplitRecordInfoVO> resultList = new ArrayList<>();
+
+        List<OrderSplitRecordVO> orderSplitRecordVOS = orderSplitRecordMapper.queryOrderSplitData(Lists.newArrayList(orderCode));
+        SplitRecordInfoVO vo = SplitRecordInfoVO.builder()
+                .orderCode(orderCode)
+                .orderAmount(orderSplitRecordVOS.get(0).getOrderAmount())
+                .settleAmount(String.valueOf(orderSplitRecordVOS.get(0).getSettleAmount()))
+                .paymentConfirmId(orderSplitRecordVOS.get(0).getPaymentConfirmId())
+                .paymentId(orderSplitRecordVOS.get(0).getPaymentId())
+
+                .build();
+        List<SplitRecordInfoVO.OrderSplit> orderSplitList = new ArrayList<>();
+        for (OrderSplitRecordVO orderSplitRecordVO : orderSplitRecordVOS) {
+            SplitRecordInfoVO.OrderSplit orderSplit = SplitRecordInfoVO.OrderSplit.builder()
+                    .adapayMemberId(orderSplitRecordVO.getAdapayMemberId())
+                    .merchantId(orderSplitRecordVO.getMerchantId())
+                    .merchantName(orderSplitRecordVO.getMerchantName())
+                    .electricitySplitRatio(String.valueOf(orderSplitRecordVO.getElectricitySplitRatio()))
+                    .electricitySplitAmount(String.valueOf(orderSplitRecordVO.getElectricitySplitAmount()))
+                    .serviceSplitRatio(String.valueOf(orderSplitRecordVO.getServiceSplitRatio()))
+                    .serviceSplitAmount(String.valueOf(orderSplitRecordVO.getServiceSplitAmount()))
+                    .feeAmount(String.valueOf(orderSplitRecordVO.getFeeAmount()))
+
+                    .build();
+            // 收入金额
+            BigDecimal subtract = orderSplitRecordVO.getElectricitySplitAmount()
+                    .add(orderSplitRecordVO.getServiceSplitAmount())
+                    .subtract(new BigDecimal(orderSplitRecordVO.getFeeAmount()));
+            orderSplit.setRevenueAmount(String.valueOf(subtract));
+
+            orderSplitList.add(orderSplit);
+        }
+        vo.setOrderSplitList(orderSplitList);
+
+        resultList.add(vo);
+
+        return resultList;
+    }
+
     /**
      * 根据汇付会员id查询分账汇总数据
      * @param dto

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

@@ -31,6 +31,16 @@ public class SplitRecordInfoVO {
      */
     private String settleAmount;
 
+    /**
+     * 分账id
+     */
+    private String paymentConfirmId;
+
+    /**
+     * 支付id
+     */
+    private String paymentId;
+
     /**
      * 订单分账明细
      */

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

@@ -809,6 +809,8 @@
       t1.adapay_member_id AS adapayMemberId,
       t4.id as merchantId,
       t4.merchant_name as merchantName,
+      t1.payment_id as paymentId,
+      t1.payment_confirm_id as paymentConfirmId,
       t1.electricity_split_ratio AS electricitySplitRatio,
       t1.electricity_split_amount AS electricitySplitAmount,
       t1.service_split_ratio AS serviceSplitRatio,