Merge branch 'fix_03_16'

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

@@ -18,7 +18,7 @@ import java.util.Date;
 @Setter
 @SearchBean(tables = "user_ticket_cleared_record ur left join account a on a.id = ur.account_id" +
 		" left join goods_don g on g.id = ur.goods_id left join goods_don_sku gdk on gdk.id = ur.sku_id" +
-		" left join user u on u.id = ur.user_id left join corp_user cu on cu.unionid = u.unionid")
+		" left join user u on u.id = ur.user_id left join corp_user cu on cu.unionid = u.unionid and cu.unionid != ''")
 public class UserTicketClearedRecordView {
 	@DbField("ur.id")
 	private Long recordId;

netflix-web/src/main/java/com/cyksj/web/controller/user/DistributePopularizeController.java

@@ -162,10 +162,10 @@ public class DistributePopularizeController {
 			BigDecimal points = BigDecimal.valueOf(distributePointsExchangeMoney.getPoints());
 			BigDecimal money = distributePointsExchangeMoney.getMoney();
 			BigDecimal oneHundred = BigDecimal.valueOf(100);
-			if (user.getPoints().compareTo(BigDecimal.ZERO) > 0) {
+			if (user.getPoints().compareTo(BigDecimal.ZERO) >= 0) {
 				distributePopularizeView.setGotMoney(user.getPoints().divide(points).multiply(money).divide(oneHundred));
 			}
-			if (user.getPoints().compareTo(BigDecimal.ZERO) > 0) {
+			if (user.getPoints().compareTo(BigDecimal.ZERO) >= 0) {
 				distributePopularizeView.setWaitingMoney(waitingPoints.divide(points).multiply(money).divide(oneHundred));
 			}
 		}