yumeng il y a 2 ans
Parent
commit
10d3d59029

+ 6 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -664,11 +664,15 @@ public class SupplyChainController extends BaseController {
                 export.add(date.getString("deliveryNum"));
                 export.add(date.getString("deliveryRadio"));
                 export.add(date.getString("notDeliveryNum"));
+                String userName = supplyChainService.getUserName(date.getLong("promoterId"));
+                if (!Check.isNull(userName)) {
+                    export.add(userName);
+                }
                 exportList.add(export);
             }
         }
 
-        String[] headers = {"达人ID", "达人名称", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数"};
+        String[] headers = {"达人ID", "达人名称", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数", "绑定人"};
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();
@@ -1299,7 +1303,7 @@ public class SupplyChainController extends BaseController {
     public TableDataInfo bdTotal(
             @ApiParam("开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
             @ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
-            @ApiParam("用户ID") @RequestParam(value = "collectSampleId", required = false) Long collectSampleId){
+            @ApiParam("用户ID") @RequestParam(value = "collectSampleId", required = false) Long collectSampleId) {
         Map<String, Object> requestMap = new HashMap<>();
         if (!Check.isNull(orderStartDate)) {
             Integer start = DateUtils.getIntegerTime(orderStartDate);
@@ -1371,5 +1375,4 @@ public class SupplyChainController extends BaseController {
     }
 
 
-
 }

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/SupplyChainMapper.java

@@ -96,4 +96,6 @@ public interface SupplyChainMapper {
     List<JSONObject> exportBdDetail(Map<String, Object> requestMap);
 
     List<JSONObject> getUserList(@Param("map") Map<Long, Long> map);
+
+    String getUserName(@Param("promoterId") Long promoterId);
 }

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/ISupplyChainService.java

@@ -117,4 +117,6 @@ public interface ISupplyChainService {
     List<JSONObject> bdTotal(Map<String, Object> requestMap);
 
     List<JSONObject> exportBdDetail(Map<String, Object> requestMap);
+
+    String getUserName(Long promoterId);
 }

+ 5 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/SupplyChainServiceImpl.java

@@ -259,4 +259,9 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
     public List<JSONObject> exportBdDetail(Map<String, Object> requestMap) {
         return supplyChainMapper.exportBdDetail(requestMap);
     }
+
+    @Override
+    public String getUserName(Long promoterId) {
+        return supplyChainMapper.getUserName(promoterId);
+    }
 }

+ 7 - 0
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -1470,4 +1470,11 @@
         </foreach>
         GROUP BY promoter_id
     </select>
+    <select id="getUserName" resultType="java.lang.String" parameterType="java.lang.Long">
+        select
+        group_concat(user_name)  as 'userName'
+        from kuaishou_promoter
+        where   promoter_id  = #{promoterId}
+
+    </select>
 </mapper>