admin
2020-11-09 2147d023563a7c9d05d97547c00d6b0162c0644c
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/OrderController.java
@@ -256,7 +256,7 @@
            if (orderType != null && dateType != null && dateType == 4) {
               if (orderType == 1) {
                  dateType = 6; // 返利订单有效
                  dateType = 6; // 返利订单有效的
               } else {
                  dateType = 5; // 新版查询本月到账
               }
@@ -274,14 +274,14 @@
         String orderFindUrl = null;
         if (state == null && page == 1) {
            if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4) || count == 0L) {
               orderFindUrl = configService.get(ConfigKeyEnum.orderFindNotifyUrl.getKey());
               orderFindUrl = configService.getValue(ConfigKeyEnum.orderFindNotifyUrl.getKey(),acceptData.getSystem());
            }
         }
         JSONObject data = new JSONObject();
         data.put("count", count);
         data.put("list", JsonUtil.getApiCommonGson().toJson(list));
         data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));
         data.put("helpUrl", configService.getValue(ConfigKeyEnum.orderListHelp.getKey(),acceptData.getSystem()));
         data.put("validMoney", "¥ " + validMoney);
         data.put("invalidMoney", "¥ " + invalidMoney);
         data.put("findOrderHelpUrl", orderFindUrl);
@@ -313,7 +313,11 @@
         List<ESOrder> listES = esOrderService.query(key, uid.toString(), listSource);
         if (listES.size() != 0) {
            list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);
            // 2.1版本
            AcceptData acceptData = new AcceptData();
            acceptData.setPlatform("android");
            acceptData.setVersion("56");
            list = commonOrderService.searchOrderByUid(acceptData, page, Constant.PAGE_SIZE, uid, listES);
            count = commonOrderService.countSearchOrderByUid(uid, listES);
         }