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

no message

This commit is contained in:
cb 2025-07-31 10:39:56 +08:00
parent ae2f59d183
commit 671a9f225e
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
View File

@ -766,6 +766,8 @@ public class OrderDetailController extends BaseController {
orderListResponse.setOrderImages(orderMaster.getOrderImages()); orderListResponse.setOrderImages(orderMaster.getOrderImages());
orderListResponse.setIsInvoiced(orderMaster.getIsInvoiced()); orderListResponse.setIsInvoiced(orderMaster.getIsInvoiced());
orderListResponse.setOriginalWorkerId(orderMaster.getOriginalWorkerId()); orderListResponse.setOriginalWorkerId(orderMaster.getOriginalWorkerId());
orderListResponse.setConfirmStartTime(detail.getConfirmStartTime());
orderListResponse.setDeliveryType(orderMaster.getDeliveryType());
orderListResponse.setOrderType(orderMaster.getOrderType()); orderListResponse.setOrderType(orderMaster.getOrderType());
orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder()); orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder());

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

@ -284,7 +284,7 @@ public class OrderMasterController extends BaseController {
} }
// 查询原财务主单 // 查询原财务主单
FinancialMaster financialMaster = financialMasterService.selectByOrderId(request.getOrderId()); FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(request.getOrderId());
if (financialMaster == null) { if (financialMaster == null) {
return AjaxResult.error("订单财务信息不存在"); return AjaxResult.error("订单财务信息不存在");
} }
@ -307,7 +307,6 @@ public class OrderMasterController extends BaseController {
// 更新主单金额 // 更新主单金额
financialMaster.setServerMoney(transferAmount); financialMaster.setServerMoney(transferAmount);
financialMaster.setMoney(transferAmount);
financialMaster.setPayMoney(transferAmount); financialMaster.setPayMoney(transferAmount);
financialMaster.setRemark("订单转单，原金额：" + originalAmount + "，新金额：" + transferAmount); financialMaster.setRemark("订单转单，原金额：" + originalAmount + "，新金额：" + transferAmount);
financialMasterService.updateFinancialMaster(financialMaster); financialMasterService.updateFinancialMaster(financialMaster);
@ -316,8 +315,8 @@ public class OrderMasterController extends BaseController {
if (differenceAmount.compareTo(BigDecimal.ZERO) > 0 && originalOrder.getWorkerId() != null) { if (differenceAmount.compareTo(BigDecimal.ZERO) > 0 && originalOrder.getWorkerId() != null) {
FinancialDetail differenceDetail = new FinancialDetail(); FinancialDetail differenceDetail = new FinancialDetail();
differenceDetail.setFinancialMasterId(financialMaster.getId()); differenceDetail.setFinancialMasterId(financialMaster.getId());
differenceDetail.setWorkerId(originalOrder.getWorkerId()); // 原师傅 differenceDetail.setPayeeId(originalOrder.getWorkerId()); // 原师傅
differenceDetail.setMoney(differenceAmount); differenceDetail.setPayMoney(differenceAmount);
differenceDetail.setFinancialDetailType(FinancialDetailType.TRANSFER_DIFFERENCE_FEE.getCode()); differenceDetail.setFinancialDetailType(FinancialDetailType.TRANSFER_DIFFERENCE_FEE.getCode());
differenceDetail.setRemark("转单差价，原师傅获得"); differenceDetail.setRemark("转单差价，原师傅获得");
financialDetailService.insertFinancialDetail(differenceDetail); financialDetailService.insertFinancialDetail(differenceDetail);
@ -337,12 +336,16 @@ public class OrderMasterController extends BaseController {
} }
// 设置新师傅ID（可以为null，表示进入接单大厅） // 设置新师傅ID（可以为null，表示进入接单大厅）
if(request.getNewWorkerId()==null){
updateOrder.setWorkerId(-1L);
}else{
updateOrder.setWorkerId(request.getNewWorkerId()); updateOrder.setWorkerId(request.getNewWorkerId());
updateOrder.setUpdateBy(getLoginName()); }
// updateOrder.setUpdateBy(getLoginName());
// 构建转单备注 // 构建转单备注
String newRemark = originalOrder.getRemark() != null ? originalOrder.getRemark() : ""; String newRemark = originalOrder.getRemark() != null ? originalOrder.getRemark() : "";
String transferInfo = "【转单记录：" + getLoginName() + String transferInfo = "【转单记录：" +
"于" + DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date()); "于" + DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", new Date());
if (request.getNewWorkerId() != null) { if (request.getNewWorkerId() != null) {
@ -370,8 +373,7 @@ public class OrderMasterController extends BaseController {
request.getOrderId(), request.getOrderId(),
originalOrder.getWorkerId(), originalOrder.getWorkerId(),
request.getNewWorkerId(), request.getNewWorkerId(),
request.getTransferAmount(), request.getTransferAmount());
getLoginName());
String message; String message;
if (request.getNewWorkerId() != null) { if (request.getNewWorkerId() != null) {

4
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
View File

@ -247,4 +247,8 @@ public class OrderListResponse {
private Long serverGoodsId; private Long serverGoodsId;
private Date confirmStartTime;
private Integer deliveryType;
} }