BUG修正 修改订单字段名

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

@@ -1,11 +1,10 @@
 package com.fire.es;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.annotations.*;
 
 import java.util.Date;
 
@@ -16,219 +15,285 @@ public class OrderEsDto {
      * 订单ID
      */
     @Id
+    @ApiModelProperty("订单ID")
     private String orderId;
 
     /**
      * 接入ID号
      */
+    @ApiModelProperty("接入ID号")
     @Field(type = FieldType.Keyword)
     private String flowAppId;
 
     /**
-     * 流量包ID号
+     * 产品ID号
      */
+    @ApiModelProperty("产品ID号")
     @Field(type = FieldType.Keyword)
     private String packageId;
 
     /**
      * 客户ID号
      */
+    @ApiModelProperty("客户id")
     @Field(type = FieldType.Integer)
-    private Integer enterpriseId;
+    private Integer customerId;
 
     /**
-     * 订单类型 2:流量 3:话费
+     * 订单类型
+     * 1--直接生成流量  2--使用类型订单 3--话费
      */
+    @ApiModelProperty("订单类型")
     @Field(type = FieldType.Integer)
     private Integer orderType;
 
     /**
-     * 用户手机号
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    @MultiField(
+            mainField = @Field(type=FieldType.Text, analyzer = "ik_max_word"),
+            otherFields = @InnerField(suffix = "keyword", type=FieldType.Keyword))
+    private String customerName;
+
+    /**
+     * 充值手机号
      */
+    @ApiModelProperty("充值手机号")
     @Field(type = FieldType.Keyword)
-    private String usedMobile;
+    private String phoneNo;
 
     /**
      * 客户订单号
      */
+    @ApiModelProperty("客户订单号")
     @Field(type = FieldType.Keyword)
     private String extorderId;
 
     /**
-     * 分发记录号
+     * 分发订单号
      */
+    @ApiModelProperty("分发订单号")
     @Field(type = FieldType.Keyword)
     private String recId;
 
     /**
      * 下单时间
      */
+    @ApiModelProperty("下单时间")
     @Field(type = FieldType.Date)
     private Date applyDate;
     /**
      * 激活日期
      */
+    @ApiModelProperty("激活日期")
     @Field(type = FieldType.Date)
     private Date activeDate;
+
     /**
      * 订单超时
      */
+    @ApiModelProperty("订单超时")
     @Field(type = FieldType.Date)
     private Date limitedDate;
+
     /**
-     * 订单状态 1-待发 2-已发 3-成功
-     * 4-失败 5-风控
+     * 订单状态 1-待充值 2-充值中 3-重发
+     * 4-失败 6-成功
      */
+    @ApiModelProperty("订单状态 1-待充值 2-充值中 3-重发 4-失败 6-成功")
     @Field(type = FieldType.Integer)
     private Integer status;
     /**
      * 订单备注
      */
+    @ApiModelProperty("订单备注")
     @Field(type = FieldType.Keyword)
     private String note;
+
     /**
-     * 归属运营商
-     */
-    @Field(type = FieldType.Keyword)
-    private String mobileOperator;
-    /**
-     * 归属地市
-     */
-    @Field(type = FieldType.Text, analyzer = "ik_max_word")
-    private String mobileHome;
-    /**
-     * 供应商返回订单号
+     * 通道订单号
      */
+    @ApiModelProperty("通道订单号")
     @Field(type = FieldType.Keyword)
     private String gwSeqNo;
+
     /**
-     * 供应商返回状态
+     * 供应商状态
      */
+    @ApiModelProperty("供应商状态")
     @Field(type = FieldType.Keyword)
     private String gwStatus;
+
     /**
      * 最后修改日期
      */
+    @ApiModelProperty("最后修改日期")
     @Field(type = FieldType.Date)
     private Date lastModifyDate;
+
     /**
-     * 供应商网关错误代码
+     * 通道错误代码
      */
+    @ApiModelProperty("通道错误代码")
     @Field(type = FieldType.Keyword)
     private String gwErrorCode;
     /**
      * 面额
      */
+    @ApiModelProperty("面额")
     @Field(type = FieldType.Integer)
     private Integer flowAmount;
 
-    /**
-     * 回调状态
-     */
-    @Field(type = FieldType.Keyword)
-    private String dealFlag;
-
-    /**
-     * 未知
-     */
-    @Field(type = FieldType.Keyword)
-    private String oprCode;
-
     /**
      * 成本
      */
+    @ApiModelProperty("成本")
     @Field(type = FieldType.Integer)
     private Integer usageLimit;
-
     /**
-     * 分发组发送次数
+     * 通道组发送次数
      */
+    @ApiModelProperty("通道组发送次数")
     @Field(type = FieldType.Integer)
     private Integer batchCount;
 
     /**
      * 总发送次数
      */
+    @ApiModelProperty("总发送次数")
     @Field(type = FieldType.Integer)
     private Integer sendCount;
+
     /**
      * 省级行政编码
      */
+    @ApiModelProperty("省级行政编码")
     @Field(type = FieldType.Keyword)
     private String areaCode;
+
     /**
      * 客户结算价格
      */
+    @ApiModelProperty("客户结算价格")
     @Field(type = FieldType.Integer)
     private Integer price;
+
     /**
      * 代理商结算价格
      */
+    @ApiModelProperty("代理商结算价格")
     @Field(type = FieldType.Integer)
     private Integer partnerBalancePrice;
+
     /**
-     * 运行商成本价格
+     * 成本价格
      */
+    @ApiModelProperty("成本价格")
     @Field(type = FieldType.Integer)
     private Integer operatorBalancePrice;
 
     /**
-     * 客户产品
+     * 客户产品ID
      */
+    @ApiModelProperty("通道ID")
     @Field(type = FieldType.Integer)
-    private Integer orderDetailId;
+    private Integer customerProductId;
 
     /**
      * 通道ID
      */
+    @ApiModelProperty("通道ID")
     @Field(type = FieldType.Integer)
     private Integer channelId;
 
     /**
      * 回调时间
      */
+    @ApiModelProperty("回调时间")
     @Field(type = FieldType.Date)
-    private Date checkTime;
+    private Date callbackTime;
 
     /**
      * 产品ID
      */
+    @ApiModelProperty("产品ID")
     @Field(type = FieldType.Keyword)
     private String productId;
 
     /**
      * 官方凭证
      */
+    @ApiModelProperty("官方凭证")
     @Field(type = FieldType.Keyword)
     private String attr1;
 
     /**
      * 备用2
      */
+    @ApiModelProperty("备用2")
     @Field(type = FieldType.Keyword)
     private String attr2;
 
     /**
      * 备用3
      */
+    @ApiModelProperty("备用3")
     @Field(type = FieldType.Keyword)
     private String attr3;
 
-    /**
-     * 客户名称
-     */
-    @Field(type = FieldType.Text, analyzer = "ik_max_word")
-    private String user;
-
     /**
      * 通道名称
      */
-    @Field(type = FieldType.Text, analyzer = "ik_max_word")
+    @ApiModelProperty("通道名称")
+    @MultiField(
+            mainField = @Field(type=FieldType.Text, analyzer = "ik_max_word"),
+            otherFields = @InnerField(suffix = "keyword", type=FieldType.Keyword))
     private String channelName;
 
     /**
      * app接入名称
      */
+    @ApiModelProperty("app接入名称")
     @Field(type = FieldType.Keyword)
     private String appId;
+
+    /**
+     * 通道产品id
+     */
+    @ApiModelProperty("通道产品id")
+    @Field(type = FieldType.Long)
+    private Long channelProductId;
+
+    /**
+     * 回调状态：6-成功 4-失败
+     */
+    @ApiModelProperty("回调状态：6-成功 4-失败")
+    @Field(type = FieldType.Integer)
+    private Integer callbackStatus;
+
+    /**
+     * 运营商：1、移动 2、电信 3、联通
+     */
+    @ApiModelProperty("运营商：1、移动 2、电信 3、联通")
+    @Field(type = FieldType.Integer)
+    private Integer phoneOperator;
+
+    /**
+     * 归属地市行政编码
+     */
+    @ApiModelProperty("归属地市行政编码")
+    @Field(type = FieldType.Keyword)
+    private String phoneCity;
+
+    /**
+     * 归属地名称
+     */
+    @ApiModelProperty("归属地名称")
+    @MultiField(
+            mainField = @Field(type=FieldType.Text, analyzer = "ik_max_word"),
+            otherFields = @InnerField(suffix = "keyword", type=FieldType.Keyword))
+    private String phoneHome;
+
+
 }

