From 6dd60354a6051151cea099e995b613bdaa5349d2 Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Wed, 21 May 2025 17:50:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=85=8D=E4=BB=B6=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8A=A0=E4=BB=B7=E5=87=AD?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderAttachmentRecordController.java | 14 ++++++++++++++ .../controller/order/OrderDetailController.java | 2 +- .../ghy/web/pojo/vo/OrderChangePriceRequest.java | 4 ++++ .../order/mapper/OrderAttachmentRecordMapper.java | 9 +++++++++ .../service/IOrderAttachmentRecordService.java | 2 ++ .../com/ghy/order/service/OrderDetailService.java | 2 +- .../impl/OrderAttachmentRecordServiceImpl.java | 12 ++++++++++++ .../order/service/impl/OrderDetailServiceImpl.java | 4 +++- .../mapper/order/OrderAttachmentRecordMapper.xml | 3 +++ .../ghy/payment/domain/FinancialChangeRecord.java | 5 +++++ .../financial/FinancialChangeRecordMapper.xml | 8 +++++++- 11 files changed, 61 insertions(+), 4 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 ceabad3e..6b93d650 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 @@ -140,4 +140,18 @@ public class OrderAttachmentRecordController extends BaseController { return toAjax(orderAttachmentRecordService.deleteOrderAttachmentRecordByIds(ids)); } + + + + /** + * 删除附件费 根据子单id + */ + @RequiresPermissions("attach:record:remove") + @Log(title = "附件费", businessType = BusinessType.DELETE) + @PostMapping( "/deleteByDetailId") + @ResponseBody + public AjaxResult deleteByDetailId(Long id) + { + return toAjax(orderAttachmentRecordService.deleteOrderAttachmentRecordByOrderDetailId(id)); + } } \ No newline at end of file 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 d3d8dc19..d0d55de4 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 @@ -1334,7 +1334,7 @@ public class OrderDetailController extends BaseController { public AjaxResult changePrice(@Valid @RequestBody OrderChangePriceRequest request) { try { Assert.notNull(request.getChangeMoney(), "报价不能为空"); - return toAjax(orderDetailService.changePrice(request.getOrderDetailId(), request.getChangeMoney(), request.getType(), request.getRemark())); + return toAjax(orderDetailService.changePrice(request.getOrderDetailId(), request.getChangeMoney(), request.getType(), request.getRemark(),request.getUrls(),request.getFileNames())); } catch (Exception e) { e.printStackTrace(); logger.error(ExceptionUtil.getExceptionMessage(e)); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderChangePriceRequest.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderChangePriceRequest.java index ea16f033..6671c4ab 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderChangePriceRequest.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderChangePriceRequest.java @@ -21,4 +21,8 @@ public class OrderChangePriceRequest implements Serializable { private Integer type; private String remark; + + private String urls; + + private String fileNames; } 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 8383f7ba..dbd435ba 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 @@ -58,4 +58,13 @@ public interface OrderAttachmentRecordMapper * @return 结果 */ public int deleteOrderAttachmentRecordByIds(String[] ids); + + + /** + * 删除附件费 根据子单id + * + * @param id 子单id + * @return 结果 + */ + public int deleteOrderAttachmentRecordByOrderDetailId(Long id); } 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 06a14e77..c7702d2c 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 @@ -58,4 +58,6 @@ public interface IOrderAttachmentRecordService * @return 结果 */ public int deleteOrderAttachmentRecordById(Long id); + + int deleteOrderAttachmentRecordByOrderDetailId(Long id); } \ No newline at end of file diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java index 0b88286d..56cfea4b 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderDetailService.java @@ -130,7 +130,7 @@ public interface OrderDetailService { * @param remark 备注 * @return 成功/失败 */ - int changePrice(Long orderDetailId, BigDecimal changeMoney, Integer type, String remark) throws Exception; + int changePrice(Long orderDetailId, BigDecimal changeMoney, Integer type, String remark,String urls ,String fileNames) throws Exception; int sureChange(Long financialChangeRecordId); 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 63842c0e..d4e4de40 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 @@ -91,4 +91,16 @@ public class OrderAttachmentRecordServiceImpl implements IOrderAttachmentRecordS { return orderAttachmentRecordMapper.deleteOrderAttachmentRecordById(id); } + + /** + * 删除附件费信息 根据子单id + * + * @param id 附件费主键 + * @return 结果 + */ + @Override + public int deleteOrderAttachmentRecordByOrderDetailId(Long id) + { + return orderAttachmentRecordMapper.deleteOrderAttachmentRecordByOrderDetailId(id); + } } diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index d64f0bf0..830547d7 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -1026,7 +1026,7 @@ public class OrderDetailServiceImpl implements OrderDetailService { @Override @Transactional(rollbackFor = Exception.class) - public int changePrice(Long orderDetailId, BigDecimal changeMoney, Integer type, String remark) throws + public int changePrice(Long orderDetailId, BigDecimal changeMoney, Integer type, String remark,String urls ,String fileNames) throws Exception { OrderDetail orderDetail = orderDetailMapper.selectById(orderDetailId); if (orderDetail == null) { @@ -1080,6 +1080,8 @@ public class OrderDetailServiceImpl implements OrderDetailService { financialChangeRecord.setPayStatus(0); financialChangeRecord.setType(type); financialChangeRecord.setRemark(remark); + financialChangeRecord.setUrls(urls); + financialChangeRecord.setFileNames(fileNames); this.buildSettle(financialChangeRecord, deptGoodsCategory, workerMaster); affectedRows = financialChangeRecordService.insert(financialChangeRecord); } diff --git a/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml index 7727c7b4..46a0d0b0 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml @@ -71,4 +71,7 @@ + + delete from order_attachment_record where order_detail_id = #{id} + \ No newline at end of file diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialChangeRecord.java b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialChangeRecord.java index 24cc170a..789eee5e 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialChangeRecord.java +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/FinancialChangeRecord.java @@ -90,4 +90,9 @@ public class FinancialChangeRecord extends BaseEntity { @Excel(name = "工作师傅剩余金额") private BigDecimal workerMoney; + + private String urls; + + private String fileNames; + } diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml index 1c8ef742..8583583e 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml @@ -21,11 +21,13 @@ + + SELECT id, order_detail_id, order_master_id, payment_id, reverse_id, - change_money, status, pay_status, type, left_money, remark FROM financial_change_record + change_money, status, pay_status, type, left_money, remark,urls ,file_names FROM financial_change_record