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 93a570ed..511d8ff0 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 @@ -830,14 +830,14 @@ public class OrderMasterController extends BaseController { param.setOrderDetailId(detail.getId()); List orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param); for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ - if (StringUtils.isEmpty(orderAttachmentRecord.getPaymentId())){ + if (record!=null&&record.getPayStatus()==0){ totalChangeMoney = totalChangeMoney.add(orderAttachmentRecord.getAttachMoney()); }else{ paymentMoney = paymentMoney.add(orderAttachmentRecord.getAttachMoney()); } } + logger.info("未支付的加价订单{}加价配件订单列表{}",record,orderAttachmentRecordList); } - logger.info("列表中已支付的金额{}已支付的加价金额{}",paymentMoney,changePaymentMoney); // 地址信息 CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId()); SysArea sysArea;