Ver Fonte

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruixuan-live/src/main/resources/mapper/isc/KuaishouPromoterMapper.xml
yumeng há 2 anos atrás
pai
commit
d3314c8a1c

+ 12 - 6
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouPromoterServiceImpl.java

@@ -92,17 +92,17 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
             return Collections.emptyList();
         }
         if (Check.isNull(parameter)) {
-            parameter = "t1.create_time";
+            parameter = "create_time";
         } else {
             switch (parameter) {
                 case "avg_video_sales":
-                    parameter = "SUBSTRING_INDEX(t1.avg_video_sales,'-',-1)+0";
+                    parameter = "avgVideoSalesOrder";
                     break;
                 case "video_sales":
-                    parameter = "SUBSTRING_INDEX(t1.video_sales,'-',1)+0";
+                    parameter = "videoSalesOrder";
                     break;
                 case "total_sale":
-                    parameter = "SUBSTRING_INDEX(t1.total_sale,'-',-1)+0";
+                    parameter = "totalSaleOrder";
                     break;
             }
         }
@@ -125,9 +125,9 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
         if (Check.isNull(parameter)) {
             parameter = "promoterId";
         } else if ("avgVideoSales".equals(parameter)) {
-            parameter = "SUBSTRING_INDEX(avgVideoSales,'-',-1)+0";
+            parameter = "avgVideoSalesOrder";
         } else if ("videoSales".equals(parameter)) {
-            parameter = "SUBSTRING_INDEX(videoSales,'-',-1)+0";
+            parameter = "videoSalesOrder";
         }
         if (Check.isNull(orderBy)) {
             orderBy = "desc";
@@ -435,6 +435,12 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
             record.put("promoterId", promoter.getPromoterId());
             record.put("userId", promoter.getUserId());
             record.put("operatorId", userId);
+            List<JSONObject> roles = sysUserService.getUserRoleByUserId(userId);
+            if (Check.isNotNull(roles)) {
+                record.put("roleName", roles.get(0).getString("role_name"));
+                record.put("roleKey", roles.get(0).getString("role_key"));
+            }
+
             kuaishouPromoterMapper.insertKuaishouPromoterRecord(record);
         }
         kuaishouPromoterMapper.deleteKuaishouPromoterById(id);

+ 29 - 4
ruixuan-live/src/main/resources/mapper/isc/KuaishouPromoterMapper.xml

@@ -88,6 +88,19 @@
         t1.aweme_avg_digg_count_30,
         t1.aweme_digg_follower_ration,
         t1.live_average_user_30,
+        case
+        WHEN t3.total_sale like '%万%'
+        then SUBSTRING_INDEX(t3.total_sale,'-',-1)+0
+        else SUBSTRING_INDEX(t3.total_sale,'-',-1)/10000 end as 'totalSaleOrder',
+        case
+        WHEN t3.video_sales like '%万%'
+        then SUBSTRING_INDEX(t3.video_sales,'-',-1)+0
+        else SUBSTRING_INDEX(t3.video_sales,'-',-1)/10000 end as 'videoSalesOrder',
+        case
+        WHEN t3.avg_video_sales like '%万%'
+        then SUBSTRING_INDEX(t3.avg_video_sales,'-',-1)+0
+        else SUBSTRING_INDEX(t3.avg_video_sales,'-',-1)/10000 end as 'avgVideoSalesOrder'
+        t1.live_average_user_30,
         t4.rule_id,
         t4.rule_name
         FROM
@@ -128,10 +141,18 @@
         t1.30day_gmv AS 'monthDayGmv',
         t1.30day_order_num AS 'monthDayOrderNum',+
         t1.valid_amount AS 'validAmount',
-        IFNULL(t3.fans_number,'') AS 'fansNumber',
-        IFNULL(t3.video_sales,'') AS 'videoSales',
-        IFNULL(t3.avg_video_sales,'') AS 'avgVideoSales',
-        IFNULL(t3.total_sale,'') AS 'totalSale'
+        t3.fans_number AS 'fansNumber',
+        t3.video_sales AS 'videoSales',
+        t3.avg_video_sales AS 'avgVideoSales',
+        t3.total_sale AS 'totalSale',
+        case
+        WHEN t3.video_sales like '%万%'
+        then SUBSTRING_INDEX(t3.video_sales,'-',-1)+0
+        else SUBSTRING_INDEX(t3.video_sales,'-',-1)/10000 end as 'videoSalesOrder',
+        case
+        WHEN t3.avg_video_sales like '%万%'
+        then SUBSTRING_INDEX(t3.avg_video_sales,'-',-1)+0
+        else SUBSTRING_INDEX(t3.avg_video_sales,'-',-1)/10000 end as 'avgVideoSalesOrder'
         FROM
         promoter_oerder_amount t1
         LEFT JOIN promoter_info t0 ON t1.promoter_id = t0.promoter_id
@@ -422,11 +443,15 @@
             <if test="promoterId != null">promoter_id,</if>
             <if test="userId != null">user_id,</if>
             <if test="operatorId != null">operator_id,</if>
+            <if test="roleName != null">role_name,</if>
+            <if test="roleKey != null">role_key,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="promoterId != null">#{promoterId},</if>
             <if test="userId != null">#{userId},</if>
             <if test="operatorId != null">#{operatorId},</if>
+            <if test="roleName != null">#{roleName},</if>
+            <if test="roleKey != null">#{roleKey},</if>
         </trim>
     </insert>