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-09-15 15:43:51 +08:00
parent 9db20efd88
commit 9acd98d9b5
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -799,7 +799,7 @@ public class OrderDetailController extends BaseController {
orderListResponse.setPayMoney(detailPayMoney); orderListResponse.setPayMoney(detailPayMoney);
orderListResponse.setIsOnlyServ(Boolean.FALSE); orderListResponse.setIsOnlyServ(Boolean.FALSE);
} }
orderListResponse.setIsNeedBill(orderMaster.getIsNeedBill()); orderListResponse.setIsNeedBill(orderMaster.getIsNeedBill());
orderListResponse.setIsMonitoredOrder(orderMaster.getIsMonitoredOrder()); orderListResponse.setIsMonitoredOrder(orderMaster.getIsMonitoredOrder());
orderListResponse.setOrderImages(orderMaster.getOrderImages()); orderListResponse.setOrderImages(orderMaster.getOrderImages());
@ -812,6 +812,8 @@ public class OrderDetailController extends BaseController {
orderListResponse.setOrderType(orderMaster.getOrderType()); orderListResponse.setOrderType(orderMaster.getOrderType());
orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder()); orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder());
// 编辑返回属性 // 编辑返回属性
orderListResponse.setShareAccountCountdownEndTime(detail.getShareAccountCountdownEndTime());
orderListResponse.setShareAccountCountdownDuration(detail.getShareAccountCountdownDuration());
orderListResponse.setOrderDetailId(detail.getId()); orderListResponse.setOrderDetailId(detail.getId());
orderListResponse.setOrderDetailCode(detail.getCode()); orderListResponse.setOrderDetailCode(detail.getCode());
orderListResponse.setOrderMasterId(detail.getOrderMasterId()); orderListResponse.setOrderMasterId(detail.getOrderMasterId());

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

@ -1853,12 +1853,14 @@ public class OrderMasterController extends BaseController {
serverMoney=serverMoney.add(leaderMoney); serverMoney=serverMoney.add(leaderMoney);
logger.info("大师傅的服务金额{}大师傅的分成{}",serverMoney,leaderMoney); logger.info("大师傅的服务金额{}大师傅的分成{}",serverMoney,leaderMoney);
Shop shop=shopService.getShop(goods.getShopId()); Shop shop=shopService.getShop(goods.getShopId());
Shop serviceShop=shopService.getShop(orderMaster.getServiceShopId());
shop = calculateShopDistance(orderMaster, shop); shop = calculateShopDistance(orderMaster, shop);
// 编辑返回属性 // 编辑返回属性
orderListResponse.setDeliveryType(orderMaster.getDeliveryType()); orderListResponse.setDeliveryType(orderMaster.getDeliveryType());
orderListResponse.setDeliveryRemark(orderMaster.getDeliveryRemark()); orderListResponse.setDeliveryRemark(orderMaster.getDeliveryRemark());
orderListResponse.setDeliveryImages(orderMaster.getDeliveryImages()); orderListResponse.setDeliveryImages(orderMaster.getDeliveryImages());
orderListResponse.setShop(shop); orderListResponse.setShop(shop);
orderListResponse.setServiceShop(serviceShop);
orderListResponse.setGoods(goods); orderListResponse.setGoods(goods);
orderListResponse.setTrackingNumber(orderMaster.getTrackingNumber()); orderListResponse.setTrackingNumber(orderMaster.getTrackingNumber());

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

@ -301,4 +301,6 @@ public class OrderListResponse {
private Integer shareAccountCountdownDuration; private Integer shareAccountCountdownDuration;
private Shop shop; private Shop shop;
private Shop serviceShop;
} }

1
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -767,6 +767,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
logger.info("子订单[code={}]开始自动提现", odCode); logger.info("子订单[code={}]开始自动提现", odCode);
if (MoneyUtil.lte0(dtx)) { if (MoneyUtil.lte0(dtx)) {
logger.info("子订单[code={}] 待提现金额={} 无需提现", odCode, dtx); logger.info("子订单[code={}] 待提现金额={} 无需提现", odCode, dtx);
updateStatus(orderDetailId, OrderStatus.FINISH.code());
} else { } else {
// 待提现金额 // 待提现金额
String cashAmt = AdapayUtils.bigDecimalToString(dtx); String cashAmt = AdapayUtils.bigDecimalToString(dtx);