fix

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

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-@SearchBean(tables = "(distribute_waiting_send_points :condition:) dp inner join order o on o.id = dp.order_id and o.status not in ('close','noPayment')")
+@SearchBean(tables = "(select * from distribute_waiting_send_points :condition:) dp inner join order_don o on o.id = dp.order_id and o.status not in ('close','noPayment')")
 public class DistributeWaitingOrderPointsRuleView {
 	@DbField("count(dp.order_id)")
 	private Integer numOfOrder;

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

@@ -785,6 +785,7 @@ public class DistributeController {
 			if (userDistributeRuleOrderRecord.getId() != null && userDistributeRuleOrderRecord.getStartTime() == null) {
 				if (DateTime.now().isAfter(DateUtil.offsetMinute(userDistributeRuleOrderRecord.getEndTime(), 10))) {
 					userDistributeRuleOrderRecord.setStartTime(DateTime.now());
+					userDistributeRuleOrderRecord.setDuration(DateUtil.formatBetween(userDistributeRuleOrderRecord.getEndTime(), userDistributeRuleOrderRecord.getEndTime()));
 					userDistributeRuleOrderRecordMapper.updateById(userDistributeRuleOrderRecord);
 				}
 			}
@@ -803,22 +804,22 @@ public class DistributeController {
 			Date startTime = data.getStartTime();
 			String time = StrUtil.EMPTY;
 			if (endTime != null) {
-				time = String.format("created_time >= %s", endTime);
+				time = String.format("created_time >= '%s'", DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"));
 			}
 			if (startTime != null) {
 				if (StrUtil.isNotBlank(time)) {
 					time += " and";
 				}
-				time += String.format("created_time < %s", startTime);
+				time += String.format("created_time < '%s'", DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"));
 			}
-			String condition = "is rule is true";
+			String condition = "where is_rule is true";
 			if (StrUtil.isNotBlank(time)) {
-				condition += String.format("and %s", time);
+				condition += String.format(" and %s", time);
 			}
 			DistributeWaitingOrderPointsRuleView ruleView = beanSearcher.searchFirst(DistributeWaitingOrderPointsRuleView.class, MapUtils.builder()
 					.put("condition", condition).build());
 			data.setNumOfOrder(ruleView.getNumOfOrder());
-			data.setOrderAmount(ruleView.getOrderAmount());
+			data.setOrderAmount(ruleView.getOrderAmount() == null ? BigDecimal.ZERO : ruleView.getOrderAmount());
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}