Selaa lähdekoodia

fix 生成新车队时,获取到车位状态后设置其状态

zoujiajian 3 vuotta sitten
vanhempi
sitoutus
043b26aced

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/exchange/impl/ExchangeCodeServiceImpl.java

@@ -412,7 +412,7 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 		groupsMapper.insert(groups);
 		relation.setGroupsId(groups.getId());
 		relation.setNum(1);
-		relation.setStatus(GroupsRelation.Status.locking);
+		relation.setStatus(GroupsRelation.Status.none);
 		relation.setGroupsId(groups.getId());
 		groupsRelationMapper.insert(relation);
 		//补充其他占位

+ 4 - 4
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -246,7 +246,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 						//TODO 如果没指定座位,等待逻辑确认
 						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) {
-							relation = createNewGroupsTrips(sku, true);
+							relation = createNewGroupsTrips(sku);
 							isNew = true;
 						} else {
 							//寻找快满编车队进行占座
@@ -1810,7 +1810,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		if (groups == null) {
 			//新增空车队发送模板消息
 			TASK_POOL.execute(() -> {
-				createNewGroupsTrips(sku, false);
+				createNewGroupsTrips(sku);
 				try {
 					List<CustomerService> customerServices = customerServiceMapper.selectList(null);
 					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();
 		groups.setSkuId(sku.getId());
@@ -1851,7 +1851,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		GroupsRelation relation = new GroupsRelation();
 		relation.setGroupsId(groups.getId());
 		relation.setNum(1);
-		relation.setStatus(isNeedRelationId ? GroupsRelation.Status.locking : GroupsRelation.Status.none);
+		relation.setStatus(GroupsRelation.Status.none);
 		relation.setGroupsId(groups.getId());
 		groupsRelationMapper.insert(relation);