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-10-16 08:42:48 +08:00
parent 9ebbc056f3
commit 16891e331d
7 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -154,6 +154,10 @@ public class OrderController extends BaseController {
try {
// 找出原单的数量
List<OrderGoods> orderGoodsList = orderGoodsService.selectByOrderMasterId(request.getOrderMasterId());
if (request.getGenerateServiceOrder()!=null&&request.getGenerateServiceOrder() == 1) {
return AjaxResult.success(orderGoodsList);
}
// 找出原单关联的细单的商品数量
List<OrderDetail> orderDetailList = orderDetailService.selectByOrderMasterId(request.getOrderMasterId());
for (OrderDetail orderDetail : orderDetailList) {
@ -1165,6 +1169,7 @@ public class OrderController extends BaseController {
if (orderMaster.getOrderType()!=null&&orderMaster.getOrderType() == 0) {
OrderMaster origiOrderMaster = new OrderMaster();
origiOrderMaster.setOriginalWorkerId(orderMaster.getWorkerId());
origiOrderMaster.setOrderStatuses("0,1,2,3,4");
List<OrderMaster> originalList = orderMasterService.selectOrderMasterList(origiOrderMaster);
monitoredOrderNum += originalList.size();
}
@ -2341,6 +2346,8 @@ public class OrderController extends BaseController {
}
accessoryOrderMaster.setServiceShopId(serviceShopId);
// 设置服务主单未撤销标识
accessoryOrderMaster.setServiceCancelled(0);
orderMasterService.updateOrderMaster(accessoryOrderMaster);
// 获取服务店铺的师傅信息（创建店铺的师傅）
@ -2384,6 +2391,7 @@ public class OrderController extends BaseController {
// 设置服务商品金额
serviceOrderMaster.setServerGoodsMoney(serviceMoney);
// 复制地址信息
serviceOrderMaster.setProvinceId(accessoryOrderMaster.getProvinceId());
serviceOrderMaster.setCityId(accessoryOrderMaster.getCityId());

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

@ -825,7 +825,7 @@ public class OrderDetailController extends BaseController {
// serviceShop=calculateShopDistance(orderMaster, serviceShop);
orderListResponse.setServiceShop(serviceShop);
orderListResponse.setShop(shop);
orderListResponse.setServiceShopId(serviceShop.getShopId());
orderListResponse.setServiceShopId(serviceShop != null ? serviceShop.getShopId() : null);
// 编辑返回属性
orderListResponse.setShareAccountCountdownEndTime(detail.getShareAccountCountdownEndTime());

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

@ -1022,6 +1022,9 @@ public class OrderMasterController extends BaseController {
if (orderMaster.getOrderType() == 0 && orderMaster.getWorkerId() != null
&& orderMaster.getWorkerId() != -1 && orderMaster.getIsMonitoredOrder() == true) {
origiOrderMaster.setOriginalWorkerId(orderMaster.getWorkerId());
// 修复：将原始请求的isMonitoredOrder属性复制到额外查询中，确保过滤条件一致
// origiOrderMaster.setShowInMonitor(orderMaster.getIsMonitoredOrder());
origiOrderMaster.setOrderStatuses("0,1,2,3,4");
List<OrderMaster> originalList = orderMasterService.selectOrderMasterList(origiOrderMaster);
list.addAll(originalList);
list.sort((o1, o2) -> {
@ -1229,7 +1232,9 @@ public class OrderMasterController extends BaseController {
}
}
}
orderListResponse.setServiceCancelled(master.getServiceCancelled());
orderListResponse.setServiceShopId(master.getServiceShopId());
orderListResponse.setGoods(goods);
// 编辑返回属性
orderListResponse.setGoodsOrderMasterId(master.getGoodsOrderMasterId());
orderListResponse.setWorkerRemark(master.getWorkerRemark());
@ -1322,8 +1327,7 @@ public class OrderMasterController extends BaseController {
@PostMapping("/app/count")
@ResponseBody
public AjaxResult countAppList(@RequestBody OrderMaster orderMaster) {
logger.info("传入的主单数据{}", orderMaster);
logger.info("获取到的主单数量{}", orderMasterService.countOrderMasterList(orderMaster));
return AjaxResult.success(orderMasterService.countOrderMasterList(orderMaster));
}
@ -1984,6 +1988,7 @@ public class OrderMasterController extends BaseController {
orderListResponse.setDeliveryImages(orderMaster.getDeliveryImages());
orderListResponse.setShop(shop);
orderListResponse.setServiceShop(serviceShop);
orderListResponse.setServiceCancelled(orderMaster.getServiceCancelled());
orderListResponse.setMasterCompanyPhone(masterCompanyPhone);
orderListResponse.setOriginalWorkerId(goodsOrderMaster != null ? goodsOrderMaster.getWorkerId() : null);
@ -2429,7 +2434,8 @@ public class OrderMasterController extends BaseController {
// 判断该主单状态
OrderMaster orderMasterInfo = orderMasterService.selectById(orderMaster.getId());
if (!orderMasterInfo.getOrderStatus().equals(OrderStatus.PLAIN.code())
&& !orderMasterInfo.getOrderStatus().equals(OrderStatus.RECEIVE.code())) {
&& !orderMasterInfo.getOrderStatus().equals(OrderStatus.RECEIVE.code())
&&!orderMasterInfo.getOrderStatus().equals(OrderStatus.GOING.code())) {
return AjaxResult.error("该订单处于无法退单状态!");
}
@ -2464,7 +2470,10 @@ public class OrderMasterController extends BaseController {
OrderMaster goodsOrderUpdate = new OrderMaster();
goodsOrderUpdate.setId(orderMasterInfo.getGoodsOrderMasterId());
goodsOrderUpdate.setHasServiceOrder(0); // 重置为未派发状态
goodsOrderUpdate.setServiceShopId((long) -1);
// goodsOrderUpdate.setServiceShopId((long) -1);
// 设置服务主单已撤销标识
goodsOrderUpdate.setServiceCancelled(1);
goodsOrderUpdate.setShowInMonitor(0);
orderMasterService.updateOrderMaster(goodsOrderUpdate);
}
@ -2474,6 +2483,7 @@ public class OrderMasterController extends BaseController {
returnOrderUpdate.setReturnReason(orderMaster.getReturnReason());
returnOrderUpdate.setReturnReasonDetail(orderMaster.getReturnReasonDetail());
returnOrderUpdate.setReturnImages(orderMaster.getReturnImages());
orderMasterService.updateOrderMaster(returnOrderUpdate);
// 清空id

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

@ -308,4 +308,10 @@ public class OrderListResponse {
private Shop serviceShop;
private Long goodsOrderMasterId;
/**
* 是否已撤销服务主单：0=未撤销，1=已撤销
*/
@Excel(name = "是否已撤销服务主单", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=未撤销,1=已撤销")
private Integer serviceCancelled;
}

6
ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
View File

@ -354,6 +354,12 @@ public class OrderMaster extends BaseEntity {
@Excel(name = "是否显示在监控单", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=不显示,1=显示在监控单")
private Integer showInMonitor;
/**
* 是否已撤销服务主单：0=未撤销，1=已撤销
*/
@Excel(name = "是否已撤销服务主单", cellType = Excel.ColumnType.NUMERIC, readConverterExp = "0=未撤销,1=已撤销")
private Integer serviceCancelled;
/**
* 更新时间别名字段（用于SQL查询中的update_time别名映射）
*/

2
ghy-order/src/main/java/com/ghy/order/request/AppOrderAssignRequest.java
View File

@ -31,4 +31,6 @@ public class AppOrderAssignRequest {
//是否立即发货
private Integer isQuicklyDelivery;
private Integer generateServiceOrder;
}

12
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -74,6 +74,7 @@
<result property="shareAccountCountdownEndTime" column="share_account_countdown_end_time"/>
<result property="shareAccountCountdownDuration" column="share_account_countdown_duration"/>
<result property="showInMonitor" column="show_in_monitor"/>
<result property="serviceCancelled" column="service_cancelled"/>
</resultMap>
@ -145,7 +146,8 @@
after_service_status,
share_account_countdown_end_time,
share_account_countdown_duration,
show_in_monitor
show_in_monitor,
service_cancelled
FROM order_master
</sql>
<sql id="selectOrderMasterMoreInfo">
@ -216,7 +218,8 @@
om.after_service_status,
om.share_account_countdown_end_time,
om.share_account_countdown_duration,
om.show_in_monitor
om.show_in_monitor,
om.service_cancelled
FROM order_master om
LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
LEFT JOIN goods g ON g.goods_id = om.goods_id
@ -253,7 +256,7 @@
AND ca.country_id = #{district}
</if>
<if test="isMonitoredOrder">
AND om.show_in_monitor = 1 AND om.order_status in (0,1,2,3,4) and om.worker_id is not null
AND om.show_in_monitor = 1 AND om.order_status in (0,1,2,3,4) and om.worker_id is not null and om.order_status != 6
</if>
<if test="allSelfAssigned != null">
AND all_self_assigned = #{allSelfAssigned}
@ -545,6 +548,7 @@
<if test="afterServiceStatus != null">after_service_status = #{afterServiceStatus},</if>
<if test="shareAccountCountdownEndTime != null">share_account_countdown_end_time = #{shareAccountCountdownEndTime},</if>
<if test="shareAccountCountdownDuration != null">share_account_countdown_duration = #{shareAccountCountdownDuration},</if>
<if test="serviceCancelled != null">service_cancelled = #{serviceCancelled},</if>
update_time = SYSDATE()
</set>
WHERE id = #{id}
@ -619,6 +623,7 @@
<if test="workerRemark != null">worker_remark,</if>
<if test="shareAccountCountdownEndTime != null">share_account_countdown_end_time,</if>
<if test="shareAccountCountdownDuration != null">share_account_countdown_duration,</if>
service_cancelled,
create_time,
update_time
)VALUES(
@ -675,6 +680,7 @@
<if test="workerRemark != null">#{workerRemark},</if>
<if test="shareAccountCountdownEndTime != null">#{shareAccountCountdownEndTime},</if>
<if test="shareAccountCountdownDuration != null">#{shareAccountCountdownDuration},</if>
0,
SYSDATE(),
SYSDATE()
)