推广部分大改

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantProfit.java

@@ -81,6 +81,10 @@ public class MerchantProfit {
     @TableField(exist = false)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
+    //订单支付时间
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date transDt;
 
      @DateTimeFormat(pattern = "yyyy-MM-dd")
      @TableField(select = false, insertStrategy = FieldStrategy.NEVER, updateStrategy = FieldStrategy.NEVER)
@@ -115,6 +119,9 @@ public class MerchantProfit {
     @TableField(exist = false)
     private String userType;
 
+    @TableField(exist = false)
+    private String type_code;
+
     public MerchantProfit(UserApp userApp, UserApp profitUserApp, MerchantOrder order,BigDecimal profitAmt,BigDecimal profitRate,String type,String orderType) {
         this.userId = profitUserApp.getUserId();
         //V2.0模式

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

@@ -0,0 +1,60 @@
+package cn.pluss.platform.vo;
+
+import cn.pluss.platform.entity.MerchantChannelStatus;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author 团队管理
+ */
+@Data
+public class MerchantProfitVO {
+    private String userName;
+    private String phone;
+    /**
+     * 费率
+     */
+    private String current_fee;
+    /**
+     * 角色
+     */
+    private String type_code;
+    /**
+     * userId
+     */
+    private String userId;
+    /**
+     *总交易金额
+     */
+    private BigDecimal consumeFee = BigDecimal.ZERO;
+    /**
+     * 本月交易金额
+     */
+    private BigDecimal currentMonth = BigDecimal.ZERO;
+    /**
+     * 昨日收款
+     */
+    private BigDecimal yestedayConsumeFee = BigDecimal.ZERO;
+    /**
+     *昨日收款笔数
+     */
+    private Integer countNum = 0;
+    /**
+     * 商户号
+     */
+    private String merchantCode;
+
+    /**
+     * 入网时间
+     */
+    private String createDt;
+
+    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/SpreadData.java

@@ -24,7 +24,7 @@ public class SpreadData {
     private String userId;
 
     /**
-     * 直属商户交易额
+     * 银收客额
      */
     private BigDecimal ownAmt;