Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/order/service/impl/GuorenOrderApiServiceImpl.java

@@ -1163,6 +1163,7 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
             //2、 转保
             boo = GuorenDuplicateInsuranceComponent.buildCheckCodeParam(resp, requestInfoList, req);
             if (boo) {
+                a++;
                 SysQuoteRecord sysQuoteRecord = new SysQuoteRecord(yaQuoteInfoVo.getUserid(),companyId,yaQuoteInfoVo.getCarInfo().getLicenseNo(),
                         QuoteNumberConstant.QuoteAction.TRANSFER_INSRUANCE.getCode().toString(),QuoteNumberConstant.QuoteResult.FAIL.getCode().toString());
                 sysQuoteRecords.add(sysQuoteRecord);

src/main/java/com/ydtech/modules/scheme/service/impl/PtlSchemeServiceImpl.java

@@ -253,6 +253,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
             scheme.setVehicleType(schemeSaveVo.getVehicleType());
             scheme.setEnergyType(schemeSaveVo.getEnergyType());
             scheme.setCarnature(schemeSaveVo.getCarnature());
+            scheme.setPriorityLevel(item.getPriorityLevel());
             this.saveOrUpdate(scheme);
 
 
@@ -599,7 +600,9 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                 .eq(PtlScheme::getProductId, schemeQueryVo.getProductId())
                 .eq(PtlScheme::getVehicleType, schemeQueryVo.getVehicleType())
                 .eq(PtlScheme::getEnergyType, EnergyType.isNewEnergy(schemeQueryVo.getEnergyType()) ? "1" : "0")
-                .eq(PtlScheme::getCarnature, schemeQueryVo.getCarnature()));
+                .eq(PtlScheme::getCarnature, schemeQueryVo.getCarnature())
+                .orderByAsc(PtlScheme::getPriorityLevel)
+                .orderByDesc(PtlScheme::getCreateTime));
 
         List<CompanySchemeVo> schemeVos = new ArrayList<>();
         ptlSchemes.forEach(item -> {