上海wateropf修改

wateroPF-common-core/src/main/java/com/iamberry/wechat/core/entity/drp/PlaceInfo.java

@@ -76,7 +76,10 @@ public class PlaceInfo implements java.io.Serializable {
 
     private Integer allAmount;  //应该返利总金额
     private Integer cancelAmount;  //取消返利总金额
-    private Integer proposedAmount;  //提出金额
+
+    private Integer proposedAmount;  //提现已处理金额
+    private Integer proposedUnAmount;  //提现未处理金额
+
     private Integer rebateAllAmount;  //待返利金额
 
     public String getQrcodeUrl() {
@@ -386,6 +389,14 @@ public class PlaceInfo implements java.io.Serializable {
         this.rebateAllAmount = rebateAllAmount;
     }
 
+    public Integer getProposedUnAmount() {
+        return proposedUnAmount;
+    }
+
+    public void setProposedUnAmount(Integer proposedUnAmount) {
+        this.proposedUnAmount = proposedUnAmount;
+    }
+
     @Override
     public String toString() {
         return "PlaceInfo [id=" + id + ", supperId=" + supperId

wateroPF-wechat-web/src/main/java/com/iamberry/wechat/handles/drp/AdminWithDrp.java

@@ -597,6 +597,11 @@ public class AdminWithDrp {
             placeWithDrawalsLogs.setStatus(2);
             int proposedAmount = placeWithDrawalsLogsService.selectAllMoney(placeWithDrawalsLogs);
             pi.setProposedAmount(proposedAmount);
+
+            placeWithDrawalsLogs.setPlaceId(pi.getId());
+            placeWithDrawalsLogs.setStatus(1);
+            int proposedUnAmount = placeWithDrawalsLogsService.selectAllMoney(placeWithDrawalsLogs);
+            pi.setProposedUnAmount(proposedUnAmount);
         }
 
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -611,10 +616,11 @@ public class AdminWithDrp {
         titles.add("真实姓名");
         titles.add("金额(元)");
         titles.add("待返利金额(元)");
-        titles.add("记录-待返利金额(元)");
-        titles.add("记录-已返利总返利(元)");
-        titles.add("记录-取消返利(元)");
-        titles.add("已提出金额(元)");
+//        titles.add("记录-待返利金额(元)");
+        titles.add("返利记录总金额(元)");
+//        titles.add("记录-取消返利(元)");
+        titles.add("提现未处理");
+        titles.add("提现已处理");
         titles.add("角色");
         titles.add("下线用户");
         titles.add("是否激活");
@@ -632,10 +638,10 @@ public class AdminWithDrp {
             row.add("".equals(info.getAmount() + "")?"0":info.getAmount()/100);
             row.add("".equals(info.getRebatePending() + "")?"0":info.getRebatePending()/100);
 
-            row.add("".equals(info.getRebateAllAmount() + "")?"0":info.getRebateAllAmount()/100);
             row.add("".equals(info.getAllAmount() + "")?"0":info.getAllAmount()/100);
-            row.add("".equals(info.getCancelAmount() + "")?"0":info.getCancelAmount()/100);
+
             row.add("".equals(info.getProposedAmount() + "")?"0":info.getProposedAmount()/100);
+            row.add("".equals(info.getProposedUnAmount() + "")?"0":info.getProposedUnAmount()/100);
 
             row.add(info.getRoleName() == null?"":info.getRoleName());
             row.add("".equals(info.getOfflineubscriber() + "")?"0":info.getOfflineubscriber());

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/drp/placeInfolist.jsp

@@ -46,7 +46,7 @@
 			<i class="Hui-iconfont"></i> 搜索
 		</button>
 
-		<%--<div onclick="return download();">下载订单</div>--%>
+		<div onclick="return download();">下载订单</div>
 	</form>
 	<form id="goodsform" >
 		<div class="cl pd-5 bg-1 bk-gray mt-20">