leon 4 лет назад
Родитель
Сommit
f9238acf6f

+ 11 - 11
src/main/java/com/mokamrp/privates/controller/pangu/PromoteCodeController.java

@@ -54,6 +54,17 @@ public class PromoteCodeController extends BaseController<PromoteCode> {
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
      * 如果需要定制化,需要将BaseController中对应的方法复制到当前控制器,然后进行修改
      */
+    @PostMapping("/list")
+    public Object list(@RequestBody PromoteCodeListHandle promoteCodeListHandle,@AuthUser User authUser) {
+        Object res;
+        if (authUser.getIsSuperAdmin().equals(1)){
+            res = promoteCodeService.getlist(promoteCodeListHandle,null);
+        }else{
+            res = promoteCodeService.getlist(promoteCodeListHandle,authUser.getDepartment());
+        }
+        return AjaxResult.success(res);
+    }
+
     @Override
     @GetMapping("/info")
     public Object info(@RequestParam(name = "ids") String ids) {
@@ -118,17 +129,6 @@ public class PromoteCodeController extends BaseController<PromoteCode> {
         return AjaxResult.success(Constants.SUCCESS, true);
     }
 
-    @PostMapping("/list")
-    public Object list(@RequestBody PromoteCodeListHandle promoteCodeListHandle,@AuthUser User authUser) {
-        Object res;
-        if (authUser.getIsSuperAdmin().equals(1)){
-            res = promoteCodeService.getlist(promoteCodeListHandle,null);
-        }else{
-            res = promoteCodeService.getlist(promoteCodeListHandle,authUser.getDepartment());
-        }
-        return AjaxResult.success(res);
-    }
-
     /**
      * (API)负载均衡获取活码内二级域名动态码
      *

+ 2 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/PromoteQrcodePoolMapper.xml

@@ -99,6 +99,8 @@
         B.qrcode_y,
         C.mobile_no AS custservice_name,
         C.code_url as qrcode,
+        C.total_fans,
+        C.day_fans,
         IFNULL(D.long_touch_pv,0) as long_touch_pv,
         IFNULL(D.take_qrcode_pv,0) as take_qrcode_pv,
         IFNULL(D.today_long_touch_pv,0) as today_long_touch_pv,

+ 6 - 0
src/main/java/com/mokamrp/privates/mapper/pangu/pojo/PromoteQrcodePoolVo.java

@@ -1,6 +1,7 @@
 package com.mokamrp.privates.mapper.pangu.pojo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -59,6 +60,11 @@ public class PromoteQrcodePoolVo extends Model<PromoteQrcodePoolVo> {
 
     private Integer hourUvMax;
 
+    @TableField(exist = false)
+    private Integer totalFans;
+    @TableField(exist = false)
+    private Integer dayFans;
+
     private Integer longTouchPv;
 
     private Integer takeQrcodePv;