bugfix

src/main/java/com/caimei365/commodity/model/vo/CmReportingClubVO.java

@@ -109,6 +109,13 @@ public class CmReportingClubVO implements Serializable {
     /** 子订单编号 */
     private String shopOrderNo;
 
+
+    /** 分账结算状态: 0待确认 1待手动分账 ，2待手动结算，3已结算 */
+    private Integer splitSettleStatus;
+
+    /** 分账结算时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date splitSettleTime;
     /** 下单时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date orderTime;
@@ -149,6 +156,8 @@ public class CmReportingClubVO implements Serializable {
             cmReportingClubVO.setCommission(cmReportingClub.getCommission());
             cmReportingClubVO.setSettleStatus(cmReportingClub.getSettleStatus());
             cmReportingClubVO.setShopOrderNo(cmReportingClub.getShopOrderNo());
+            cmReportingClubVO.setSplitSettleStatus(cmReportingClub.getSplitSettleStatus());
+            cmReportingClubVO.setSplitSettleTime(cmReportingClub.getSplitSettleTime());
             cmReportingClubVO.setOrderTime(cmReportingClub.getOrderTime());
             cmReportingClubVO.setDistributionProduct(CmDistributionProductVO.setValue(cmReportingClub.getDistributionProduct()));
         }

src/main/resources/mapper/CmReportingClubMapper.xml

@@ -42,6 +42,8 @@
 			cm_reporting_club.createTime,
 			ifnull(cm_reporting_club.commission,0) AS commission,
 			cm_reporting_club.settleStatus,
+			cm_reporting_club.splitSettleStatus,
+			cm_reporting_club.splitSettleTime,
 			cm_distribution.name AS distributionName,
 			p.name AS productName,
 			p.mainImage AS productImage