fix cps链接增加待入账、提成金额

netflix-dao/src/main/java/com/cyksj/model/views/UserDistributePopularizeView.java

@@ -42,6 +42,12 @@ public class UserDistributePopularizeView {
 	@DbField("ifnull(cast(sum(if(dsp.id is NULL,0,money))/100 as decimal(11,2)),0)")
 	private BigDecimal ordersMoney;
 
+	@DbField("ifnull(cast(sum(if(dsp.send_status='waiting',dsp.points,0))/1000 as decimal(11,2)),0)")
+	private BigDecimal wMoney;
+
+	@DbField("ifnull(cast(sum(if(dsp.send_status='success',dsp.points,0))/1000 as decimal(11,2)),0)")
+	private BigDecimal gotMoney;
+
 	@DbField("dp.remark")
 	private String remark;
 

netflix-web/src/main/java/com/cyksj/web/controller/cps/CpsPopularizeController.java

@@ -68,6 +68,8 @@ public class CpsPopularizeController {
 			UserDistributePopularizeView newPopularizeView = new UserDistributePopularizeView();
 			newPopularizeView.setOrders(0);
 			newPopularizeView.setOrdersMoney(BigDecimal.ZERO);
+			newPopularizeView.setWMoney(BigDecimal.ZERO);
+			newPopularizeView.setGotMoney(BigDecimal.ZERO);
 			return newPopularizeView;
 		});
 		if (StrUtil.isEmpty(user.getShowId())) {