1. 调整分销数据查询

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

@@ -172,5 +172,17 @@ public class AuditExportVo {
     @ExcelProperty("补录订单")
     private String isExternal;
 
+    @ApiModelProperty("一级分销人员")
+    @ExcelIgnore
+    private String firstLevelUserId;
+
+    @ApiModelProperty("二级分销人员")
+    @ExcelIgnore
+    private String twoLevelUserId;
+
+    @ApiModelProperty("三级分销人员")
+    @ExcelIgnore
+    private String threeLevelUserId;
+
 
 }

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

@@ -92,6 +92,16 @@ public class ExcelExportServiceImpl implements ExcelExportService {
             }else if(item.getIsExternal().equals("1")){
                 item.setIsExternal("是");
             }
+            //判断是否存在分销人员 如果不存在则分销金额为0
+            if (item.getFirstLevelUserId() == null || item.getFirstLevelUserId().equals("")){
+                item.setFirstDetailPremiums("0");
+            }
+            if (item.getTwoLevelUserId() == null || item.getTwoLevelUserId().equals("")){
+                item.setSecondDetailPremiums("0");
+            }
+            if (item.getThreeLevelUserId() == null || item.getThreeLevelUserId().equals("")){
+                item.setThirdDetailPremiums("0");
+            }
         });
         return auditExportList;
     }

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

@@ -1611,6 +1611,9 @@
             ifo.jq_dept_premiums_level_3 + ifo.sy_dept_premiums_level_3 + ifo.no_dept_premiums_level_3 as dept_premiums_level_3,
             ifo.jq_dept_premiums_level_4 + ifo.sy_dept_premiums_level_4 + ifo.no_dept_premiums_level_4 as dept_premiums_level_4,
             ifo.jq_dept_premiums_level_5 + ifo.sy_dept_premiums_level_5 + ifo.no_dept_premiums_level_5 as dept_premiums_level_5,
+            ifo.first_level_user_id,
+            ifo.two_level_user_id,
+            ifo.three_level_user_id,
             ifo.first_detail_premiums,
             ifo.second_detail_premiums,
             ifo.third_detail_premiums,
@@ -1688,6 +1691,9 @@
             ifo.no_dept_premiums_level_3,
             ifo.no_dept_premiums_level_4,
             ifo.no_dept_premiums_level_5,
+            ifo.first_level_user_id,
+            ifo.two_level_user_id,
+            ifo.three_level_user_id,
             ifo.first_detail_premiums,
             ifo.second_detail_premiums,
             ifo.third_detail_premiums,