BUG修正 修改订单字段名 增加通道订单号 查询字段

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

@@ -17,6 +17,9 @@ public class OrderSearchPram {
     @ApiModelProperty(value = "商户订单号")
     private String extorderId;
 
+    @ApiModelProperty(value = "通道订单号(供应商订单号)")
+    private String gwSeqNo;
+
     @ApiModelProperty(value = "充值手机号")
     private String phoneNo;
 

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

@@ -56,24 +56,24 @@ public class TestRest {
         @GetMapping("/insert")
     public String insert() {
         OrderEsDto orderEsDto = new OrderEsDto();
-        orderEsDto.setOrderId("1621332591561198300");
+        orderEsDto.setOrderId("1621586734674994200");
         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.setPhoneNo("13945383017");
+        orderEsDto.setExtorderId("C202105211645032827751974");
+        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.setStatus(6);
         orderEsDto.setNote("86400");
         orderEsDto.setPhoneOperator(1);
-        orderEsDto.setPhoneHome("四川-成都-移动");
-        orderEsDto.setGwSeqNo("");
-        orderEsDto.setGwStatus("");
-        orderEsDto.setLastModifyDate(timeSwap("2021-05-19 18:10:21"));
+        orderEsDto.setPhoneHome("黑龙江-牡丹江-移动");
+        orderEsDto.setGwSeqNo("128804129015771");
+        orderEsDto.setGwStatus("成功");
+        orderEsDto.setLastModifyDate(timeSwap("2021-05-21 16:45:35"));
         orderEsDto.setGwErrorCode("0000");
         orderEsDto.setFlowAmount(10 * 10000);
         orderEsDto.setCallbackStatus(6);
@@ -83,9 +83,9 @@ public class TestRest {
         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.setOperatorBalancePrice((int) (9.98 * 10000));
+        orderEsDto.setChannelId(215);
+        orderEsDto.setCallbackTime(timeSwap("2021-05-21 16:45:34"));
         orderEsDto.setProductId("270");
         orderEsDto.setCustomerName("北京微播视界科技有限公司");
         orderEsDto.setAppId("beijingweiboshijie");

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

@@ -75,6 +75,12 @@ public class OrderManagementService {
         if (Strings.isNotBlank(orderSearchPram.getExtorderId())) {
             boolQuery.must(QueryBuilders.termQuery("extorderId", orderSearchPram.getExtorderId()));
         }
+
+        //商户订单号
+        if (Strings.isNotBlank(orderSearchPram.getGwSeqNo())) {
+            boolQuery.must(QueryBuilders.termQuery("gwSeqNo", orderSearchPram.getGwSeqNo()));
+        }
+
         //电话号码
         if (Strings.isNotBlank(orderSearchPram.getPhoneNo())) {
             String usedMobiles = orderSearchPram.getPhoneNo();
@@ -188,6 +194,10 @@ public class OrderManagementService {
         if (Strings.isNotBlank(orderSearchPram.getExtorderId())) {
             boolQuery.must(QueryBuilders.termQuery("extorderId", orderSearchPram.getExtorderId()));
         }
+        //商户订单号
+        if (Strings.isNotBlank(orderSearchPram.getGwSeqNo())) {
+            boolQuery.must(QueryBuilders.termQuery("gwSeqNo", orderSearchPram.getGwSeqNo()));
+        }
         //电话号码
         if (Strings.isNotBlank(orderSearchPram.getPhoneNo())) {
             String usedMobiles = orderSearchPram.getPhoneNo();