|
|
@@ -1,7 +1,6 @@
|
|
|
package com.ydtech.modules.order.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
-import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
@@ -28,7 +27,10 @@ import com.ydtech.modules.order.entity.BasePageResult;
|
|
|
import com.ydtech.modules.order.entity.InsAreaCompany;
|
|
|
import com.ydtech.modules.order.entity.InsOrders;
|
|
|
import com.ydtech.modules.order.entity.bo.UnderwritingRulesBo;
|
|
|
-import com.ydtech.modules.order.entity.vo.*;
|
|
|
+import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
|
|
|
+import com.ydtech.modules.order.entity.vo.OrderQueryVo;
|
|
|
+import com.ydtech.modules.order.entity.vo.OrderVo;
|
|
|
+import com.ydtech.modules.order.entity.vo.VerifyOrdersVo;
|
|
|
import com.ydtech.modules.order.entity.vo.ya.YaExtendInfoDto;
|
|
|
import com.ydtech.modules.order.service.InsAreaCompanyService;
|
|
|
import com.ydtech.modules.order.service.InsOrdersService;
|
|
|
@@ -47,7 +49,6 @@ import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
-import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.ydtech.modules.order.constants.OrderCacheConstant.*;
|
|
|
@@ -92,9 +93,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
if (InsOrderStatusEnum.TO_BACK.getCode().equals(orderStatus)) {
|
|
|
return;
|
|
|
}
|
|
|
- InsOrders insOrders = getById(orderNo);
|
|
|
- if (Integer.parseInt(orderStatus) > Integer.parseInt(insOrders.getOrderstatus())) {
|
|
|
- insOrders.setOrderstatus(orderStatus);
|
|
|
+ // 查出最新状态的子订单修改
|
|
|
+ InsAreaCompany insAreaCompany = insAreaCompanyService.lambdaQuery().orderByDesc(InsAreaCompany::getOrderstatus).last("limit 1").getEntity();
|
|
|
+ if (!ObjectUtils.isEmpty(insAreaCompany)) {
|
|
|
+ InsOrders insOrders = getById(orderNo);
|
|
|
+ insOrders.setOrderstatus(insAreaCompany.getOrderstatus());
|
|
|
updateById(insOrders);
|
|
|
}
|
|
|
}
|
wks