Merge remote-tracking branch 'origin/main' into main-cx

mall-dao/src/main/java/com/buy507/mall/mapper/UmsDevelopmentFundMapper.java

@@ -43,6 +43,13 @@ public interface UmsDevelopmentFundMapper {
      */
     @Update("update ums_development_fund set cash_total = cash_total + #{fundCash}")
     void updateCash(BigDecimal fundCash);
+
+    /**
+     * 发展基金
+     * @return
+     */
+    @Select("select id, cash_total, points_total, updated_at from ums_development_fund")
+    UmsDevelopmentFund selectAll();
 }
 
 

mall-dao/src/main/java/com/buy507/mall/model/UmsDevelopmentFund.java

@@ -36,6 +36,38 @@ public class UmsDevelopmentFund implements Serializable {
      */
     private Date updatedAt;
 
+    public Integer getPointsTotal() {
+        return pointsTotal;
+    }
+
+    public void setPointsTotal(Integer pointsTotal) {
+        this.pointsTotal = pointsTotal;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public BigDecimal getCashTotal() {
+        return cashTotal;
+    }
+
+    public void setCashTotal(BigDecimal cashTotal) {
+        this.cashTotal = cashTotal;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
     @Override
     public String toString() {
         return "UmsDevelopmentFund{" +

mall-dao/src/main/java/com/buy507/mall/model/UmsMemberAccountTransaction.java

@@ -44,6 +44,17 @@ public class UmsMemberAccountTransaction implements Serializable {
     @ApiModelProperty(value = "进账积分")
     private Integer revenuePoints;
 
+    public Integer getFlowType() {
+        return flowType;
+    }
+
+    public void setFlowType(Integer flowType) {
+        this.flowType = flowType;
+    }
+
+    @ApiModelProperty(value = "流水类型")
+    private Integer flowType;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -139,6 +150,7 @@ public class UmsMemberAccountTransaction implements Serializable {
                 ", createTime=" + createTime +
                 ", transferPaymentTime=" + transferPaymentTime +
                 ", revenuePoints=" + revenuePoints +
+                ", flowType=" + flowType +
                 '}';
     }
 }