|
@@ -246,7 +246,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
//TODO 如果没指定座位,等待逻辑确认
|
|
//TODO 如果没指定座位,等待逻辑确认
|
|
|
GroupsTrips groups = groupsMapper.selectOne(Wrappers.lambdaQuery(GroupsTrips.class).eq(GroupsTrips::getSkuId, payRequest.getSkuId()).gt(GroupsTrips::getAvailableNum, 0).last("limit 1").orderByAsc(GroupsTrips::getAvailableNum));
|
|
GroupsTrips groups = groupsMapper.selectOne(Wrappers.lambdaQuery(GroupsTrips.class).eq(GroupsTrips::getSkuId, payRequest.getSkuId()).gt(GroupsTrips::getAvailableNum, 0).last("limit 1").orderByAsc(GroupsTrips::getAvailableNum));
|
|
|
if (groups == null) {
|
|
if (groups == null) {
|
|
|
- relation = createNewGroupsTrips(sku, true);
|
|
|
|
|
|
|
+ relation = createNewGroupsTrips(sku);
|
|
|
isNew = true;
|
|
isNew = true;
|
|
|
} else {
|
|
} else {
|
|
|
//寻找快满编车队进行占座
|
|
//寻找快满编车队进行占座
|
|
@@ -1810,7 +1810,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
if (groups == null) {
|
|
if (groups == null) {
|
|
|
//新增空车队发送模板消息
|
|
//新增空车队发送模板消息
|
|
|
TASK_POOL.execute(() -> {
|
|
TASK_POOL.execute(() -> {
|
|
|
- createNewGroupsTrips(sku, false);
|
|
|
|
|
|
|
+ createNewGroupsTrips(sku);
|
|
|
try {
|
|
try {
|
|
|
List<CustomerService> customerServices = customerServiceMapper.selectList(null);
|
|
List<CustomerService> customerServices = customerServiceMapper.selectList(null);
|
|
|
for (CustomerService customerService : customerServices) {
|
|
for (CustomerService customerService : customerServices) {
|
|
@@ -1827,7 +1827,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
/**
|
|
/**
|
|
|
* 新增空车队
|
|
* 新增空车队
|
|
|
*/
|
|
*/
|
|
|
- private GroupsRelation createNewGroupsTrips(GoodsDonSku sku, Boolean isNeedRelationId) {
|
|
|
|
|
|
|
+ private GroupsRelation createNewGroupsTrips(GoodsDonSku sku) {
|
|
|
//新增车次
|
|
//新增车次
|
|
|
GroupsTrips groups = new GroupsTrips();
|
|
GroupsTrips groups = new GroupsTrips();
|
|
|
groups.setSkuId(sku.getId());
|
|
groups.setSkuId(sku.getId());
|
|
@@ -1851,7 +1851,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
GroupsRelation relation = new GroupsRelation();
|
|
GroupsRelation relation = new GroupsRelation();
|
|
|
relation.setGroupsId(groups.getId());
|
|
relation.setGroupsId(groups.getId());
|
|
|
relation.setNum(1);
|
|
relation.setNum(1);
|
|
|
- relation.setStatus(isNeedRelationId ? GroupsRelation.Status.locking : GroupsRelation.Status.none);
|
|
|
|
|
|
|
+ relation.setStatus(GroupsRelation.Status.none);
|
|
|
relation.setGroupsId(groups.getId());
|
|
relation.setGroupsId(groups.getId());
|
|
|
groupsRelationMapper.insert(relation);
|
|
groupsRelationMapper.insert(relation);
|
|
|
|
|
|