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

未约未排的单不显示已经派完的单

This commit is contained in:
donqi 2022-11-18 01:47:54 +08:00
parent b45f2dace5
commit df6bd9393f
6 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,6 +212,7 @@ public class OrderController extends BaseController {
// 判断是否全部派完
if(request.getIsAll() == 1){
om.setOrderStatus(OrderStatus.GOING.code());
om.setHasDispatchedAll(1);
}
orderMasterService.updateOrderMaster(om);
@ -871,6 +872,10 @@ public class OrderController extends BaseController {
public List<OrderListResponse> getMasterList(OrderMaster orderMaster) {
List<OrderListResponse> orderListResponses = new ArrayList<>();
// 如果查询的是未约未排状态，只查询未全部派完的主单
if (OrderStatus.PLAIN.equals(orderMaster.getOrderStatus())) {
orderMaster.setHasDispatchedAll(0);
}
List<OrderMaster> list = orderMasterService.selectOrderMasterList(orderMaster);
for (OrderMaster master : list) {// 初始化属性
OrderListResponse orderListResponse = new OrderListResponse();

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

@ -694,6 +694,17 @@ public class OrderDetailController extends BaseController {
financialDetailService.deleteFinancialDetailByOrderDetailId(orderDetail.getId());
// 删除派单记录
orderGoodsService.deleteByOrderDetailId(orderDetail.getId());
// 查询子单信息
OrderDetail detailInfo = this.orderDetailService.selectById(orderDetail.getId());
OrderMaster orderMaster2Update = new OrderMaster();
// 查询是否还有派单记录，没有的话需要重置主单是否自己承接的字段为NULL
List<OrderGoods> existOrderGoods = orderGoodsService.selectByOrderMasterId(detailInfo.getOrderMasterId());
if (CollectionUtils.isNotEmpty(existOrderGoods)) {
orderMaster2Update.setResetAllSelfAssigned(true);
}
// 更新主单是否全部派完
orderMaster2Update.setHasDispatchedAll(0);
orderMasterService.updateOrderMaster(orderMaster2Update);
return AjaxResult.success();
}

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

@ -90,5 +90,9 @@ public class OrderMaster extends BaseEntity {
private Integer allSelfAssigned;
private Boolean resetAllSelfAssigned;
private Integer hasDispatchedAll;
private List<Long> customerIds;
}

2
ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java
View File

@ -27,7 +27,7 @@ public interface OrderMasterService {
* @param orderMaster 主订单属性
* @return 成功条数
*/
int updateOrderMaster(OrderMaster orderMaster) throws BaseAdaPayException;
int updateOrderMaster(OrderMaster orderMaster);
/**
* @param orderMaster 主订单入参

2
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -82,7 +82,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
}
@Override
public int updateOrderMaster(OrderMaster orderMaster) throws BaseAdaPayException {
public int updateOrderMaster(OrderMaster orderMaster) {
return orderMasterMapper.updateOrderMaster(orderMaster);
}

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

@ -232,6 +232,8 @@
<if test="useTimeNotRange">expect_time_end = null,</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="allSelfAssigned != null">all_self_assigned = #{allSelfAssigned},</if>
<if test="resetAllSelfAssigned">all_self_assigned = null,</if>
<if test="hasDispatchedAll != null">has_dispatched_all = #{hasDispatchedAll},</if>
update_time = SYSDATE()
</set>
WHERE id = #{id}