Browse Source

骄阳增加导出 财务结算结算页面增加备注显示 结算详情增加全部数据展示 财务复核增加推荐人信息展示

yumeng 1 year ago
parent
commit
d29d1c0d50

+ 81 - 3
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JiaoYangReportController.java

@@ -44,14 +44,13 @@ public class JiaoYangReportController extends BaseController {
     private ISysUserService sysUserService;
     private ISysUserService sysUserService;
 
 
 
 
-
     @GetMapping("/getAuthItem")
     @GetMapping("/getAuthItem")
     @ApiOperation(value = "商品列表")
     @ApiOperation(value = "商品列表")
     public JSONObject getAuthItem() throws ParseException, InterruptedException {
     public JSONObject getAuthItem() throws ParseException, InterruptedException {
 
 
         jiaoYangReportService.deleteAuthItem();
         jiaoYangReportService.deleteAuthItem();
         String cookie = jiaoYangReportService.getJiaoYangCookie();
         String cookie = jiaoYangReportService.getJiaoYangCookie();
-        jiaoYangReportService.getAuthItem(cookie, 0,0);
+        jiaoYangReportService.getAuthItem(cookie, 0, 0);
         // Thread.sleep(5000);
         // Thread.sleep(5000);
 
 
         JSONObject json = new JSONObject();
         JSONObject json = new JSONObject();
@@ -113,7 +112,7 @@ public class JiaoYangReportController extends BaseController {
                 export.add(data.getString("promoterId"));
                 export.add(data.getString("promoterId"));
                 export.add(data.getString("promoterNick"));
                 export.add(data.getString("promoterNick"));
                 export.add(data.getString("promoterPhoto"));
                 export.add(data.getString("promoterPhoto"));
-             //    export.add(data.getString("mcnCommissionRateView"));
+                //    export.add(data.getString("mcnCommissionRateView"));
                 exportList.add(export);
                 exportList.add(export);
             }
             }
         }
         }
@@ -415,6 +414,85 @@ public class JiaoYangReportController extends BaseController {
     }
     }
 
 
 
 
