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 7b14199d..9e1333ee 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 @@ -473,16 +473,18 @@ public class OrderDetailController extends BaseController { param1.setFinancialChangeRecordId(financialChangeRecord.getId()); BigDecimal attachmentMoney= BigDecimal.ZERO; List orderAttachmentRecords=orderAttachmentRecordService.selectOrderAttachmentRecordList(param1); + logger.info("参数传递{}，配件的金额查询为{}",orderAttachmentRecords,param1); if(orderAttachmentRecords!=null&&orderAttachmentRecords.size()>0){ - attachmentMoney.add(orderAttachmentRecords.get(0).getAttachMoney()); + attachmentMoney= attachmentMoney.add(orderAttachmentRecords.get(0).getAttachMoney()); financialChangeRecord.setAttachmentMoney(attachmentMoney); + logger.info("配件的金为{}",attachmentMoney); } } for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); } - logger.info("加价的金额总额为{}",addMoneyTotal); + logger.info("所有的加价订单{}",financialChangeRecords); // 编辑返回属性 orderListResponse.setAddMoneyRemark(addMoneyRemark); @@ -1343,7 +1345,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(),request.getUrls(),request.getFileNames())); + return toAjax(orderDetailService.changePrice(request.getOrderDetailId(), request.getChangeMoney(), request.getType(), request.getRemark(),request.getUrls(),request.getFileNames(),request.getReason())); } catch (Exception e) { e.printStackTrace(); logger.error(ExceptionUtil.getExceptionMessage(e)); 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 85029be7..f4555e60 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 @@ -1196,6 +1196,18 @@ public class OrderMasterController extends BaseController { if (StringUtils.isNotEmpty(financialChangeRecord.getRemark())){ remark= financialChangeRecord.getRemark(); } + OrderAttachmentRecord param1 = new OrderAttachmentRecord(); + param1.setFinancialChangeRecordId(financialChangeRecord.getId()); + BigDecimal attachmentMoney= BigDecimal.ZERO; + List orderAttachmentRecords=orderAttachmentRecordService.selectOrderAttachmentRecordList(param1); + logger.info("参数传递{}，配件的金额查询为{}",orderAttachmentRecords,param1); + if(orderAttachmentRecords!=null&&orderAttachmentRecords.size()>0){ + logger.info("参数传递{}，配件的金额查询为{}",param1,orderAttachmentRecords.get(0)); + logger.info("配件金额为{}",orderAttachmentRecords.get(0).getAttachMoney()); + attachmentMoney= attachmentMoney.add(orderAttachmentRecords.get(0).getAttachMoney()); + financialChangeRecord.setAttachmentMoney(attachmentMoney); + logger.info("配件的金为{}",attachmentMoney); + } } for (OrderAttachmentRecord orderAttachmentRecord:orderAttachmentRecordList){ addMoneyTotal= addMoneyTotal.add(orderAttachmentRecord.getAttachMoney()); 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 6671c4ab..b417bd1a 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 @@ -8,6 +8,7 @@ import java.math.BigDecimal; /** * 改价请求实体 + * * @author clunt */ @Data @@ -25,4 +26,6 @@ public class OrderChangePriceRequest implements Serializable { private String urls; private String fileNames; + + private String reason; } 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 56cfea4b..db8d1dd7 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,String urls ,String fileNames) throws Exception; + int changePrice(Long orderDetailId, BigDecimal changeMoney, Integer type, String remark,String urls ,String fileNames,String reason) throws Exception; int sureChange(Long financialChangeRecordId); 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 830547d7..83a499c0 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,13 +1026,12 @@ public class OrderDetailServiceImpl implements OrderDetailService { @Override @Transactional(rollbackFor = Exception.class) - public int changePrice(Long orderDetailId, BigDecimal changeMoney, Integer type, String remark,String urls ,String fileNames) throws + public int changePrice(Long orderDetailId, BigDecimal changeMoney, Integer type, String remark,String urls ,String fileNames,String reason) throws Exception { OrderDetail orderDetail = orderDetailMapper.selectById(orderDetailId); if (orderDetail == null) { throw new BaseException("子单不存在!"); } - logger.info("改价或者加价订单id{}金额{}",orderDetailId,changeMoney); // 主单 OrderMaster orderMaster = orderMasterService.selectById(orderDetail.getOrderMasterId()); // 主师傅 @@ -1068,6 +1067,9 @@ public class OrderDetailServiceImpl implements OrderDetailService { financialChangeRecord.setChangeMoney(changeMoney); financialChangeRecord.setType(type); financialChangeRecord.setRemark(remark); + financialChangeRecord.setUrls(urls); + financialChangeRecord.setFileNames(fileNames); + financialChangeRecord.setReason(reason); this.buildSettle(financialChangeRecord, deptGoodsCategory, workerMaster); affectedRows = financialChangeRecordService.update(financialChangeRecord); } else { @@ -1082,6 +1084,7 @@ public class OrderDetailServiceImpl implements OrderDetailService { financialChangeRecord.setRemark(remark); financialChangeRecord.setUrls(urls); financialChangeRecord.setFileNames(fileNames); + financialChangeRecord.setReason(reason); 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 f86d2fce..17c68a79 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderAttachmentRecordMapper.xml @@ -48,7 +48,7 @@ #{orderMasterId}, #{type}, #{attachMoney}, - #{financial_change_record_id}, + #{financialChangeRecordId}, 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 a625d1aa..ac66492e 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 @@ -96,4 +96,6 @@ public class FinancialChangeRecord extends BaseEntity { private String fileNames; private BigDecimal attachmentMoney; + + private String reason; } diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml index 8583583e..d4b3bb85 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml @@ -23,11 +23,12 @@ + SELECT id, order_detail_id, order_master_id, payment_id, reverse_id, - change_money, status, pay_status, type, left_money, remark,urls ,file_names FROM financial_change_record + change_money, status, pay_status, type, left_money, remark,urls ,file_names,reason FROM financial_change_record