From 80a110121924893b310df19e9e25019bd2c81ca1 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 24 八月 2022 15:32:31 +0800
Subject: [PATCH] uu洗车小程序码

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index e985c79..8082e80 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3285,7 +3285,7 @@
         }
         Map<String, String> headerMap=new HashMap<>();
         headerMap.put("appid","10000");
-        String resultJson=HttpClientUtil.get("https://api.uucsh.cn/member/wx/get-access?province="+uuLoginVO.getProvince()+"&city="+uuLoginVO.getCity()+"&area="+uuLoginVO.getArea()+"&appid=10000&timestamp="+uuLoginVO.getTimestamp()+"&sign="+uuLoginVO.getSign()+"&mobile="+uuLoginVO.getMobile(),headerMap,null);
+        String resultJson=HttpClientUtil.get("https://api.uucsh.cn/member/wx/get-access?province="+uuLoginVO.getProvince()+"&city="+uuLoginVO.getCity()+"&area="+uuLoginVO.getArea()+"&appid=10000&timestamp="+uuLoginVO.getTimestamp()+"&sign="+uuLoginVO.getSign()+"&mobile="+uuLoginVO.getMobile()+"&couponId="+uuLoginVO.getCouponId(),headerMap,null);
         JSONObject result = JSON.parseObject(resultJson);
         if(result.get("status").equals(1)){
             return R.ok(result.get("data"));
@@ -3384,7 +3384,7 @@
     }
 
     @Override
-    public R userRate(Integer type, Long streetId, Long areaCode, Integer range) {
+    public R userRate(Integer type, Long streetId, Long areaCode, Integer range,String appId) {
         IndexDataAnalysisVO analysisVO=new IndexDataAnalysisVO();
         if (type.equals(BYSTREET) || type.equals(BYAREA)){
             //街道，区县筛选
@@ -3392,7 +3392,7 @@
             BeanUtils.copyProperties(indexDataVO,analysisVO );
         }else {
             //总量数据
-            IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(null);
+            IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(appId);
             BeanUtils.copyProperties(indexDataKanbanVO,analysisVO );
         }
         String date="";
@@ -3402,7 +3402,7 @@
                 date = DateUtil.parse(dateTime.toString(), "yyyy-MM-dd HH:mm:ss").toString();
             }
         }
-        List<UserProportion> userProportions = userDao.userAnalysis(type, date, streetId,areaCode);
+        List<UserProportion> userProportions = userDao.userAnalysis(type, date, streetId,areaCode,appId);
         List<UserRateAnalysisVO> userRateAnalysisVOList=new ArrayList<>();
         Boolean monthRange=false;
         if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(range)){
@@ -3420,7 +3420,7 @@
                         }
                         //获取本月的用户总数作为计算占比的用户总数
                         //IndexDataKanbanVO data = userDao.dataKanBanStreet(streetId, areaCode, date);
-                        Integer monthUsers = userDao.getMonthUsers(streetId, areaCode, date);
+                        Integer monthUsers = userDao.getMonthUsers(streetId, areaCode, date,appId);
                         vo.setRate(getRate(monthUsers,userProportion.getUser()));
                     }else{
                         vo.setRate(getRate(analysisVO.getAllUser(),userProportion.getUser()));
@@ -3449,7 +3449,7 @@
     }
 
     @Override
-    public R realUser(Integer type, Long streetId, Long areaCode, Integer range) {
+    public R realUser(Integer type, Long streetId, Long areaCode, Integer range,String appId) {
         IndexDataAnalysisVO analysisVO=new IndexDataAnalysisVO();
         if (type.equals(BYSTREET) || type.equals(BYAREA)){
             //街道，区县筛选
@@ -3457,7 +3457,7 @@
             BeanUtils.copyProperties(indexDataVO,analysisVO );
         }else {
             //总量数据
-            IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(null);
+            IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(appId);
             BeanUtils.copyProperties(indexDataKanbanVO,analysisVO );
         }
         String date="";
@@ -3468,7 +3468,7 @@
             }
         }
         RealUserVO realUserVO=new RealUserVO();
-        List<RealUser> realUsers = userDao.realUserCount(type, date, streetId, areaCode);
+        List<RealUser> realUsers = userDao.realUserCount(type, date, streetId, areaCode,appId);
         List<RealUserAnalysisVO> realUserList=new ArrayList<>();
         realUserVO.setRealUserCount(getStreetRealUser(realUsers));
         Integer rate = getRate(analysisVO.getAllUser(), realUserVO.getRealUserCount());

--
Gitblit v1.7.1