diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 4ba96aee..bdbe39bd 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -1320,8 +1320,8 @@ public class OrderController extends BaseController {
 //            orderListResponse.setChangeMoney(totalChangeMoney);
             orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(StringUtils.isNotEmpty(master.getName())?master.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(StringUtils.isNotEmpty(master.getPhone())?master.getPhone():customerAddress.getPhone());
             orderListResponse.setServerTime(master.getRevTime());
             orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
@@ -1454,8 +1454,8 @@ public class OrderController extends BaseController {
             orderListResponse.setWorkerId(detail.getWorkerId());
             orderListResponse.setWorkerName(workerName);
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(StringUtils.isNotEmpty(orderMaster.getName())?orderMaster.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(StringUtils.isNotEmpty(orderMaster.getPhone())?orderMaster.getPhone():customerAddress.getPhone());
             orderListResponse.setOrderStatus(detail.getOrderStatus());
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());
@@ -1608,8 +1608,8 @@ public class OrderController extends BaseController {
             orderListResponse.setPayMoney(financialMaster.getPayMoney());
             orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(StringUtils.isNotEmpty(master.getName())?master.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(StringUtils.isNotEmpty(master.getPhone())?master.getPhone():customerAddress.getPhone());
             orderListResponse.setServerTime(master.getRevTime());
             orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
@@ -1620,7 +1620,7 @@ public class OrderController extends BaseController {
             orderListResponse.setPayType(master.getPayType());
             orderListResponse.setOrderMasterCode(master.getCode());
             orderListResponse.setStandardList(standardList);
-            orderListResponse.setAddress(completeAddress);
+            
             orderListResponse.setRemark(goods.getRemark());
             orderListResponse.setCustomerRemark(master.getRemark());
             orderListResponse.setTimeout(master.getTimeout());
@@ -1650,8 +1650,9 @@ public class OrderController extends BaseController {
             orderListResponse.setStreetId(master.getStreetId());
             orderListResponse.setPhone(master.getPhone());
             orderListResponse.setName(master.getName());
-            orderListResponse.setCustomerName(master.getName());
-            orderListResponse.setCustomerPhone(master.getPhone());
+            orderListResponse.setCustomerName(StringUtils.isNotEmpty(master.getName())?master.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(StringUtils.isNotEmpty(master.getPhone())?master.getPhone():customerAddress.getPhone());
+            orderListResponse.setAddress(master.getAddress());
             String addressSysArea = sysArea.getMergerName();
             String[] array = addressSysArea.split(",");
             if (StringUtils.isEmpty(master.getProvinceName())){
@@ -1665,6 +1666,7 @@ public class OrderController extends BaseController {
                 orderListResponse.setStreetId(customerAddress.getStreetId());
                 orderListResponse.setPhone(customerAddress.getPhone());
                 orderListResponse.setName(customerAddress.getName());
+                orderListResponse.setAddress(completeAddress);
             }
 
 
@@ -1784,13 +1786,12 @@ public class OrderController extends BaseController {
             orderListResponse.setWorkerName(worker.getName());
             orderListResponse.setWorkerPhone(worker.getPhone());
             orderListResponse.setWorkerId(detail.getWorkerId());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(StringUtils.isNotEmpty(orderMaster.getName())?orderMaster.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(StringUtils.isNotEmpty(orderMaster.getPhone())?orderMaster.getPhone():customerAddress.getPhone());
             orderListResponse.setOrderStatus(detail.getOrderStatus());
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());
             orderListResponse.setStandardList(standardList);
-            orderListResponse.setAddress(completeAddress);
             orderListResponse.setServerTime(detail.getRevTime());
             orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
@@ -1810,6 +1811,37 @@ public class OrderController extends BaseController {
             orderListResponse.setUpdateTime(detail.getUpdateTime());
             orderListResponse.setConsultMode(orderMaster.getConsultMode());
             orderListResponse.setInsuranceId(orderMaster.getInsuranceId());
+
+
+            orderListResponse.setProvinceName(orderMaster.getProvinceName());
+            orderListResponse.setCityName(orderMaster.getCityName());
+            orderListResponse.setCountryName(orderMaster.getCountryName());
+            orderListResponse.setStreetName(orderMaster.getStreetName());
+            orderListResponse.setProvinceId(orderMaster.getProvinceId());
+            orderListResponse.setCityId(orderMaster.getCityId());
+            orderListResponse.setCountryId(orderMaster.getCountryId());
+            orderListResponse.setStreetId(orderMaster.getStreetId());
+            orderListResponse.setPhone(orderMaster.getPhone());
+            orderListResponse.setName(orderMaster.getName());
+            orderListResponse.setCustomerName(orderMaster.getName());
+            orderListResponse.setCustomerPhone(orderMaster.getPhone());
+            orderListResponse.setAddress(orderMaster.getAddress());
+            String addressSysArea = sysArea.getMergerName();
+            String[] array = addressSysArea.split(",");
+            if (StringUtils.isEmpty(orderMaster.getProvinceName())){
+                orderListResponse.setProvinceName(array[0]);
+                orderListResponse.setCityName(array[1]);
+                orderListResponse.setCountryName(array[2]);
+                orderListResponse.setStreetName(array[3]);
+                orderListResponse.setProvinceId(customerAddress.getProvinceId());
+                orderListResponse.setCityId(customerAddress.getCityId());
+                orderListResponse.setCountryId(customerAddress.getCountryId());
+                orderListResponse.setStreetId(customerAddress.getStreetId());
+                orderListResponse.setPhone(customerAddress.getPhone());
+                orderListResponse.setName(customerAddress.getName());
+                orderListResponse.setAddress(completeAddress);
+            }
+
             if (orderMaster.getInsuranceId() != null) {
                 InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(orderMaster.getInsuranceId());
                 if (manager != null) {
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index b1c2a6e1..a8d2e807 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -116,6 +116,9 @@ public class OrderDetailController extends BaseController {
     @Autowired
     private InsuranceService insuranceService;
 
+    @Resource
+    private IOrderAttachmentRecordService orderAttachmentRecordService;
+
     @RequiresPermissions("order:detail:view")
     @GetMapping()
     public String orderDetail() {
@@ -455,8 +458,21 @@ public class OrderDetailController extends BaseController {
             FinancialChangeRecord changeRecordQry = new FinancialChangeRecord();
             changeRecordQry.setOrderDetailId(detail.getId());
             List<FinancialChangeRecord> financialChangeRecords = financialChangeRecordService.selectFinancialChangeRecordList(changeRecordQry);
+            OrderAttachmentRecord param = new OrderAttachmentRecord();
+            param.setOrderDetailId(detail.getId());
+            List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param);
+            BigDecimal addMoneyTotal= BigDecimal.ZERO;
+
+            for (FinancialChangeRecord financialChangeRecord:financialChangeRecords){
+                addMoneyTotal.add(financialChangeRecord.getChangeMoney());
+            }
+            for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
+                addMoneyTotal.add(orderAttachmentRecord.getAttachMoney());
+            }
+            logger.info("加价的金额总额为{}",addMoneyTotal);
 
             // 编辑返回属性
+            orderListResponse.setAddMoney(addMoneyTotal);
             orderListResponse.setOrderDetailId(detail.getId());
             orderListResponse.setOrderDetailCode(detail.getCode());
             orderListResponse.setOrderMasterId(detail.getOrderMasterId());
@@ -470,8 +486,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setMasterWorkerName(masterWorkerName);
             orderListResponse.setMasterCompanyName(masterCompanyName);
             orderListResponse.setMasterWorkerPhone(masterWorker == null ? "" : masterWorker.getPhone());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(org.apache.commons.lang3.StringUtils.isNotEmpty(orderMaster.getName())?orderMaster.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(org.apache.commons.lang3.StringUtils.isNotEmpty(orderMaster.getPhone())?orderMaster.getPhone():customerAddress.getPhone());
             orderListResponse.setOrderStatus(detail.getOrderStatus());
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());
@@ -689,8 +705,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setTotalMoney(financialDetail.getTotalMoney());
             orderListResponse.setWorkerName(workerName);
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(org.apache.commons.lang3.StringUtils.isNotEmpty(orderMaster.getName())?orderMaster.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(org.apache.commons.lang3.StringUtils.isNotEmpty(orderMaster.getPhone())?orderMaster.getPhone():customerAddress.getPhone());
             orderListResponse.setOrderStatus(detail.getOrderStatus());
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());
@@ -845,8 +861,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setTotalMoney(financialDetail.getTotalMoney());
             orderListResponse.setWorkerName(workerName);
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(org.apache.commons.lang3.StringUtils.isNotEmpty(orderMaster.getName())?orderMaster.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(org.apache.commons.lang3.StringUtils.isNotEmpty(orderMaster.getPhone())?orderMaster.getPhone():customerAddress.getPhone());
             orderListResponse.setOrderStatus(detail.getOrderStatus());
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());
diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 2d58deda..f2173957 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -124,7 +124,8 @@ public class OrderMasterController extends BaseController {
     private FinancialChangeRecordService financialChangeRecordService;
     @Resource
     private CustomerAddressService customerAddressService;
-
+    @Resource
+    private IOrderAttachmentRecordService orderAttachmentRecordService;
     @Resource
     private InsuranceService insuranceService;
 
@@ -824,8 +825,15 @@ public class OrderMasterController extends BaseController {
                 if (record != null) {
                     totalChangeMoney = totalChangeMoney.add(record.getChangeMoney());
                 }
-            }
+                OrderAttachmentRecord param = new OrderAttachmentRecord();
+                param.setOrderDetailId(detail.getId());
+                List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param);
 
+                for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){
+                    totalChangeMoney.add(orderAttachmentRecord.getAttachMoney());
+                }
+            }
+           logger.info("列表中加价的金额{}",totalPayMoney);
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
             SysArea sysArea;
@@ -865,8 +873,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setChangeMoney(totalChangeMoney);
             orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
-            orderListResponse.setCustomerName(master.getName());
-            orderListResponse.setCustomerPhone(master.getPhone());
+            orderListResponse.setCustomerName(org.apache.commons.lang3.StringUtils.isNotEmpty(master.getName())?master.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(org.apache.commons.lang3.StringUtils.isNotEmpty(master.getPhone())?master.getPhone():customerAddress.getPhone());
             orderListResponse.setServerTime(master.getRevTime());
             orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
@@ -1047,8 +1055,8 @@ public class OrderMasterController extends BaseController {
 //            orderListResponse.setChangeMoney(totalChangeMoney);
             orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(org.apache.commons.lang3.StringUtils.isNotEmpty(master.getName())?master.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(org.apache.commons.lang3.StringUtils.isNotEmpty(master.getPhone())?master.getPhone():customerAddress.getPhone());
             orderListResponse.setServerTime(master.getRevTime());
             orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
@@ -1323,8 +1331,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setWorkerId(worker == null ? null : worker.getWorkerId());
             orderListResponse.setWorkerName(workerName);
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(org.apache.commons.lang3.StringUtils.isNotEmpty(orderMaster.getName())?orderMaster.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(org.apache.commons.lang3.StringUtils.isNotEmpty(orderMaster.getPhone())?orderMaster.getPhone():customerAddress.getPhone());
             orderListResponse.setOrderStatus(orderMaster.getOrderStatus());
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index 2fe93a8b..0a03c584 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -202,4 +202,6 @@ public class OrderListResponse {
      * 是否为监控但
      * */
     private Boolean isMonitoredOrder;
+
+    private  BigDecimal addMoney;
 }
diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
index 9f392e07..487851b5 100644
--- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
+++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
@@ -1074,8 +1074,8 @@ public class OrderServiceImpl implements OrderService {
 //            orderListResponse.setChangeMoney(totalChangeMoney);
             orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(StringUtils.isNotEmpty(master.getName())?master.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(StringUtils.isNotEmpty(master.getPhone())?master.getPhone():customerAddress.getPhone());
             orderListResponse.setServerTime(master.getRevTime());
             orderListResponse.setExpectTimeStart(master.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(master.getExpectTimeEnd());
@@ -1208,8 +1208,8 @@ public class OrderServiceImpl implements OrderService {
             orderListResponse.setWorkerId(detail.getWorkerId());
             orderListResponse.setWorkerName(workerName);
             orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
-            orderListResponse.setCustomerName(customerAddress.getName());
-            orderListResponse.setCustomerPhone(customerAddress.getPhone());
+            orderListResponse.setCustomerName(StringUtils.isNotEmpty(orderMaster.getName())?orderMaster.getName():customerAddress.getName());
+            orderListResponse.setCustomerPhone(StringUtils.isNotEmpty(orderMaster.getPhone())?orderMaster.getPhone():customerAddress.getPhone());
             orderListResponse.setOrderStatus(detail.getOrderStatus());
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());