feat: 新增支付记录前端展示

wzp

2025-05-03 ff76ba9c9c56aa2dd1c6a96d5d6365fbb3db1fad

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/ServiceOrderController.java

@@ -13,10 +13,9 @@
import com.ruoyi.common.constant.HttpStatus;

import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.system.domain.DictionaryCondition;
import com.ruoyi.system.domain.DispatchOrd;
import com.ruoyi.system.domain.TbOrders;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.service.IDispatchOrdService;
import com.ruoyi.system.service.IPayInfoService;
import com.ruoyi.system.service.ITbOrdersService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,7 +34,6 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.ServiceOrder;
import com.ruoyi.system.service.IServiceOrderService;


@@ -58,6 +56,9 @@

    @Autowired
    private IDispatchOrdService dispatchOrdService;

    @Autowired
    private IPayInfoService payInfoService;

    /**
     * 获取服务订单列表
@@ -98,8 +99,8 @@

        //查询服务单
        ServiceOrder mingServiceOrder = serviceOrderService.selectServiceOrderById(Long.valueOf(orderDetail.getServiceOrdID()));
        DispatchOrd dispatchOrd = dispatchOrdService.selectDispatchOrdByServiceOrdIDDt(mingServiceOrder.getServiceOrdId().toString());

        DispatchOrd dispatchOrd = dispatchOrdService.selectDispatchOrdByServiceOrdIDDt(mingServiceOrder.getServiceOrdId().toString());
        
        Map<String, Object> data = new HashMap<>();
        
@@ -260,12 +261,16 @@
        medicalInfo.put("useVentilator", useVentilator);


        //支付信息
//        List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt(orderDetail.getServiceOrdID()); //1016302788
        List<PayInfo> payInfoList = payInfoService.selectPayInfoByServiceOrdIDDt("1016302788");

        data.put("orderInfo", orderInfo);
        data.put("patientInfo", patientInfo);
        data.put("serviceInfo", serviceInfo);
        data.put("medicalInfo", medicalInfo); // 暂时为空
        data.put("dispatchInfo", dispatchInfo);  // 更新为包含人员信息的dispatchInfo
        data.put("paymentInfo", new ArrayList<>()); // 暂时为空
        data.put("paymentInfo", payInfoList); // 暂时为空
        data.put("operationInfo", new ArrayList<>()); // 暂时为空
        
        return AjaxResult.success(data);