浏览代码

骄阳修改

yumeng 1 年之前
父节点
当前提交
e2a5aebcc5

+ 2 - 1
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JiaoYangReportController.java

@@ -44,13 +44,14 @@ public class JiaoYangReportController extends BaseController {
     private ISysUserService sysUserService;
 
 
+
     @GetMapping("/getAuthItem")
     @ApiOperation(value = "商品列表")
     public JSONObject getAuthItem() throws ParseException, InterruptedException {
 
         jiaoYangReportService.deleteAuthItem();
         String cookie = jiaoYangReportService.getJiaoYangCookie();
-        jiaoYangReportService.getAuthItem(cookie, 0);
+        jiaoYangReportService.getAuthItem(cookie, 0,0);
         // Thread.sleep(5000);
 
         JSONObject json = new JSONObject();

+ 89 - 70
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/entity/JyAuthOrder.java

@@ -1,152 +1,171 @@
 package com.ruixuan.jiaoyang.entity;
 
 
-
 import com.ruixuan.common.annotation.Excel;
 import com.ruixuan.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+
 /**
  * 骄阳-授权商品对象 jy_auth_order
  *
  * @author ruoyi
  * @date 2024-03-06
  */
-public class JyAuthOrder extends BaseEntity
-{
+public class JyAuthOrder extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long itemId;
 
-    /** 商品标题 */
+    /**
+     * 商品标题
+     */
     @Excel(name = "商品标题")
     private String itemName;
 
-    /** 商品链接 */
+    /**
+     * 商品链接
+     */
     @Excel(name = "商品链接")
     private String itemImageUrl;
 
-    /** 商品单价 */
+    /**
+     * 商品单价
+     */
     @Excel(name = "商品单价")
     private String itemPriceView;
 
-    /** 佣金率 */
+    /**
+     * 佣金率
+     */
     @Excel(name = "佣金率")
     private String commissionRateView;
 
-    /** 达人ID */
+    /**
+     * 达人ID
+     */
     @Excel(name = "达人ID")
     private String promoterId;
 
-    /** 达人昵称 */
+    /**
+     * 达人昵称
+     */
     @Excel(name = "达人昵称")
     private String promoterNick;
 
-    /** 达人头像 */
+    /**
+     * 达人头像
+     */
     @Excel(name = "达人头像")
     private String promoterPhoto;
 
-    /** 出让佣金比例 */
+    /**
+     * 出让佣金比例
+     */
     @Excel(name = "出让佣金比例")
     private String mcnCommissionRateView;
+    private Integer sortCount;
 
-    public void setItemId(Long itemId)
-    {
-        this.itemId = itemId;
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
     }
 
-    public Long getItemId()
-    {
+    public Long getItemId() {
         return itemId;
     }
-    public void setItemName(String itemName)
-    {
-        this.itemName = itemName;
+
+    public void setItemId(Long itemId) {
+        this.itemId = itemId;
     }
 
-    public String getItemName()
-    {
+    public String getItemName() {
         return itemName;
     }
-    public void setItemImageUrl(String itemImageUrl)
-    {
-        this.itemImageUrl = itemImageUrl;
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
     }
 
-    public String getItemImageUrl()
-    {
+    public String getItemImageUrl() {
         return itemImageUrl;
     }
-    public void setItemPriceView(String itemPriceView)
-    {
-        this.itemPriceView = itemPriceView;
+
+    public void setItemImageUrl(String itemImageUrl) {
+        this.itemImageUrl = itemImageUrl;
     }
 
-    public String getItemPriceView()
-    {
+    public String getItemPriceView() {
         return itemPriceView;
     }
-    public void setCommissionRateView(String commissionRateView)
-    {
-        this.commissionRateView = commissionRateView;
+
+    public void setItemPriceView(String itemPriceView) {
+        this.itemPriceView = itemPriceView;
     }
 
-    public String getCommissionRateView()
-    {
+    public String getCommissionRateView() {
         return commissionRateView;
     }
-    public void setPromoterId(String promoterId)
-    {
-        this.promoterId = promoterId;
+
+    public void setCommissionRateView(String commissionRateView) {
+        this.commissionRateView = commissionRateView;
     }
 
-    public String getPromoterId()
-    {
+    public String getPromoterId() {
         return promoterId;
     }
-    public void setPromoterNick(String promoterNick)
-    {
-        this.promoterNick = promoterNick;
+
+    public void setPromoterId(String promoterId) {
+        this.promoterId = promoterId;
     }
 
-    public String getPromoterNick()
-    {
+    public String getPromoterNick() {
         return promoterNick;
     }
-    public void setPromoterPhoto(String promoterPhoto)
-    {
-        this.promoterPhoto = promoterPhoto;
+
+    public void setPromoterNick(String promoterNick) {
+        this.promoterNick = promoterNick;
     }
 
-    public String getPromoterPhoto()
-    {
+    public String getPromoterPhoto() {
         return promoterPhoto;
     }
-    public void setMcnCommissionRateView(String mcnCommissionRateView)
-    {
-        this.mcnCommissionRateView = mcnCommissionRateView;
+
+    public void setPromoterPhoto(String promoterPhoto) {
+        this.promoterPhoto = promoterPhoto;
     }
 
-    public String getMcnCommissionRateView()
-    {
+    public String getMcnCommissionRateView() {
         return mcnCommissionRateView;
     }
 
+    public void setMcnCommissionRateView(String mcnCommissionRateView) {
+        this.mcnCommissionRateView = mcnCommissionRateView;
+    }
+
+    public Integer getSortCount() {
+        return sortCount;
+    }
+
+    public void setSortCount(Integer sortCount) {
+        this.sortCount = sortCount;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("itemId", getItemId())
-                .append("itemName", getItemName())
-                .append("itemImageUrl", getItemImageUrl())
-                .append("itemPriceView", getItemPriceView())
-                .append("commissionRateView", getCommissionRateView())
-                .append("promoterId", getPromoterId())
-                .append("promoterNick", getPromoterNick())
-                .append("promoterPhoto", getPromoterPhoto())
-                .append("mcnCommissionRateView", getMcnCommissionRateView())
-                .append("createTime", getCreateTime())
-                .append("updateTime", getUpdateTime())
-                .toString();
+        return "JyAuthOrder{" +
+                "itemId=" + itemId +
+                ", itemName='" + itemName + '\'' +
+                ", itemImageUrl='" + itemImageUrl + '\'' +
+                ", itemPriceView='" + itemPriceView + '\'' +
+                ", commissionRateView='" + commissionRateView + '\'' +
+                ", promoterId='" + promoterId + '\'' +
+                ", promoterNick='" + promoterNick + '\'' +
+                ", promoterPhoto='" + promoterPhoto + '\'' +
+                ", mcnCommissionRateView='" + mcnCommissionRateView + '\'' +
+                ", sortCount=" + sortCount +
+                '}';
     }
 }

+ 2 - 2
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/service/IJiaoYangReportService.java

@@ -46,7 +46,7 @@ public interface IJiaoYangReportService {
 
     JSONObject monthData(Long nowMonthStartDate, Long nowMonthEndDate, Long lastMonthStartDate, Long lastMonthEndDate);
 
-    List<JSONObject> getTopItem(Long date, Long promoterId,String  fieId,String sort);
+    List<JSONObject> getTopItem(Long date, Long promoterId, String fieId, String sort);
 
     List<JSONObject> getTopItemUser();
 
@@ -54,7 +54,7 @@ public interface IJiaoYangReportService {
 
     String getJiaoYangCookie();
 
-    void getAuthItem(String cookie, Integer offset) throws InterruptedException;
+    void getAuthItem(String cookie, Integer offset, Integer count) throws InterruptedException;
 
     List<JSONObject> getAuthItemList(Map<String, Object> requestMap);
 

+ 4 - 3
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/service/impl/JiaoYangReportServiceImpl.java

@@ -143,7 +143,7 @@ public class JiaoYangReportServiceImpl implements IJiaoYangReportService {
     }
 
     @Override
-    public void getAuthItem(String cookie, Integer offset) throws InterruptedException {
+    public void getAuthItem(String cookie, Integer offset, Integer count) throws InterruptedException {
         Thread.sleep(1000L);
         Map<String, Object> params = new HashMap<>();
         params.put("limit", 10);
@@ -187,12 +187,13 @@ public class JiaoYangReportServiceImpl implements IJiaoYangReportService {
             order.setPromoterNick(jsonObject.getString("promoterNick"));
             order.setPromoterPhoto(jsonObject.getString("promoterPhoto"));
             order.setMcnCommissionRateView(jsonObject.getString("mcnCommissionRateView"));
+            order.setSortCount(count += 1);
             adds.add(order);
         }
 
-        jiaoYangReportMapper.replaceItems(adds);
+          jiaoYangReportMapper.replaceItems(adds);
         if (list.size() >= 10) {
-            getAuthItem(cookie, offset + 10);
+            getAuthItem(cookie, offset + 10, count);
         }
     }
 

+ 5 - 2
ruixuan-live/src/main/resources/mapper/jiaoyang/JiaoYangReportMapper.xml

@@ -14,7 +14,8 @@
         promoter_id,
         promoter_nick,
         promoter_photo,
-        mcn_commission_rate_view
+        mcn_commission_rate_view,
+        sort_count
         )
         values
         <foreach collection="adds" item="add" separator=",">
@@ -27,7 +28,8 @@
             #{add.promoterId},
             #{add.promoterNick},
             #{add.promoterPhoto},
-            #{add.mcnCommissionRateView}
+            #{add.mcnCommissionRateView},
+            #{add.sortCount}
             )
         </foreach>
 
@@ -798,6 +800,7 @@ order by stat_hour
         <if test="promoterNick != null and promoterNick != ''">
             and promoter_nick like concat(concat('%',#{promoterNick}),'%')
         </if>
+        order by sort_count asc
     </select>