From 36767a00bf757d8211e6b34bcb52367f1a53718f Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Wed, 28 May 2025 16:43:40 +0800 Subject: [PATCH] no message --- .../controller/order/OrderAttachmentRecordController.java | 7 ++++--- .../ghy/web/controller/order/OrderMasterController.java | 7 ++++--- .../com/ghy/order/mapper/OrderAttachmentRecordMapper.java | 3 ++- .../ghy/order/service/IOrderAttachmentRecordService.java | 2 +- .../service/impl/OrderAttachmentRecordServiceImpl.java | 5 ++--- .../resources/mapper/order/OrderAttachmentRecordMapper.xml | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderAttachmentRecordController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderAttachmentRecordController.java index 31381ef4..cd12e921 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderAttachmentRecordController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderAttachmentRecordController.java @@ -1,6 +1,8 @@ package com.ghy.web.controller.order; import java.util.List; + +import org.apache.ibatis.annotations.Param; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -146,11 +148,10 @@ public class OrderAttachmentRecordController extends BaseController /** * 删除附件费 根据子单id */ - @Log(title = "附件费", businessType = BusinessType.DELETE) @PostMapping( "/deleteByDetailId") @ResponseBody - public AjaxResult deleteByDetailId(Long id) + public AjaxResult deleteByDetailId(@RequestParam Long orderDetailId) { - return toAjax(orderAttachmentRecordService.deleteOrderAttachmentRecordByOrderDetailId(id)); + return toAjax(orderAttachmentRecordService.deleteOrderAttachmentRecordByOrderDetailId(orderDetailId)); } } \ No newline at end of file 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 2a9b43e2..93a570ed 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 @@ -811,13 +811,13 @@ public class OrderMasterController extends BaseController { if (financialMaster.getPayStatus()==1){ paymentMoney=paymentMoney.add(financialMaster.getTotalMoney()); } - List financialChangeRecords=financialChangeRecordService.selectByMasterId(orderMaster.getId()); + List financialChangeRecords=financialChangeRecordService.selectByMasterId(master.getId()); BigDecimal changePaymentMoney =financialChangeRecords.stream() .filter(record->record.getPayStatus()==1) .map(FinancialChangeRecord::getChangeMoney) .reduce(BigDecimal.ZERO, BigDecimal::add); paymentMoney=paymentMoney.add(changePaymentMoney); - logger.info("加价费已支付{}加价列表{}主单id为{}",changePaymentMoney,financialChangeRecords,orderMaster.getId()); + logger.info("加价费已支付{}加价列表{}主单id为{}",changePaymentMoney,financialChangeRecords,master.getId()); for (OrderDetail detail : detailList) { // 查询子单加价记录 @@ -1353,7 +1353,8 @@ public class OrderMasterController extends BaseController { for (FinancialDetail financialDetail : financialDetailList) { finalRecvMoney = finalRecvMoney.add(financialDetail.getPayMoney()); } - BigDecimal serverMoney =financialMaster.getServerMoney(); + BigDecimal serverMoney =BigDecimal.ZERO; + serverMoney=serverMoney.add(financialMaster.getServerMoney()); serverMoney=serverMoney.add(leaderMoney); logger.info("大师傅的服务金额{}大师傅的分成{}",serverMoney,leaderMoney); // 编辑返回属性 diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderAttachmentRecordMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderAttachmentRecordMapper.java index dbd435ba..bfb3c53d 100644 --- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderAttachmentRecordMapper.java +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderAttachmentRecordMapper.java @@ -2,6 +2,7 @@ package com.ghy.order.mapper; import java.util.List; import com.ghy.order.domain.OrderAttachmentRecord; +import org.apache.ibatis.annotations.Param; /** * 附件费Mapper接口 @@ -66,5 +67,5 @@ public interface OrderAttachmentRecordMapper * @param id 子单id * @return 结果 */ - public int deleteOrderAttachmentRecordByOrderDetailId(Long id); + public int deleteOrderAttachmentRecordByOrderDetailId(Long orderDetailId); } diff --git a/ghy-order/src/main/java/com/ghy/order/service/IOrderAttachmentRecordService.java b/ghy-order/src/main/java/com/ghy/order/service/IOrderAttachmentRecordService.java index c7702d2c..64263f6e 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/IOrderAttachmentRecordService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/IOrderAttachmentRecordService.java @@ -59,5 +59,5 @@ public interface IOrderAttachmentRecordService */ public int deleteOrderAttachmentRecordById(Long id); - int deleteOrderAttachmentRecordByOrderDetailId(Long id); + int deleteOrderAttachmentRecordByOrderDetailId(Long orderDetailId); } \ No newline at end of file diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderAttachmentRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderAttachmentRecordServiceImpl.java index d4e4de40..cecf8892 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderAttachmentRecordServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderAttachmentRecordServiceImpl.java @@ -95,12 +95,11 @@ public class OrderAttachmentRecordServiceImpl implements IOrderAttachmentRecordS /** * 删除附件费信息 根据子单id * - * @param id 附件费主键 * @return 结果 */ @Override - public int deleteOrderAttachmentRecordByOrderDetailId(Long id) + public int deleteOrderAttachmentRecordByOrderDetailId(Long orderDetailId) { - return orderAttachmentRecordMapper.deleteOrderAttachmentRecordByOrderDetailId(id); + return orderAttachmentRecordMapper.deleteOrderAttachmentRecordByOrderDetailId(orderDetailId); } } diff --git a/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml index 17c68a79..eaeb142e 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml @@ -77,6 +77,6 @@ - delete from order_attachment_record where order_detail_id = #{id} + delete from order_attachment_record where order_detail_id = #{orderDetailId} \ No newline at end of file