测试 orderlist接口

ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java

@@ -77,8 +77,8 @@ public class BusStoreInfoController extends BaseController {
         BusStoreInfo storeInfo = new BusStoreInfo();
         storeInfo.setBindId(loginUserId);
         List<BusStoreInfo> list = busStoreInfoService.selectBusStoreInfoList(storeInfo);
-        List<BusStoreInfo> openCount = list.stream().filter(x -> x.getReturnVisitStatus() == "1").collect(Collectors.toList());
+        List<BusStoreInfo> openCount = list.stream().filter(x -> "1".equals(x.getReturnVisitStatus())).collect(Collectors.toList());
-        List<BusStoreInfo> noGrantCount = list.stream().filter(x -> x.getGrantStatus() == "2").collect(Collectors.toList());
+        List<BusStoreInfo> noGrantCount = list.stream().filter(x -> "2".equals(x.getGrantStatus())).collect(Collectors.toList());
         data.put("storeCount",list.size());
         data.put("openCount",openCount.size());
         data.put("noGrantCount",noGrantCount.size());

ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java

@@ -39,7 +39,7 @@ public class MeituanController {
         iMeituanService.getScore();
         iMeituanService.getComments();
         iMeituanService.getYestodayCount();
-        iMeituanService.orderInfoList();
+//        iMeituanService.orderInfoList();
         return R.ok();
     }
     /**

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -72,21 +72,8 @@ public class RyTask {
      * 统计昨日营销数 每天8点执行一次
      */
     public void getReturnInfo() {
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        iMeituanService.getReturnInfo();
-        LocalDateTime date = LocalDateTime.now().minusDays(1);
+
-        BusStoreInfo storeInfo = new BusStoreInfo();
-        List<BusStoreInfo> storeInfoList = storeInfoService.selectBusStoreInfoList(storeInfo);
-        for (BusStoreInfo busStoreInfo : storeInfoList) {
-            List<BusReturnVisitInfo> list = iBusReturnVisitInfoService.selectBusReturnVisitInfoListByDate(busStoreInfo.getStoreCode(), date.format(dateTimeFormatter));
-            BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
-            busStoreDayInfo.setStoreId(busStoreInfo.getId());
-            List<BusStoreDayInfo> list1 = iBusStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo);
-            if (list1.size() == 1) {
-                busStoreDayInfo = list1.get(0);
-                busStoreDayInfo.setLastReturnVisitNum(list.size());
-                iBusStoreDayInfoService.updateBusStoreDayInfo(busStoreDayInfo);
-            }
-        }
     }
 
 }

ruoyi-system/src/main/java/com/ruoyi/business/service/IMeituanService.java

@@ -59,4 +59,5 @@ public interface IMeituanService {
      */
     String mtgsigInfo(String orderId,String regionId,String regionVersion);
 
+    void getReturnInfo();
 }

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java

@@ -27,6 +27,7 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.apache.ibatis.javassist.Loader;
@@ -419,8 +420,8 @@ public class MeituanServiceImpl implements IMeituanService {
         httpPost.setEntity(entity);
         httpPost.setHeader("Cookie", cookie);
 
-        HttpClient client = proxyHttpClient();
+//        CloseableHttpClient client = proxyHttpClient();
-
+        CloseableHttpClient client = HttpClientBuilder.create().build();
         HttpEntity responseEntity;
         String resp = null;
         JSONObject jsonObject = new JSONObject();
@@ -465,7 +466,7 @@ public class MeituanServiceImpl implements IMeituanService {
             httpPost.setEntity(entity);
             httpPost.setHeader("Cookie", cookie);
 
-            HttpClient client = proxyHttpClient();
+            CloseableHttpClient client = proxyHttpClient();
 
             String resp = null;
             try {
@@ -572,6 +573,28 @@ public class MeituanServiceImpl implements IMeituanService {
         return URLEncoder.encode(result);
     }
 
+    @Override
+    public void getReturnInfo() {
+        getScore();
+        getComments();
+        getYestodayCount();
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDateTime date = LocalDateTime.now().minusDays(1);
+        BusStoreInfo storeInfo = new BusStoreInfo();
+        List<BusStoreInfo> storeInfoList = busStoreInfoMapper.selectBusStoreInfoList(storeInfo);
+        for (BusStoreInfo busStoreInfo : storeInfoList) {
+            List<BusReturnVisitInfo> list = busReturnVisitInfoMapper.selectBusReturnVisitInfoListByDate(busStoreInfo.getStoreCode(), date.format(dateTimeFormatter));
+            BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
+            busStoreDayInfo.setStoreId(busStoreInfo.getId());
+            List<BusStoreDayInfo> list1 = busStoreDayInfoMapper.selectBusStoreDayInfoList(busStoreDayInfo);
+            if (list1.size() == 1) {
+                busStoreDayInfo = list1.get(0);
+                busStoreDayInfo.setLastReturnVisitNum(list.size());
+                busStoreDayInfoMapper.updateBusStoreDayInfo(busStoreDayInfo);
+            }
+        }
+    }
+
     /**
      * 获取评分单条
      *

ruoyi-ui/src/views/market/self/index.vue

@@ -544,6 +544,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
+      this.storeStatistics();
     },
     /** 重置按钮操作 */
     resetQuery() {

ruoyi-ui/src/views/market/whole/index.vue

@@ -557,6 +557,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
+      this.storeStatistics();
     },
     /** 重置按钮操作 */
     resetQuery() {

ruoyi-ui/src/views/statistics/black/index.vue

@@ -95,7 +95,7 @@
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="源标识" align="center" prop="storeCode" />
           <el-table-column label="源名称" align="center" prop="storeName" />
-          <el-table-column label="禁止营销标识（订单标识）" align="center" prop="id" />
+          <el-table-column label="禁止营销标识（用户标识）" align="center" prop="customId" />
           <el-table-column label="关联订单" align="center" prop="orderNo" />
         </el-table>
         <pagination

ruoyi-ui/src/views/statistics/shop/index.vue

@@ -539,6 +539,7 @@ export default {
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
+      this.storeStatistics();
     },
     /** 重置按钮操作 */
     resetQuery() {