Merge branch 'master' into dev-lqc

src/main/java/com/mokamrp/privates/controller/pangu/PromoteCodeDataController.java

@@ -116,12 +116,13 @@ public class PromoteCodeDataController{
     }
 
     @GetMapping("/getTotal")
-    public Object getTotal(){
+    public Object getTotal(@RequestParam(name = "promoteId") Integer promoteId){
         PromoteQrcodePoolRecord total = promoteQrcodePoolRecordService.getOne(new QueryWrapper<PromoteQrcodePoolRecord>()
                 .select("sum(long_touch_pv) as long_touch_pv," +
                         "sum(take_qrcode_pv) as take_qrcode_pv," +
                         "sum(long_touch_uv) as long_touch_uv," +
-                        "sum(take_qrcode_uv) as take_qrcode_uv"));
+                        "sum(take_qrcode_uv) as take_qrcode_uv")
+                .eq("promote_id",promoteId));
         Map<String,Object> res = new HashMap<>();
         res.put("longTouchPv",total.getLongTouchPv());
         res.put("longTouchUv",total.getLongTouchUv());