Merge branch 'dev_180508_联盟红人推广' into test6.6.1

@@ -19,6 +19,8 @@ public class UnionShareSettlement {
 
     private Byte status;
 
+    private String settlementStatus;
+
     private Integer updateTime;
 
     public Integer getId() {
@@ -85,6 +87,14 @@ public class UnionShareSettlement {
         this.status = status;
     }
 
+    public String getSettlementStatus() {
+        return settlementStatus;
+    }
+
+    public void setSettlementStatus(String settlementStatus) {
+        this.settlementStatus = settlementStatus;
+    }
+
     public Integer getUpdateTime() {
         return updateTime;
     }
@@ -104,6 +114,7 @@ public class UnionShareSettlement {
                 ", settlementTimeStr='" + settlementTimeStr + '\'' +
                 ", promoteUid=" + promoteUid +
                 ", status=" + status +
+                ", settlementStatus='" + settlementStatus + '\'' +
                 ", updateTime=" + updateTime +
                 '}';
     }

@@ -375,6 +375,11 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
             for (UnionShareSettlement unionShareSettlement : unionShareSettlementList){
                 unionShareSettlement.setSettlementAmountStr("+"+df1.format(unionShareSettlement.getSettlementAmount()));
                 unionShareSettlement.setSettlementTimeStr(DateUtils.int2DateStr(unionShareSettlement.getSettlementTime(), DateUtils.POINT_FOMARTPATTER));
+                if (unionShareSettlement.getStatus() == 1){
+                    unionShareSettlement.setSettlementStatus("结算中");
+                }else if (unionShareSettlement.getStatus() == 2){
+                    unionShareSettlement.setSettlementStatus("已结算");
+                }
             }
         }
         response.setSize(unionShareOrderReqBO.getSize());