modules/admin/src/main/java/com/fire/admin/request/OrderSearchPram.java

@@ -18,7 +18,7 @@ public class OrderSearchPram {
     private String extorderId;
 
     @ApiModelProperty(value = "充值手机号")
-    private String usedMobile;
+    private String phoneNo;
 
     @ApiModelProperty(value = "查询下单时间范围开始")
     private Date applyDateStart;
@@ -27,28 +27,28 @@ public class OrderSearchPram {
     private Date applyDateEnd;
 
     @ApiModelProperty(value = "客户名称")
-    private String enterpriseIdDesc;
+    private String customerName;
 
     @ApiModelProperty(value = "通道名称")
-    private String channelIdDesc;
+    private String channelName;
 
     @ApiModelProperty(value = "订单状态")
     private String status;
 
     @ApiModelProperty(value = "运营商")
-    private String mobileOperator;
+    private String phoneOperator;
 
-    @ApiModelProperty(value = "面额")
+    @ApiModelProperty(value = "面额范围 格式0-100")
     private String flowAmount;
 
     @ApiModelProperty(value = "回调时间开始范围")
-    private Date checkTimeStart;
+    private Date callbackTimeStart;
 
     @ApiModelProperty(value = "回调时间结束范围")
-    private Date checkTimeEnd;
+    private Date callbackTimeEnd;
 
     @ApiModelProperty(value ="归属地")
-    private String mobileHome;
+    private String phoneHome;
 
     @ApiModelProperty(value ="查询页数")
     private Integer page;

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

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 import java.util.Map;
 
 
@@ -37,7 +36,7 @@ public class OrderRest {
     }
 
     @PostMapping("/searchFinance")
-    @ApiOperation(value = "订单查询(财务)", notes = "order_search_Finance.py")
+    @ApiOperation(value = "订单查询(财务)", notes = "order_search_finance.py")
     public BaseRestResponse<Map<String,Object>> orderSearchFinance(@RequestBody OrderSearchPram orderSearchPram) {
         return new BaseRestResponse<>(orderManagementService.orderSearchFinance(orderSearchPram));
     }

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

@@ -3,10 +3,13 @@ package com.fire.admin.rest;
 
 import com.fire.common.redis.RedisAmountScript;
 import com.fire.common.redis.RedisOrderIdScript;
+import com.fire.es.OrderEsDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.query.IndexQuery;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import redis.clients.jedis.JedisCluster;
@@ -17,7 +20,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import static com.fire.dto.enums.RedisKey.*;
 
 
 @Slf4j
@@ -51,60 +53,59 @@ public class TestRest {
         return date1;
     }
 
-    //    @GetMapping("/insert")
-//    public String insert() {
-//        OrderEsDto orderEsDto = new OrderEsDto();
-//        orderEsDto.setOrderId("1621332591561198300");
-//        orderEsDto.setPackageId("YDHF10");
-//        orderEsDto.setFlowAppId("83");
-//        orderEsDto.setEnterpriseId(82);
-//        orderEsDto.setOrderType(3);
-//        orderEsDto.setUsedMobile("15955721307");
-//        orderEsDto.setExtorderId("C202105181809262705527307");
-//        orderEsDto.setRecId("");
-//        orderEsDto.setApplyDate(timeSwap("2021-05-18 18:09:51"));
-//        orderEsDto.setActiveDate(timeSwap("2021-05-18 17:44:20"));
-//        orderEsDto.setLimitedDate(timeSwap("2021-05-19 18:09:51"));
-//        orderEsDto.setStatus(6);
-//        orderEsDto.setNote("86400");
-//        orderEsDto.setMobileOperator("YD");
-//        orderEsDto.setMobileHome("四川-成都-移动");
-//        orderEsDto.setGwSeqNo("");
-//        orderEsDto.setGwStatus("");
-//        orderEsDto.setLastModifyDate(timeSwap("2021-05-19 18:10:21"));
-//        orderEsDto.setGwErrorCode("0000");
-//        orderEsDto.setFlowAmount(10 * 10000);
-//        orderEsDto.setDealFlag("2");
-//        orderEsDto.setOprCode("SUCCESS");
-//        orderEsDto.setUsageLimit((int) (10.1500 * 10000));
-//        orderEsDto.setBatchCount(1);
-//        orderEsDto.setSendCount(1);
-//        orderEsDto.setAreaCode("37");
-//        orderEsDto.setPrice((int) (10.28 * 10000));
-//        orderEsDto.setPartnerBalancePrice((int) (1 * 10000));
-//        orderEsDto.setOperatorBalancePrice((int) (0 * 10000));
-//        orderEsDto.setOrderDetailId(2885);
-//        orderEsDto.setChannelId(null);
-//        orderEsDto.setCheckTime(timeSwap("2021-05-19 18:10:21"));
-//        orderEsDto.setProductId("270");
-//        orderEsDto.setUser("北京微播视界科技有限公司");
-//        orderEsDto.setAppId("beijingweiboshijie");
-//        orderEsDto.setChannelName("智信3移动");
-//        IndexQuery indexQuery = new IndexQuery();
-//        indexQuery.setId(orderEsDto.getOrderId());
-//        indexQuery.setObject(orderEsDto);
-//        IndexCoordinates indexCoordinates = IndexCoordinates.of("flow_order_info");
-//        restTemplate.index(indexQuery, indexCoordinates);
-//        return "sucees";
-//    }
-    @GetMapping("/redis")
-    public String redis() {
-        jedisCluster.hset(CUSTOMER_AMOUNT.key(), CUSTOMER_AMOUNT.key() + "123456", "1000");
-        redisOrderIdScript.checkOrderId(ORDER_DOWN.key() + "asdfgh", "123456789");
-        Long res = redisAmountScript.changeAmount(SUPPLIER_AMOUNT.key(), 123456L, "sub", 500, 1000L);
-        return res.toString();
+        @GetMapping("/insert")
+    public String insert() {
+        OrderEsDto orderEsDto = new OrderEsDto();
+        orderEsDto.setOrderId("1621332591561198300");
+        orderEsDto.setPackageId("YDHF10");
+        orderEsDto.setFlowAppId("83");
+        orderEsDto.setCustomerId(82);
+        orderEsDto.setOrderType(3);
+        orderEsDto.setPhoneNo("15955721307");
+        orderEsDto.setExtorderId("C202105181809262705527307");
+        orderEsDto.setRecId("");
+        orderEsDto.setApplyDate(timeSwap("2021-05-18 18:09:51"));
+        orderEsDto.setActiveDate(timeSwap("2021-05-18 17:44:20"));
+        orderEsDto.setLimitedDate(timeSwap("2021-05-19 18:09:51"));
+        orderEsDto.setStatus(6);
+        orderEsDto.setNote("86400");
+        orderEsDto.setPhoneOperator(1);
+        orderEsDto.setPhoneHome("四川-成都-移动");
+        orderEsDto.setGwSeqNo("");
+        orderEsDto.setGwStatus("");
+        orderEsDto.setLastModifyDate(timeSwap("2021-05-19 18:10:21"));
+        orderEsDto.setGwErrorCode("0000");
+        orderEsDto.setFlowAmount(10 * 10000);
+        orderEsDto.setCallbackStatus(6);
+        orderEsDto.setUsageLimit((int) (10.1500 * 10000));
+        orderEsDto.setBatchCount(1);
+        orderEsDto.setSendCount(1);
+        orderEsDto.setAreaCode("37");
+        orderEsDto.setPrice((int) (10.28 * 10000));
+        orderEsDto.setPartnerBalancePrice((int) (1 * 10000));
+        orderEsDto.setOperatorBalancePrice((int) (0 * 10000));
+        orderEsDto.setChannelId(null);
+        orderEsDto.setCallbackTime(timeSwap("2021-05-19 18:10:21"));
+        orderEsDto.setProductId("270");
+        orderEsDto.setCustomerName("北京微播视界科技有限公司");
+        orderEsDto.setAppId("beijingweiboshijie");
+        orderEsDto.setChannelName("智信3移动");
+        IndexQuery indexQuery = new IndexQuery();
+        indexQuery.setId(orderEsDto.getOrderId());
+        indexQuery.setObject(orderEsDto);
+        IndexCoordinates indexCoordinates = IndexCoordinates.of("flow_order_info");
+        restTemplate.index(indexQuery, indexCoordinates);
+        return "sucees";
     }
 
+//    @GetMapping("/redis")
+//    public String redis() {
+//        jedisCluster.hset(CUSTOMER_AMOUNT.key(), CUSTOMER_AMOUNT.key() + "123456", "1000");
+//        redisOrderIdScript.checkOrderId(ORDER_DOWN.key() + "asdfgh", "123456789");
+//        Long res = redisAmountScript.changeAmount(SUPPLIER_AMOUNT.key(), 123456L, "sub", 500, 1000L);
+//        return res.toString();
+//    }
+
 
 }
 

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

@@ -55,10 +55,10 @@ public class OrderManagementService {
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         RangeQueryBuilder rangeQueryBuilder = null;
         //判断回调时间参数是否为空 不为空以回调时间来查询 否则用创建时间来查询
-        if (null != orderSearchPram.getCheckTimeStart()) {
-            rangeQueryBuilder = QueryBuilders.rangeQuery("checkTime")
-                    .gte(orderSearchPram.getCheckTimeStart().getTime())
-                    .lte(orderSearchPram.getCheckTimeEnd().getTime());
+        if (null != orderSearchPram.getCallbackTimeStart()) {
+            rangeQueryBuilder = QueryBuilders.rangeQuery("callbackTime")
+                    .gte(orderSearchPram.getCallbackTimeStart().getTime())
+                    .lte(orderSearchPram.getCallbackTimeEnd().getTime());
             boolQuery.must(rangeQueryBuilder);
         }
         rangeQueryBuilder = QueryBuilders.rangeQuery("applyDate")
@@ -71,45 +71,52 @@ public class OrderManagementService {
         if (Strings.isNotBlank(orderSearchPram.getOrderId())) {
             boolQuery.must(QueryBuilders.termQuery("orderId", orderSearchPram.getOrderId()));
         }
-        //商户订单号
+        //客户订单号
         if (Strings.isNotBlank(orderSearchPram.getExtorderId())) {
             boolQuery.must(QueryBuilders.termQuery("extorderId", orderSearchPram.getExtorderId()));
         }
         //电话号码
-        if (Strings.isNotBlank(orderSearchPram.getUsedMobile())) {
-            String usedMobiles = orderSearchPram.getUsedMobile();
-            if (usedMobiles.indexOf(",") >= 0) {
+        if (Strings.isNotBlank(orderSearchPram.getPhoneNo())) {
+            String usedMobiles = orderSearchPram.getPhoneNo();
+            if (usedMobiles.contains(",")) {
                 String[] usedMobileList = usedMobiles.split(",");
                 for (String usedMobile : usedMobileList) {
-                    boolQuery.should(QueryBuilders.termQuery("usedMobile", usedMobile));
+                    boolQuery.should(QueryBuilders.termQuery("phoneNo", usedMobile));
                 }
             } else {
-                boolQuery.must(QueryBuilders.termQuery("usedMobile", usedMobiles));
+                boolQuery.must(QueryBuilders.termQuery("phoneNo", usedMobiles));
             }
         }
         //客户名称
-        if (Strings.isNotBlank(orderSearchPram.getEnterpriseIdDesc())) {
-            boolQuery.must(QueryBuilders.wildcardQuery("user.keyword", "*" + orderSearchPram.getEnterpriseIdDesc() + "*"));
+        if (Strings.isNotBlank(orderSearchPram.getCustomerName())) {
+            boolQuery.must(QueryBuilders.wildcardQuery("customerName.keyword", "*" + orderSearchPram.getCustomerName() + "*"));
         }
         //通道名称
-        if (Strings.isNotBlank(orderSearchPram.getChannelIdDesc())) {
-            boolQuery.must(QueryBuilders.wildcardQuery("channelName.keyword", "*" + orderSearchPram.getChannelIdDesc() + "*" ));
+        if (Strings.isNotBlank(orderSearchPram.getChannelName())) {
+            boolQuery.must(QueryBuilders.wildcardQuery("channelName.keyword", "*" + orderSearchPram.getChannelName() + "*" ));
         }
         //订单状态
         if (Strings.isNotBlank(orderSearchPram.getStatus())) {
             boolQuery.must(QueryBuilders.termQuery("status", orderSearchPram.getStatus()));
         }
         //运营商
-        if (Strings.isNotBlank(orderSearchPram.getMobileOperator())) {
-            boolQuery.must(QueryBuilders.termQuery("mobileOperator", orderSearchPram.getMobileOperator()));
+        if (Strings.isNotBlank(orderSearchPram.getPhoneOperator())) {
+            boolQuery.must(QueryBuilders.termQuery("phoneOperator", orderSearchPram.getPhoneOperator()));
         }
         //面额
         if (Strings.isNotBlank(orderSearchPram.getFlowAmount())) {
-            boolQuery.must(QueryBuilders.termQuery("flowAmount", orderSearchPram.getFlowAmount()));
+            String flowAmount = orderSearchPram.getFlowAmount();
+            if (flowAmount.contains("-")) {
+                String[] flowAmountSplit = flowAmount.split("-");
+                rangeQueryBuilder = QueryBuilders.rangeQuery("flowAmount")
+                        .gte(flowAmountSplit[0])
+                        .lte(flowAmountSplit[1]);
+                boolQuery.must(rangeQueryBuilder);
+            }
         }
         //归属地
-        if (Strings.isNotBlank(orderSearchPram.getMobileHome())) {
-            boolQuery.must(QueryBuilders.wildcardQuery("mobileHome.keyword", "*" + orderSearchPram.getMobileHome() + "*"));
+        if (Strings.isNotBlank(orderSearchPram.getPhoneHome())) {
+            boolQuery.must(QueryBuilders.wildcardQuery("phoneHome.keyword", "*" + orderSearchPram.getPhoneHome() + "*"));
         }
 
         NativeSearchQuery query = new NativeSearchQueryBuilder()
@@ -161,10 +168,10 @@ public class OrderManagementService {
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         RangeQueryBuilder rangeQueryBuilder = null;
         //判断回调时间参数是否为空 不为空以回调时间来查询 否则用创建时间来查询
-        if (null != orderSearchPram.getCheckTimeStart()) {
-            rangeQueryBuilder = QueryBuilders.rangeQuery("checkTime")
-                    .gte(orderSearchPram.getCheckTimeStart().getTime())
-                    .lte(orderSearchPram.getCheckTimeEnd().getTime());
+        if (null != orderSearchPram.getCallbackTimeStart()) {
+            rangeQueryBuilder = QueryBuilders.rangeQuery("callbackTime")
+                    .gte(orderSearchPram.getCallbackTimeStart().getTime())
+                    .lte(orderSearchPram.getCallbackTimeEnd().getTime());
             boolQuery.must(rangeQueryBuilder);
         }
         rangeQueryBuilder = QueryBuilders.rangeQuery("applyDate")
@@ -177,53 +184,59 @@ public class OrderManagementService {
         if (Strings.isNotBlank(orderSearchPram.getOrderId())) {
             boolQuery.must(QueryBuilders.termQuery("orderId", orderSearchPram.getOrderId()));
         }
-        //商户订单号
+        //客户订单号
         if (Strings.isNotBlank(orderSearchPram.getExtorderId())) {
             boolQuery.must(QueryBuilders.termQuery("extorderId", orderSearchPram.getExtorderId()));
         }
         //电话号码
-        if (Strings.isNotBlank(orderSearchPram.getUsedMobile())) {
-            String usedMobiles = orderSearchPram.getUsedMobile();
+        if (Strings.isNotBlank(orderSearchPram.getPhoneNo())) {
+            String usedMobiles = orderSearchPram.getPhoneNo();
             if (usedMobiles.contains(",")) {
                 String[] usedMobileList = usedMobiles.split(",");
                 for (String usedMobile : usedMobileList) {
-                    boolQuery.should(QueryBuilders.termQuery("usedMobile", usedMobile));
+                    boolQuery.should(QueryBuilders.termQuery("phoneNo", usedMobile));
                 }
             } else {
-                boolQuery.must(QueryBuilders.termQuery("usedMobile", usedMobiles));
+                boolQuery.must(QueryBuilders.termQuery("phoneNo", usedMobiles));
             }
         }
         //客户名称
-        if (Strings.isNotBlank(orderSearchPram.getEnterpriseIdDesc())) {
-            boolQuery.must(QueryBuilders.wildcardQuery("user.keyword", "*" + orderSearchPram.getEnterpriseIdDesc() + "*"));
+        if (Strings.isNotBlank(orderSearchPram.getCustomerName())) {
+            boolQuery.must(QueryBuilders.wildcardQuery("customerName.keyword", "*" + orderSearchPram.getCustomerName() + "*"));
         }
         //通道名称
-        if (Strings.isNotBlank(orderSearchPram.getChannelIdDesc())) {
-            boolQuery.must(QueryBuilders.wildcardQuery("channelName.keyword", "*" + orderSearchPram.getChannelIdDesc() + "*" ));
+        if (Strings.isNotBlank(orderSearchPram.getChannelName())) {
+            boolQuery.must(QueryBuilders.wildcardQuery("channelName.keyword", "*" + orderSearchPram.getChannelName() + "*" ));
         }
         //订单状态
         if (Strings.isNotBlank(orderSearchPram.getStatus())) {
             boolQuery.must(QueryBuilders.termQuery("status", orderSearchPram.getStatus()));
         }
         //运营商
-        if (Strings.isNotBlank(orderSearchPram.getMobileOperator())) {
-            boolQuery.must(QueryBuilders.termQuery("mobileOperator", orderSearchPram.getMobileOperator()));
+        if (Strings.isNotBlank(orderSearchPram.getPhoneOperator())) {
+            boolQuery.must(QueryBuilders.termQuery("phoneOperator", orderSearchPram.getPhoneOperator()));
         }
         //面额
         if (Strings.isNotBlank(orderSearchPram.getFlowAmount())) {
-            boolQuery.must(QueryBuilders.termQuery("flowAmount", orderSearchPram.getFlowAmount()));
+            String flowAmount = orderSearchPram.getFlowAmount();
+            if (flowAmount.contains("-")) {
+                String[] flowAmountSplit = flowAmount.split("-");
+                rangeQueryBuilder = QueryBuilders.rangeQuery("flowAmount")
+                        .gte(flowAmountSplit[0])
+                        .lte(flowAmountSplit[1]);
+                boolQuery.must(rangeQueryBuilder);
+            }
         }
         //归属地
-        if (Strings.isNotBlank(orderSearchPram.getMobileHome())) {
-            boolQuery.must(QueryBuilders.wildcardQuery("mobileHome.keyword", "*" + orderSearchPram.getMobileHome() + "*"));
+        if (Strings.isNotBlank(orderSearchPram.getPhoneHome())) {
+            boolQuery.must(QueryBuilders.wildcardQuery("phoneHome.keyword", "*" + orderSearchPram.getPhoneHome() + "*"));
         }
 
-        //统计条件
+        //统计金额
         SumAggregationBuilder sumBuilder = AggregationBuilders.sum("sumPrice").field("price");
         SumAggregationBuilder sumBuilder2 = AggregationBuilders.sum("sumPartnerPrice").field("partnerBalancePrice");
         SumAggregationBuilder sumBuilder3 = AggregationBuilders.sum("sumOperatorPrice").field("operatorBalancePrice");
 
-
         NativeSearchQuery query = new NativeSearchQueryBuilder()
                 .withPageable(pageable)
                 .withQuery(boolQuery.must(rangeQueryBuilder))