Merge remote-tracking branch 'origin/master'

common/fire-dto/src/main/java/com/fire/dto/CustomerProduct.java

@@ -58,7 +58,7 @@ public class CustomerProduct {
 
     @ApiModelProperty(value = "产品id")
     @TableField(exist = false)
-    private Integer productId;
+    private Long productId;
 
     @ApiModelProperty(value = "适用区域（省份名称）")
     @TableField(exist = false)

common/fire-dto/src/main/java/com/fire/dto/FlowOrderInfo.java

@@ -101,7 +101,7 @@ public class FlowOrderInfo {
     private Date callbackTime;
 
     @ApiModelProperty(value = "产品ID号")
-    private Integer productId;
+    private Long productId;
 
     @ApiModelProperty(value = "官方凭证")
     private String attr1;

common/fire-dto/src/main/java/com/fire/dto/enums/OrderStatus.java

@@ -9,7 +9,8 @@ public enum OrderStatus {
     ORDER_RISK(5, "风控"),
     ORDER_SUCCESS(6, "成功"),
     ORDER_IN_QUEUE(7, "队列中"),
-    ORDER_EXCEPTION(8, "异常订单");
+    ORDER_EXCEPTION(8, "异常订单"),
+    ORDER_RESEND(9, "重发");
 
     private final Integer status;
 

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

@@ -43,8 +43,8 @@ public class DispatchDto {
      * 面额
      */
     @ApiModelProperty("面额")
-    @Field(type = FieldType.Integer)
-    private Integer flowAmount;
+    @Field(type = FieldType.Long)
+    private Long flowAmount;
 
     /**
      * 总发送次数
@@ -132,8 +132,8 @@ public class DispatchDto {
      * 运营商结算价格
      */
     @ApiModelProperty("运营商结算价格")
-    @Field(type = FieldType.Integer)
-    private int operatorBalancePrice;
+    @Field(type = FieldType.Long)
+    private Long operatorBalancePrice;
 
     /**
      * 通道组发送次数

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

@@ -36,8 +36,8 @@ public class OrderEsDto {
      * 客户ID号
      */
     @ApiModelProperty("客户id")
-    @Field(type = FieldType.Integer)
-    private Integer customerId;
+    @Field(type = FieldType.Long)
+    private Long customerId;
 
     /**
      * 订单类型
@@ -101,8 +101,8 @@ public class OrderEsDto {
      * 订单状态 1-待充值 2-充值中 3-重发
      * 4-失败 6-成功
      */
-    @ApiModelProperty("订单状态 1-待充值 2-充值中 3-重发 4-失败 6-成功")
-    @Field(type = FieldType.Integer)
+    @ApiModelProperty("订单状态 1-待充值 2-充值中 4-失败 6-成功 9-重发")
+    @Field(type = FieldType.Long)
     private Integer status;
     /**
      * 订单备注
@@ -142,15 +142,15 @@ public class OrderEsDto {
      * 面额
      */
     @ApiModelProperty("面额")
-    @Field(type = FieldType.Integer)
-    private Integer flowAmount;
+    @Field(type = FieldType.Long)
+    private Long flowAmount;
 
     /**
      * 成本
      */
     @ApiModelProperty("成本")
-    @Field(type = FieldType.Integer)
-    private Integer usageLimit;
+    @Field(type = FieldType.Long)
+    private Long usageLimit;
     /**
      * 通道组发送次数
      */
@@ -176,36 +176,36 @@ public class OrderEsDto {
      * 客户结算价格
      */
     @ApiModelProperty("客户结算价格")
-    @Field(type = FieldType.Integer)
-    private Integer price;
+    @Field(type = FieldType.Long)
+    private Long price;
 
     /**
      * 代理商结算价格
      */
     @ApiModelProperty("代理商结算价格")
-    @Field(type = FieldType.Integer)
-    private Integer partnerBalancePrice;
+    @Field(type = FieldType.Long)
+    private Long partnerBalancePrice;
 
     /**
      * 成本价格
      */
     @ApiModelProperty("成本价格")
-    @Field(type = FieldType.Integer)
-    private Integer operatorBalancePrice;
+    @Field(type = FieldType.Long)
+    private Long operatorBalancePrice;
 
     /**
      * 客户产品ID
      */
     @ApiModelProperty("通道ID")
-    @Field(type = FieldType.Integer)
-    private Integer customerProductId;
+    @Field(type = FieldType.Long)
+    private Long customerProductId;
 
     /**
      * 通道ID
      */
     @ApiModelProperty("通道ID")
-    @Field(type = FieldType.Integer)
-    private Integer channelId;
+    @Field(type = FieldType.Long)
+    private Long channelId;
 
     /**
      * 回调时间

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

@@ -58,46 +58,46 @@ public class TestRest {
 
     @GetMapping("/insert")
     public String insert() {
-        OrderEsDto orderEsDto = new OrderEsDto();
-        orderEsDto.setOrderId("1621586734674994200");
-        orderEsDto.setPackageId("YDHF10");
-        orderEsDto.setFlowAppId("83");
-        orderEsDto.setCustomerId(82);
-        orderEsDto.setOrderType(3);
-        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("2021-05-22 16:45:35"));
-        orderEsDto.setStatus(6);
-        orderEsDto.setNote("86400");
-        orderEsDto.setPhoneOperator(1);
-        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);
-        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) (9.98 * 10000));
-        orderEsDto.setChannelId(215);
-        orderEsDto.setCallbackTime(timeSwap("2021-05-21 16:45:34"));
-        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);
+//        OrderEsDto orderEsDto = new OrderEsDto();
+//        orderEsDto.setOrderId("1621586734674994200");
+//        orderEsDto.setPackageId("YDHF10");
+//        orderEsDto.setFlowAppId("83");
+//        orderEsDto.setCustomerId(82L);
+//        orderEsDto.setOrderType(3);
+//        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("2021-05-22 16:45:35"));
+//        orderEsDto.setStatus(6);
+//        orderEsDto.setNote("86400");
+//        orderEsDto.setPhoneOperator(1);
+//        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);
+//        orderEsDto.setUsageLimit(Long.valueOf(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) (9.98 * 10000));
+//        orderEsDto.setChannelId(215);
+//        orderEsDto.setCallbackTime(timeSwap("2021-05-21 16:45:34"));
+//        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";
     }
 
@@ -111,37 +111,37 @@ public class TestRest {
 
     @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);
+//        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/resources/bootstrap.yml

@@ -1,16 +1,14 @@
-
+server:
+  port: 8083
 spring:
   profiles:
-    active: prod
+    active: dev
 
 ---
-server:
-  port: 8082
-
 spring:
   config:
     activate:
-      on-profile: dev
+      on-profile: test
   application:
     name: admin
   jackson:
@@ -19,31 +17,19 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 192.168.2.116:8848
+        server-addr: 139.155.226.217:8848
         file-extension: yaml
         namespace: fire
       discovery:
-        server-addr: 192.168.2.116:8848
+        server-addr: 139.155.226.217:8848
         namespace: fire
         service: admin
 
-
-oss:
-  endpoint: http://oss-cn-chengdu.aliyuncs.com
-  keyid: LTAI4FyxwFmsGEESaa7tiB6z # 填写刚刚生成的AccessKey
-  keysecret: dG701ohwFU28pT84ZpEmIn7EcLOzzu  # 填写刚刚生成的Accesssecret
-  bucketname: bluefire # bucket名称
-  filehost: fmp    #bucket下文件夹的路径
-  finalUrl: https://bluefire.oss-cn-chengdu.aliyuncs.com/
-
 ---
-server:
-  port: 8081
-
 spring:
   config:
     activate:
-      on-profile: prod
+      on-profile: dev
   application:
     name: admin
   jackson:
@@ -59,11 +45,3 @@ spring:
         server-addr: 47.106.133.48:8848
         namespace: fire
         service: admin
-
-oss:
-  endpoint: http://oss-cn-chengdu.aliyuncs.com
-  keyid: LTAI4FyxwFmsGEESaa7tiB6z # 填写刚刚生成的AccessKey
-  keysecret: dG701ohwFU28pT84ZpEmIn7EcLOzzu  # 填写刚刚生成的Accesssecret
-  bucketname: bluefire # bucket名称
-  filehost: fmp    #bucket下文件夹的路径
-  finalUrl: https://bluefire.oss-cn-chengdu.aliyuncs.com/

modules/save-data/src/main/java/com/fire/savedata/consumer/OrderEsConsumer.java

@@ -41,7 +41,7 @@ public class OrderEsConsumer implements RocketMQListener<MessageExt> {
         } catch (JsonProcessingException e) {
             e.printStackTrace();
             log.error(e.toString());
-            throw new BaseException("ES消费出错");
+            //throw new BaseException("ES消费出错");
         }
     }
 

modules/save-data/src/main/java/com/fire/savedata/consumer/OrderTidbConsumer.java

@@ -43,7 +43,7 @@ public class OrderTidbConsumer implements RocketMQListener<MessageExt> {
         } catch (JsonProcessingException e) {
             e.printStackTrace();
             log.error(e.toString());
-            throw new BaseException("Tidb消费出错");
+            //throw new BaseException("Tidb消费出错");
         }
     }
 

modules/save-data/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: save-data
   profiles:
-    active: test
+    active: dev
 ---
 spring:
   config:
@@ -13,11 +13,11 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 192.168.2.114:8848
+        server-addr: 47.106.133.48:8848
         file-extension: yaml
         namespace: fire
       discovery:
-        server-addr: 192.168.2.114:8848
+        server-addr: 47.106.133.48:8848
         namespace: fire
         service: save-data
 ---
@@ -28,11 +28,11 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 47.106.133.48:8848
+        server-addr: 139.155.226.217:8848
         file-extension: yaml
         namespace: fire
       discovery:
-        server-addr: 47.106.133.48:8848
+        server-addr: 139.155.226.217:8848
         namespace: fire
         service: save-data