|
|
@@ -391,8 +391,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
TASK_POOL.execute(() -> distributeWaitingSendPointsRecord(order));
|
|
|
}
|
|
|
this.updateById(order);
|
|
|
- //无车队,新增车队
|
|
|
- checkNoGroupsTripsAndSendMsg(sku, order);
|
|
|
+ if (goodsDon.getType() == 1) {
|
|
|
+ //无车队,新增车队
|
|
|
+ checkNoGroupsTripsAndSendMsg(sku, order);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -661,8 +663,10 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
TASK_POOL.execute(() -> distributeWaitingSendPointsRecord(orderDon));
|
|
|
}
|
|
|
this.updateById(orderDon);
|
|
|
- //无车队,新增车队
|
|
|
- checkNoGroupsTripsAndSendMsg(sku, orderDon);
|
|
|
+ if (goodsDon.getType() == 1) {
|
|
|
+ //无车队,新增车队
|
|
|
+ checkNoGroupsTripsAndSendMsg(sku, orderDon);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -1286,9 +1290,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
private void checkNoGroupsTripsAndSendMsg(GoodsDonSku sku, OrderDon order) {
|
|
|
GroupsTrips groups = groupsMapper.selectOne(Wrappers.lambdaQuery(GroupsTrips.class).eq(GroupsTrips::getSkuId, sku.getId()).gt(GroupsTrips::getAvailableNum, 0).last("limit 1").orderByAsc(GroupsTrips::getAvailableNum));
|
|
|
if (groups == null) {
|
|
|
- createNewGroupsTrips(sku, false);
|
|
|
//新增空车队发送模板消息
|
|
|
TASK_POOL.execute(() -> {
|
|
|
+ createNewGroupsTrips(sku, false);
|
|
|
try {
|
|
|
List<CustomerService> customerServices = customerServiceMapper.selectList(null);
|
|
|
for (CustomerService customerService : customerServices) {
|