fix 分销统计数据

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

@@ -19,8 +19,7 @@ import java.util.Date;
 @SearchBean(tables = "order_don od left join user_distribute_shared uds on uds.user_id = od.user_id" +
 		" left join user_distribute ud on ud.user_id = uds.shared_id" +
 		" left join distribute_waiting_send_points dp on dp.order_id = od.id",
-where = "od.is_distribute is true and od.status not in ('close','noPayment','refund')" +
-		" and dp.send_status != 'close'")
+where = "od.is_distribute is true and od.status not in ('close','noPayment')")
 public class DistributeOrdersView {
 	@DbField("od.id")
 	private Long id;

netflix-dao/src/main/resources/mapper/UserDistributeMapper.xml

@@ -10,7 +10,6 @@
                  inner join `distribute_waiting_send_points` dp
                             on dp.order_id = od.id
         where us.shared_id = #{userId}
-          and od.status not in ('close', 'noPayment', 'refund')
-          and dp.send_status != 'close'
+          and od.status not in ('close', 'noPayment')
     </select>
 </mapper>

netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -26,6 +26,7 @@ import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -172,7 +173,7 @@ public class DistributeController {
 	 * 提现审核
 	 */
 	@PutMapping("/verify/applyMoney")
-	public Result<String> verifyApplyMoney(@RequestBody @NotNull DistributeApplyMoneyReq distributeApplyMoneyReq) {
+	public Result<String> verifyApplyMoney(@RequestBody @Validated DistributeApplyMoneyReq distributeApplyMoneyReq) {
 		DistributeMoneyApply.Status status = DistributeMoneyApply.Status.checkStatus(distributeApplyMoneyReq.getVerifyStatus());
 		if (status == null || status == DistributeMoneyApply.Status.verifying) {
 			throw BusinessRuntimeException.getInstance("审核状态错误");