+    @GetMapping("/exportPromoter")
+    public void exportPromoter(HttpServletRequest request, HttpServletResponse response, String statDate, @ApiParam("订单开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
+                               @ApiParam("订单结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
+                               @ApiParam("达人名称") @RequestParam(value = "promoterNickName", required = false) String promoterNickName,
+                               @ApiParam("达人ID") @RequestParam(value = "promoterId", required = false) Long promoterId,
+                               @ApiParam("类型") @RequestParam(value = "type", required = false) Long type,
+                               Long userId) throws IOException {
+        Map<String, Object> requestMap = new HashMap<>();
+
+       /* String roleId = sysRoleService.getRoleBYUserId(userId);
+        if ("jy_bd".equals(roleId) || "jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId) || "jy_scissors".equals(roleId)) {
+            List<Long> userIds = new ArrayList<>();
+            if ("jy_bd_manage".equals(roleId) || "jy_scissors_manage".equals(roleId)) {
+                Long deptId = sysDeptService.getDeptIdByUserId(userId);
+                userIds = sysDeptService.getDeptUserListByDeptId(deptId);
+            } else {
+                userIds.add(userId);
+            }
+            List<Long> promoterIds = jiaoYangReportService.getPromoterIdsByUserIds(userIds);
+            if (Check.isNull(promoterIds)) {
+                return getDataTable(new ArrayList<JSONObject>());
+            }
+            requestMap.put("promoterIds", promoterIds);
+        }*/
+
+
+        if (!Check.isNull(orderStartDate)) {
+            Long start = DateUtils.strDateToInt(orderStartDate);
+            requestMap.put("start", start);
+        }
+        if (!Check.isNull(orderEndDate)) {
+            Long end = DateUtils.strDateToInt(orderEndDate);
+            requestMap.put("end", end);
+        }
+        if (!Check.isNull(promoterNickName)) {
+            requestMap.put("promoterNickName", promoterNickName);
+        }
+        if (!Check.isNull(promoterId)) {
+            requestMap.put("promoterId", promoterId);
+        }
+        if (!Check.isNull(type)) {
+            requestMap.put("type", type);
+        }
+        List<JSONObject> list = jiaoYangReportService.promoter(requestMap);
+        List<List<Object>> exportList = new ArrayList<>();
+        if (!Check.isNull(list)) {
+            for (int i = 0; i < list.size(); i++) {
+                JSONObject data = list.get(i);
+                List<Object> export = new ArrayList();
+                export.add(data.getString("promoterId"));
+                export.add(data.getString("promoterNickName"));
+                export.add(data.getString("orderNum"));
+                export.add(data.getString("validOrderNUm"));
+                export.add(data.getDouble("validRadio") * 100);
+                export.add(data.getString("payAmount"));
+                export.add(data.getString("validPayAmount"));
+                export.add(data.getString("deliveryNum"));
+                export.add(data.getString("notDeliveryNum"));
+                export.add(data.getDouble("deliveryRadio") * 100);
+                export.add(data.getString("userName"));
+                exportList.add(export);
+            }
+        }
+        String[] headers = {"达人ID", "达人名称", "订单数", "有效单数", "有效率", "付款金额", "有效付款金额", "发货数", "未发货数", "发货率", "绑定人"};
+        OutputStream os = response.getOutputStream();
+        ExportExcelUtils eeu = new ExportExcelUtils();
+        XSSFWorkbook workbook = new XSSFWorkbook();
+        eeu.exportExcel(workbook, 0, "二创信息", headers, exportList);
+        this.setResponseHeader(response, "二创信息.xls");
+        try {
+            workbook.write(os);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        os.flush();
+        os.close();
+    }
+
+
     /**
     /**
      * 达人带货详情
      * 达人带货详情
      *
      *

+ 10 - 7
ruixuan-live/src/main/resources/mapper/isc/KuaishouRuleSettlementDataMapper.xml

@@ -369,10 +369,15 @@
 
 
 
 
     <select id="getPromoterSettlementDetail" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getPromoterSettlementDetail" resultType="com.alibaba.fastjson.JSONObject">
-        select t1.*,t2.* from (
+        select t1.*,t2.* ,
+        (select remarks from kuaishou_rule_settlement_check where relate_id =t1.relateId and promoter_id = t1.promoterId
+        and remarks is not null order by create_time desc limit 1) as 'remarks'
+        from (
 
 
         select
         select
+
         id as 'id',
         id as 'id',
+        relate_id as 'relateId',
         rule_id as 'ruleId',
         rule_id as 'ruleId',
         rule_name as 'ruleName',
         rule_name as 'ruleName',
         son_rule_id as 'sonRuleId',
         son_rule_id as 'sonRuleId',
@@ -393,19 +398,17 @@
         else ''
         else ''
         end
         end
         ) as 'settlementStatusStr',
         ) as 'settlementStatusStr',
-        settlement_status as 'settlementStatus',
-        remarks as 'remarks'
+        settlement_status as 'settlementStatus'
         from kuaishou_rule_settlement_data
         from kuaishou_rule_settlement_data
         where promoter_id = #{promoterId}
         where promoter_id = #{promoterId}
         and stat_date = #{date}
         and stat_date = #{date}
-        <if test="itemId == null  ">
-            and anchor_amount > 0
-        </if>
+
         <if test="itemId != null  ">
         <if test="itemId != null  ">
             and item_ids like concat('%',concat(#{itemId},'%'))
             and item_ids like concat('%',concat(#{itemId},'%'))
         </if>
         </if>
         ) t1 left join (
         ) t1 left join (
-        select promoter_id,promoter_nick_name as 'promoterName',t2.user_id as 'promoterCreateId',group_concat(t1.user_name) as
+        select promoter_id,promoter_nick_name as 'promoterName',t2.user_id as
+        'promoterCreateId',group_concat(t1.user_name) as
         'promoterCreateName'
         'promoterCreateName'
         from kuaishou_promoter t1
         from kuaishou_promoter t1
         left join sys_user_role t2 on t1.user_id = t2.user_id
         left join sys_user_role t2 on t1.user_id = t2.user_id