财务审核明细导出表 bug 修改

src/main/java/com/ydtech/modules/order/entity/vo/AuditExportVo.java

@@ -157,4 +157,9 @@ public class AuditExportVo {
     private String noProfitMarginPremiums;
 
 
+    @ApiModelProperty("是否是补录订单")
+    @ExcelProperty("补录订单")
+    private String isExternal;
+
+
 }

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

@@ -86,7 +86,13 @@ public class ExcelExportServiceImpl implements ExcelExportService {
         auditExportList.forEach(item->{
             //获取驾意险保单号
             if(item.getCrossInsurance() != null) {
-                item.setJyapplyno(OrderUtils.getJyPolicyNo(item.getCompanyId(), item.getApiType(), item.getCrossInsurance()));
+                item.setJyapplyno(OrderUtils.getJyPolicyNo(item.getCompanyId(), item.getApiType(), item.getCrossInsurance(), item.getIsExternal()));
+            }
+            //处理补录订单
+            if(item.getIsExternal().equals("0")){
+                item.setIsExternal("否");
+            }else if(item.getIsExternal().equals("1")){
+                item.setIsExternal("是");
             }
         });
         return auditExportList;

src/main/java/com/ydtech/utils/OrderUtils.java

@@ -11,6 +11,7 @@ import com.ydtech.modules.protocol.entity.constants.PtlApiType;
 import org.apache.commons.lang3.ObjectUtils;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 订单相关工具类
@@ -24,7 +25,7 @@ public class OrderUtils {
      * @param crossInsurance    驾意险json字符串
      * @return
      */
-    public static String getJyPolicyNo(String companyId, String apiType, String crossInsurance){
+    public static String getJyPolicyNo(String companyId, String apiType, String crossInsurance, String isExternal){
         //校验驾意险json字符串
         if(crossInsurance == null || crossInsurance.equals("")){
             return "";
@@ -33,6 +34,13 @@ public class OrderUtils {
         JSONArray crossInsuranceJson = JSONArray.parseArray(crossInsurance);
 
         if(crossInsuranceJson.size() > 0) {
+            //如果是外部订单全部都是一种格式
+            if(isExternal.equals("1")){
+                JSONObject jsonObject = crossInsuranceJson.getJSONObject(0);
+                String policyNo = jsonObject.getString("application");
+                return Objects.isNull(policyNo)? "" : policyNo;
+            }
+
             //爬虫
             if (!ObjectUtils.isEmpty(apiType)) {
                 if (PtlApiType.PTL_API_2.getCode() == Integer.parseInt(apiType)) {

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1465,7 +1465,8 @@
             ifo.third_detail_premiums,
             ifo.jq_profit_margin_premiums,
             ifo.sy_profit_margin_premiums,
-            ifo.no_profit_margin_premiums
+            ifo.no_profit_margin_premiums,
+            io.is_external
         FROM
             ins_fee_order_new ifo
                 LEFT JOIN ins_fee_audit ifa ON ifo.ins_order_no = ifa.ins_order_no