Browse Source

修改排序

yumeng 1 year ago
parent
commit
c433df4416

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouRuleSettlementDataController.java

@@ -208,6 +208,7 @@ public class KuaishouRuleSettlementDataController extends BaseController {
                 check.setShouldReferenceAmount(settlementData.getReferenceAmount());
                 check.setSettlementStatus(1);
                 check.setRemarks(settlementData.getRemarks());
+                check.setValidOrderNum(settlementData.getValidOrderNum());
                 checks.add(check);
             }
             kuaishouRuleSettlementDataService.updatePromoterStatus(date, promoterId, status);
@@ -260,6 +261,7 @@ public class KuaishouRuleSettlementDataController extends BaseController {
         check.setShouldReferenceAmount(selectData.getReferenceAmount());
         check.setSettlementStatus(1);
         check.setRemarks(kuaishouRuleSettlementData.getRemarks());
+        check.setValidOrderNum(selectData.getValidOrderNum());
         checks.add(check);
         kuaishouRuleSettlementCheckService.adds(checks);
         return toAjax(kuaishouRuleSettlementDataService.updateKuaishouRuleSettlementData(updateKuaishouRuleSettlementData));

+ 10 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouRuleSettlementCheck.java

@@ -104,6 +104,7 @@ public class KuaishouRuleSettlementCheck extends BaseEntity {
      */
     @Excel(name = "备注")
     private String remarks;
+    private Long validOrderNum;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -245,6 +246,14 @@ public class KuaishouRuleSettlementCheck extends BaseEntity {
         this.remarks = remarks;
     }
 
+    public Long getValidOrderNum() {
+        return validOrderNum;
+    }
+
+    public void setValidOrderNum(Long validOrderNum) {
+        this.validOrderNum = validOrderNum;
+    }
+
     @Override
     public String toString() {
         return "KuaishouRuleSettlementCheck{" +
@@ -265,6 +274,7 @@ public class KuaishouRuleSettlementCheck extends BaseEntity {
                 ", shouldReferenceAmount=" + shouldReferenceAmount +
                 ", settlementStatus=" + settlementStatus +
                 ", remarks='" + remarks + '\'' +
+                ", validOrderNum=" + validOrderNum +
                 '}';
     }
 }

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

@@ -470,10 +470,10 @@ public class JiaoYangReportController extends BaseController {
 
 
     @GetMapping("/getTopItem")
-    public TableDataInfo getTopItem(String statDate, Long promoterId) {
+    public TableDataInfo getTopItem(String statDate, Long promoterId,String  fieId,String sort) {
         Long date = Long.valueOf(statDate.replace("-", ""));
         startPage();
-        List<JSONObject> list = jiaoYangReportService.getTopItem(date, promoterId);
+        List<JSONObject> list = jiaoYangReportService.getTopItem(date, promoterId,fieId,sort);
         return getDataTable(list);
     }
 
@@ -693,24 +693,6 @@ public class JiaoYangReportController extends BaseController {
     ) {
 
         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<>()
-                );
-            }
-            requestMap.put("promoterIds", promoterIds);
-        }*/
         if (dateType == 0) {
 
             if (!Check.isNull(orderStartDate)) {

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/mapper/JiaoYangReportMapper.java

@@ -47,7 +47,7 @@ public interface JiaoYangReportMapper {
 
     JSONObject monthData(@Param("nowMonthStartDate") Long nowMonthStartDate, @Param("nowMonthEndDate") Long nowMonthEndDate, @Param("lastMonthStartDate") Long lastMonthStartDate, @Param("lastMonthEndDate") Long lastMonthEndDate);
 
-    List<JSONObject> getTopItem(@Param("date") Long date, @Param("promoterId") Long promoterId);
+    List<JSONObject> getTopItem(@Param("date") Long date, @Param("promoterId") Long promoterId, @Param("fieId") String fieId, @Param("sort") String sort);
 
     List<JSONObject> getTopItemUser();
 }

+ 1 - 1
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);
+    List<JSONObject> getTopItem(Long date, Long promoterId,String  fieId,String sort);
 
     List<JSONObject> getTopItemUser();
 }

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

@@ -115,8 +115,8 @@ public class JiaoYangReportServiceImpl implements IJiaoYangReportService {
     }
 
     @Override
-    public List<JSONObject> getTopItem(Long date, Long promoterId) {
-        return jiaoYangReportMapper.getTopItem(date,promoterId);
+    public List<JSONObject> getTopItem(Long date, Long promoterId,String  fieId,String sort) {
+        return jiaoYangReportMapper.getTopItem(date,promoterId,fieId,sort);
     }
 
     @Override

+ 5 - 3
ruixuan-live/src/main/resources/mapper/isc/KuaishouRuleSettlementCheckMapper.xml

@@ -101,6 +101,7 @@
         t.item_create_name as 'itemCreateName',
         t.anchor_amount as 'anchorAmount',
         t.reference_amount as 'referenceAmount',
+        t.valid_order_num as 'validOrderNum',
         (case
         when t.settlement_status = 1 then '待付款'
         when t.settlement_status = 2 then '已付款'
@@ -182,7 +183,8 @@
         reference_amount,
         should_reference_amount,
         settlement_status,
-        remarks
+        remarks,
+        valid_order_num
         )
         values
         <foreach collection="adds" item="add" separator=",">
@@ -202,8 +204,8 @@
             #{add.referenceAmount},
             #{add.shouldReferenceAmount},
             #{add.settlementStatus},
-            #{add.remarks}
-
+            #{add.remarks},
+            #{add.validOrderNum}
             )
         </foreach>
 

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

@@ -693,8 +693,7 @@ from (select date_format(#{date},'%Y/%m/%d')
         select t1.*,
         t2.promotionVolume as 'yesPromotionVolume',
         t1.promotionVolume - t2.promotionVolume as 'difference',
-        concat(round((t1.promotionVolume - t2.promotionVolume) / t2.promotionVolume * 100, 2), '%') as
-        'increaseInPrice',
+        round((t1.promotionVolume - t2.promotionVolume) / t2.promotionVolume * 100, 2) as 'increaseInPrice',
         (
         case when t2.itemId is null
         then 1
@@ -725,7 +724,7 @@ from (select date_format(#{date},'%Y/%m/%d')
         </if>
         ) t2
         on t1.clipId = t2.clipId and t1.itemId = t2.itemId
-        order by difference desc
+        order by ${fieId} ${sort}
     </select>
     <select id="getTopItemUser" resultType="com.alibaba.fastjson.JSONObject">
         select id,name  from jy_fx_top_item_config