推广部分最后修改

pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerchantProfitVO.java

@@ -1,9 +1,12 @@
 package cn.pluss.platform.vo;
 
 import cn.pluss.platform.entity.MerchantChannelStatus;
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -25,6 +28,10 @@ public class MerchantProfitVO {
      * userId
      */
     private String userId;
+    /**
+     * parent_user_id
+     */
+    private Integer parent_user_id;
     /**
      *总交易金额
      */
@@ -49,12 +56,14 @@ public class MerchantProfitVO {
     /**
      * 入网时间
      */
-    private String createDt;
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createDt;
 
+    private List<MerChannelStatusVO> channelStatus;
     private String statusD1 = "0";
     private String statusD0 = "0";
     private String authorizationStatus = "0";
     private String remarkD1;
     private String remarkD0;
-
 }

pluss-model-bundle/src/main/java/cn/pluss/platform/vo/ProfitOrderVO.java

@@ -1,8 +1,11 @@
 package cn.pluss.platform.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 直推间推商户收款
@@ -14,7 +17,9 @@ public class ProfitOrderVO {
     private String merchantName;
 
     private BigDecimal consumeFee;
-    private String transDt;
+    @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date transDt;
 
     private String orderNumber;
 }