BUG修改 订单中ID长度改为LONG

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

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

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

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

modules/admin/src/main/resources/bootstrap.yml

@@ -1,16 +1,14 @@
-
+server:
+  port: 8083
 spring:
   profiles:
-    active: prod
+    active: test
 
 ---
-server:
-  port: 8082
-
 spring:
   config:
     activate:
-      on-profile: dev
+      on-profile: test
   application:
     name: admin
   jackson:
@@ -19,27 +17,15 @@ 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:
@@ -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/make-order/src/main/resources/bootstrap.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: make-order
   profiles:
-    active: dev
+    active: test
 ---
 spring:
   config:
@@ -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: make-order
 

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消费出错");
         }
     }