clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

订单查询接口问题修复

This commit is contained in:
donqi 2022-10-06 18:29:47 +08:00
parent 3999663306
commit bcaec8cee6
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -355,7 +355,13 @@ public class OrderMasterController extends BaseController {
List<OrderDetail> orderDetailList = orderDetailService.selectByOrderMasterId(orderMaster.getId());
List<OrderStandardDetail> orderStandardDetails = new ArrayList<>();
orderDetailList.forEach(orderDetail -> {
// 财务信息
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMaster.getId());
// 计算总额
BigDecimal totalPayMoney = financialMaster.getPayMoney();
for (OrderDetail orderDetail: orderDetailList) {
List<OrderStandard> standardList = new ArrayList<>();
// 子单施工师傅信息
Worker detailWorker = workerService.selectById(orderDetail.getWorkerId());
@ -385,7 +391,7 @@ public class OrderMasterController extends BaseController {
}
FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(orderDetail.getId());
BigDecimal totalPayMoney = financialDetail.getPayMoney();
BigDecimal detailPayMoney = financialDetail.getPayMoney();
FinancialChangeRecord financialChangeRecord = null;
// 查询子单加价记录
FinancialChangeRecord changeRecordQry = new FinancialChangeRecord();
@ -394,6 +400,7 @@ public class OrderMasterController extends BaseController {
if (CollectionUtils.isNotEmpty(financialChangeRecords)) {
financialChangeRecord = financialChangeRecords.get(0);
totalPayMoney = totalPayMoney.add(financialChangeRecord.getChangeMoney());
detailPayMoney = detailPayMoney.add(financialChangeRecord.getChangeMoney());
}
OrderStandardDetail orderStandardDetail = new OrderStandardDetail();
@ -409,7 +416,7 @@ public class OrderMasterController extends BaseController {
orderStandardDetail.setOrderStandardList(standardList);
orderStandardDetail.setFinishImgList(finishImgList);
orderStandardDetail.setRemark(orderDetail.getRemark());
orderStandardDetail.setPayMoney(totalPayMoney);
orderStandardDetail.setPayMoney(detailPayMoney);
orderStandardDetail.setFinancialChangeRecord(financialChangeRecord);
AfterServiceRecord afterServiceRecord = new AfterServiceRecord();
@ -418,7 +425,7 @@ public class OrderMasterController extends BaseController {
orderStandardDetail.setAfterServiceRecordList(records);
orderStandardDetails.add(orderStandardDetail);
});
}
// 初始化属性
OrderListResponse orderListResponse = new OrderListResponse();
@ -446,9 +453,6 @@ public class OrderMasterController extends BaseController {
Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
// 财务信息
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMaster.getId());
// 地址信息
CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
@ -470,7 +474,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setGoodsLogoUrl(goods.getGoodsImgUrl());
orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney());
orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
orderListResponse.setPayMoney(financialMaster.getPayMoney());
orderListResponse.setPayMoney(totalPayMoney);
orderListResponse.setWorkerName(workerName);
orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
orderListResponse.setCustomerName(customerAddress.getName());

3
ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
View File

@ -8,6 +8,7 @@ import com.ghy.worker.domain.Worker;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @author clunt
@ -75,6 +76,8 @@ public class OrderMaster extends BaseEntity {
private Integer exceptOrderStatus;
private String orderStatuses;
private Boolean isOverTime;
private String orderMasterIds;

5
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -119,9 +119,12 @@
<if test="createTimeEnd != null">
AND om.create_time &lt; #{createTimeEnd}
</if>
<if test="orderMasterIds != null">
<if test="orderMasterIds != null and orderMasterIds != ''">
AND om.id in (${orderMasterIds})
</if>
<if test="orderStatuses != null and orderStatuses != ''">
AND om.order_status in (${orderStatuses})
</if>
</where>
order by om.create_time
<trim suffixOverrides=",">