Browse Source

供应链调整

yumeng 1 year ago
parent
commit
c1bb17d935

+ 11 - 4
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -55,7 +55,7 @@ public class SupplyChainController extends BaseController {
     @ApiOperation(value = "达人订单")
     public String privateKey() {
 
-       return privateKey;
+        return privateKey;
     }
 
     /**
@@ -392,7 +392,10 @@ public class SupplyChainController extends BaseController {
             @ApiParam("订单开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
             @ApiParam("订单结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
             @ApiParam("达人Id") @RequestParam(value = "promoterId", required = false) String promoterId,
-            @ApiParam("达人名称") @RequestParam(value = "promoterNickName", required = false) String promoterNickName) {
+            @ApiParam("达人名称") @RequestParam(value = "promoterNickName", required = false) String promoterNickName,
+            @ApiParam("渠道名称") @RequestParam(value = "userId", required = false) Integer userId
+
+    ) {
         Map<String, Object> requestMap = new HashMap<>();
         if (!Check.isNull(orderStartDate)) {
             Long start = DateUtils.getStartLongTime(orderStartDate);
@@ -411,6 +414,9 @@ public class SupplyChainController extends BaseController {
         if (!Check.isNull(promoterNickName)) {
             requestMap.put("itemTitle", promoterNickName);
         }
+        if (!Check.isNull(userId)) {
+            requestMap.put("userId", userId);
+        }
 
         TableDataInfo dataInfo = new TableDataInfo();
         if (Check.isNullMap(requestMap)) {
@@ -1178,10 +1184,11 @@ public class SupplyChainController extends BaseController {
                 export.add(date.getString("payAmount"));
                 export.add(date.getString("regimentalPromotionAmount"));
                 export.add(date.getString("totalRegimentalSettleAmount"));
+                export.add(date.getString("avgServiceRate"));
                 exportList.add(export);
             }
         }
-        String[] headers = {"招商", "商品数", "发样数", "订单数", "有效订单数", "有效率", "发货数", "未发货数", "发货率", "实付金额", "预估服务费收入", "结算服务费收入"};
+        String[] headers = {"招商", "商品数", "发样数", "订单数", "有效订单数", "有效率", "发货数", "未发货数", "发货率", "实付金额", "预估服务费收入", "结算服务费收入", "平均服务费率"};
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();
@@ -1892,7 +1899,7 @@ public class SupplyChainController extends BaseController {
 
 
     /**
-     *接口链接:
+     * 接口链接:
      * https://open.kwaixiaodian.com/zone/new/docs/api?name=open.distribution.investment.activity.open.close&version=1
      */
     @GetMapping("/addList")

+ 38 - 17
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -316,9 +316,14 @@
         <if test="promoterNickName != null and promoterNickName != ''">
             and promoter_nick_name like concat(concat('%',#{promoterNickName}),'%')
         </if>
-        group by promoter_id) t left join (select promoter_id,group_concat(user_name) as 'userName' from
+        group by promoter_id) t left join (select promoter_id,group_concat(user_name) as 'userName',user_id as 'userId'
+        from
         kuaishou_promoter group by promoter_id) tt
         on t.promoterId = tt.promoter_id
+        where 1 =1
+        <if test="userId != null and userId != ''">
+            and tt.userId = #{userId}
+        </if>
         order by t.orderNum desc
     </select>
     <select id="itemServiceCharge" resultType="com.alibaba.fastjson.JSONObject">
@@ -890,18 +895,21 @@
 
     </select>
     <select id="getSupplyChainUserList" resultType="com.alibaba.fastjson.JSONObject">
-        select t3.user_id as 'userId', t3.nick_name as 'nickMame', t1.role_name as 'roleName', t3.status
-        from sys_role t1
-                 left join sys_user_role t2 on t1.role_id = t2.role_id
-                 left join sys_user t3 on t2.user_id = t3.user_id
-        where t1.role_key in (
-                              'association',
-                              'associationManager',
-                              'bd',
-                              'bdManager'
-            )
-        group by t3.user_id
-        order by t3.create_time asc
+        select *
+        from (select t3.user_id as 'userId', t3.nick_name as 'nickMame', t1.role_name as 'roleName', t3.status,
+                     t3.create_time
+              from sys_role t1
+                       left join sys_user_role t2 on t1.role_id = t2.role_id
+                       left join sys_user t3 on t2.user_id = t3.user_id
+              where t1.role_key in (
+                                    'association',
+                                    'associationManager',
+                                    'bd',
+                                    'bdManager'
+                  )
+              group by t3.user_id) t
+        where t.userId is not null
+        order by t.create_time desc
     </select>
     <select id="adminReportList" resultType="com.alibaba.fastjson.JSONObject">
         select *
@@ -928,7 +936,11 @@
         when t2.order_status != 80 then t2.regimental_promotion_amount
         else 0 end) as 'regimentalPromotionAmount',
         sum(case when t2.order_status != 80 then t2.total_regimental_settle_amount else 0 end) as
-        'totalRegimentalSettleAmount'
+        'totalRegimentalSettleAmount',
+        round( sum(case
+        when t2.order_status != 80 then t2.regimental_promotion_amount
+        else 0 end) / sum(case when t2.order_status != 80 then t2.pay_amount else 0 end) ,5 ) as 'avgServiceRate'
+
         from kuaishou_item_bind_user t1
         left join kuaishou_supply_chain t2
         on t1.item_id = t2.item_id
@@ -2089,7 +2101,10 @@
         when t2.order_status != 80 then t2.regimental_promotion_amount
         else 0 end) / 100, 2 )as 'regimentalPromotionAmount',
         round(sum(case when t2.order_status != 80 then t2.total_regimental_settle_amount else 0 end) / 100 , 2) as
-        'totalRegimentalSettleAmount'
+        'totalRegimentalSettleAmount',
+        round( sum(case
+        when t2.order_status != 80 then t2.regimental_promotion_amount
+        else 0 end) / sum(case when t2.order_status != 80 then t2.pay_amount else 0 end) * 100 ,2) as 'avgServiceRate'
         from kuaishou_item_bind_user t1
         left join kuaishou_supply_chain t2
         on t1.item_id = t2.item_id
@@ -2149,7 +2164,10 @@
         when t2.order_status != 80 then t2.regimental_promotion_amount
         else 0 end) as 'regimentalPromotionAmount',
         sum(case when t2.order_status != 80 then t2.total_regimental_settle_amount else 0 end) as
-        'totalRegimentalSettleAmount'
+        'totalRegimentalSettleAmount',
+        round( sum(case
+        when t2.order_status != 80 then t2.regimental_promotion_amount
+        else 0 end) / sum(case when t2.order_status != 80 then t2.pay_amount else 0 end) ,5) as 'avgServiceRate'
         from kuaishou_item_list t1
         left join (select item_id,
         oid,
@@ -2197,7 +2215,10 @@
         when t2.order_status != 80 then t2.regimental_promotion_amount
         else 0 end) / 100, 2 )as 'regimentalPromotionAmount',
         round(sum(case when t2.order_status != 80 then t2.total_regimental_settle_amount else 0 end) / 100 , 2) as
-        'totalRegimentalSettleAmount'
+        'totalRegimentalSettleAmount',
+        round( sum(case
+        when t2.order_status != 80 then t2.regimental_promotion_amount
+        else 0 end) / sum(case when t2.order_status != 80 then t2.pay_amount else 0 end) * 100 ,2) as 'avgServiceRate'
         from kuaishou_item_list t1
         left join (select item_id,
         oid,