Merge remote-tracking branch 'origin/master'

common/fire-dto/src/main/java/com/fire/es/DispatchDto.java

@@ -132,8 +132,8 @@ public class DispatchDto {
      * 运营商结算价格
      */
     @ApiModelProperty("运营商结算价格")
-    @Field(type = FieldType.Keyword)
-    private String operatorBalancePrice;
+    @Field(type = FieldType.Integer)
+    private int operatorBalancePrice;
 
     /**
      * 通道组发送次数
@@ -187,4 +187,11 @@ public class DispatchDto {
             mainField = @Field(type=FieldType.Text, analyzer = "ik_max_word"),
             otherFields = @InnerField(suffix = "keyword", type=FieldType.Keyword))
     private String channelName;
+
+    /**
+     * 运营商：1、移动 2、电信 3、联通
+     */
+    @ApiModelProperty("运营商：1、移动 2、电信 3、联通")
+    @Field(type = FieldType.Integer)
+    private Integer phoneOperator;
 }

modules/admin/src/main/java/com/fire/admin/rest/TestRest.java

@@ -3,6 +3,7 @@ package com.fire.admin.rest;
 
 import com.fire.common.redis.RedisAmountScript;
 import com.fire.common.redis.RedisOrderIdScript;
+import com.fire.es.DispatchDto;
 import com.fire.es.OrderEsDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,7 +54,7 @@ public class TestRest {
         return date1;
     }
 
-        @GetMapping("/insert")
+    @GetMapping("/insert")
     public String insert() {
         OrderEsDto orderEsDto = new OrderEsDto();
         orderEsDto.setOrderId("1621586734674994200");
@@ -66,7 +67,7 @@ public class TestRest {
         orderEsDto.setRecId("1621586734674994232A1_0");
         orderEsDto.setApplyDate(timeSwap("2021-05-21 16:45:35"));
         orderEsDto.setActiveDate(timeSwap("2021-05-21 16:55:35"));
-        orderEsDto.setLimitedDate(timeSwap("22021-05-22 16:45:35"));
+        orderEsDto.setLimitedDate(timeSwap("2021-05-22 16:45:35"));
         orderEsDto.setStatus(6);
         orderEsDto.setNote("86400");
         orderEsDto.setPhoneOperator(1);
@@ -106,6 +107,43 @@ public class TestRest {
 //        return res.toString();
 //    }
 
+    @GetMapping("/insertD")
+    public String insertDispatch() {
+        DispatchDto dispatchDto = new DispatchDto();
+        dispatchDto.setRecId("1622020048637019983A1_0");
+        dispatchDto.setOrderId("1622020048637020000");
+        dispatchDto.setPackageId("1:10:21");
+        dispatchDto.setPhoneNo("15836686332");
+        dispatchDto.setFlowAmount(10);
+        dispatchDto.setSendCount(1);
+        dispatchDto.setCreateDate(timeSwap("2021-05-26 17:07:31"));
+        dispatchDto.setCallbackTime(timeSwap("2021-05-26 17:07:32"));
+        dispatchDto.setSendStatus(4);
+        dispatchDto.setGwSeqNo("59579073373410");
+        dispatchDto.setGwStatus("ERROR");
+        dispatchDto.setGwErrorCode("OrderPool6:FAILED");
+        dispatchDto.setGwErrorMsg("FAILED");
+        dispatchDto.setPhoneHome("河南-驻马店-移动");
+        dispatchDto.setAppId("beijingweiboshijie");
+        dispatchDto.setLastCallbackMsg("");
+        dispatchDto.setOperatorBalancePrice((int)(9.98*10000));
+        dispatchDto.setBatchCount(1);
+        dispatchDto.setCustomerProductsId("1234");
+        dispatchDto.setCustomerName("北京微播视界科技有限公司");
+        dispatchDto.setChannelProductsId("");
+        dispatchDto.setOperatorId("");
+        dispatchDto.setRecordLog("");
+        dispatchDto.setChannelName("智信3移动");
+        dispatchDto.setPhoneOperator(1);
+        IndexQuery indexQuery = new IndexQuery();
+        indexQuery.setId(dispatchDto.getRecId());
+        indexQuery.setObject(dispatchDto);
+        IndexCoordinates indexCoordinates = IndexCoordinates.of("mobile_flow_dispatch_rec");
+        restTemplate.index(indexQuery, indexCoordinates);
+        return "sucees";
+    }
+
+
 
 }
 

modules/admin/src/main/java/com/fire/admin/service/OrderManagementService.java

@@ -308,7 +308,7 @@ public class OrderManagementService {
         Pageable pageable = PageRequest.of(page, size, sort);
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         //时间范围
-        RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("applyDate")
+        RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("createDate")
                 .gte(createDateStart.getTime())
                 .lte(createDateEnd.getTime());
         boolQuery.must(rangeQueryBuilder);
@@ -319,7 +319,7 @@ public class OrderManagementService {
         }
         //分发订单号
         if (Strings.isNotBlank(dispatchSearchPram.getRecId())) {
-            boolQuery.must(QueryBuilders.termQuery("recId", dispatchSearchPram.getRecId()));
+            boolQuery.must(QueryBuilders.matchQuery("recId", dispatchSearchPram.getRecId()));
         }
         //通道名称
         if (Strings.isNotBlank(dispatchSearchPram.getChannelName())) {
@@ -339,11 +339,11 @@ public class OrderManagementService {
         }
         //发送状态
         if (Strings.isNotBlank(dispatchSearchPram.getSendStatus())) {
-            boolQuery.must(QueryBuilders.termQuery("SendStatus", dispatchSearchPram.getSendStatus()));
+            boolQuery.must(QueryBuilders.termQuery("sendStatus",dispatchSearchPram.getSendStatus()));
         }
         //运营商
         if (Strings.isNotBlank(dispatchSearchPram.getPhoneOperator())) {
-            boolQuery.must(QueryBuilders.termQuery("SendStatus", dispatchSearchPram.getPhoneOperator()));
+            boolQuery.must(QueryBuilders.termQuery("phoneOperator", dispatchSearchPram.getPhoneOperator()));
         }
         //面额
         if (Strings.isNotBlank(dispatchSearchPram.getFlowAmount())) {