Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/client/PartnerClient.java → tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/PartnerClient.java

@@ -1,4 +1,4 @@
-package com.jzg.quotation.summary.client;
+package com.jzg.quotation.commons.client;
 
 
 import org.springframework.cloud.openfeign.FeignClient;

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersMapper.java

@@ -147,5 +147,5 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
                                                                  @Param("userId") String userId,
                                                                  @Param("systemCode") String systemCode);
 
-    String selectMainOrderNumber(@Param("licenseNo") String licenseNo,@Param("realQuoteUserId") String realQuoteUserId);
+    InsOrders selectMainOrderNumber(@Param("licenseNo") String licenseNo,@Param("realQuoteUserId") String realQuoteUserId);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -35,7 +35,7 @@ import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.quotation.commons.client.OrgClient;
 import com.jzg.quotation.commons.client.PlatformClient;
 import com.jzg.quotation.summary.client.LocalLivingClient;
-import com.jzg.quotation.summary.client.PartnerClient;
+import com.jzg.quotation.commons.client.PartnerClient;
 import com.jzg.quotation.summary.entity.Result;
 import com.jzg.quotation.summary.entity.dto.ChannelRightsApiGrantReceiverDTO;
 import com.jzg.quotation.summary.entity.dto.ChannelRightsApiGrantRecordDTO;

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -165,9 +165,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             InsOrders insOrders = ordersAdd.getInsOrders();
             insOrders.setRealQuoteUserId(baseController.getUserName());
             InsOrdersAdd insOrdersAdd = BeanCopyUtil.deepCopy(ordersAdd, InsOrdersAdd.class);
-            String parentId = insOrdersMapper.selectMainOrderNumber(ordersAdd.getCarInfoVo().getLicenseNo(),ordersAdd.getInsOrders().getRealQuoteUserId());
-            if (StringUtils.isEmpty(insOrders.getQuoteNo())){
+            InsOrders parentOrders = insOrdersMapper.selectMainOrderNumber(ordersAdd.getCarInfoVo().getLicenseNo(),ordersAdd.getInsOrders().getRealQuoteUserId());
+            boolean nullOrders = ObjectUtil.isNull(parentOrders);
+            if (nullOrders){
                 insOrders.setQuoteNo(SnowFlakeUtil.getSnowFlakeId());
+                insOrders.setParentId("0");
+            }else {
+                insOrders.setParentId(parentOrders.getId());
+                insOrders.setQuoteNo(parentOrders.getQuoteNo());
             }
             HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(ordersAdd.getInsOrders().getCompanyId());
             String companyName = CompanyConstants.getCompanyNameByCode(esmInsCompanyHttpResult.getData().getCompanyCode());
@@ -175,9 +180,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrders.setIsTemporarily(ordersAdd.getIsTemporarily());
             insOrders.setProductName(ProductsType.getProductNameByCode(ordersAdd.getProductId()));
             insOrders.setOrderStatus(InsOrderStatusEnum.QUOTE_ING.getCode());
-
             insOrders.setEntryStatus(3);
-            insOrders.setParentId(parentId);
+
             // 插入订单信息，如果插入失败，则返回错误信息
             int insertResult = insOrdersMapper.insert(insOrders);
             if (insertResult <= 0) {
@@ -253,10 +257,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersRiskService.save(biRiskInfoVo);
 
             InsTaskImagesAdd imagesAdds = ordersAdd.getImagesAdds();
-            if (ObjectUtil.isNotEmpty(imagesAdds)) {
+            if (nullOrders) {
+                String no = insOrders.getQuoteNo();
                 List<InsTaskImages> insTaskImages = BeanUtil.copyToList(imagesAdds.getImages(), InsTaskImages.class);
                 insTaskImages.forEach(image -> {
-                    image.setQuoteNo(insOrders.getQuoteNo());
+                    image.setQuoteNo(no);
                 });
                 insTaskImagesService.saveBatch(insTaskImages);
             }
@@ -269,7 +274,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             this.orderStatusMessage(insOrders,
                     insOrdersCarInfo, insOrdersCosts,
                     baseController.getToken(), MessageCodeEnum.TEMPLATE_9);
-            if (StringUtils.equals("0",parentId)){
+            if (nullOrders){
                 InsOrders orders = insOrdersAdd.getInsOrders();
                 orders.setQuoteNo(insOrders.getQuoteNo());
                 insOrdersAdd.setInsOrders(orders);

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -1438,13 +1438,11 @@
     </select>
 
 
-    <select id="selectMainOrderNumber" resultType="java.lang.String">
-        SELECT IFNULL(
-               (SELECT o.id
-                FROM ins_orders o
-                         LEFT JOIN ins_orders_car_info c ON o.id = c.order_no
-                WHERE o.parent_id = 0 AND o.entry_status = 3 AND c.license_no = #{licenseNo} AND o.real_quote_user_id = #{realQuoteUserId} LIMIT 1),0
-        ) AS order_id
+    <select id="selectMainOrderNumber" resultType="com.jzg.commons.entity.orders.po.InsOrders">
+        SELECT o.id,o.quote_no
+        FROM ins_orders o
+                 LEFT JOIN ins_orders_car_info c ON o.id = c.order_no
+        WHERE o.parent_id = 0 AND o.entry_status = 3 AND c.license_no = #{licenseNo} AND o.real_quote_user_id = #{realQuoteUserId}
     </select>
 
 </mapper>