fix 解绑渠道订单时间查询

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

@@ -18,7 +18,7 @@ import java.math.BigDecimal;
 @SearchBean(tables = "user_distribute_shared_relate_unbind unb inner join order_don o on o.user_id = unb.user_id and o.created_time > unb.update_time" +
 		" inner join user_distribute_shared us on us.user_id = unb.user_id" +
 		" inner join user_distribute ud on ud.user_id = us.shared_id and ud.deleted = 1",
-		where = "o.status not in ('close','noPayment','refund') and o.is_distribute = 0")
+		where = "o.status not in ('close','noPayment','refund') and o.is_distribute = 0 :time:")
 public class UserDistributeUnbindOrderMoneyView {
 
 

netflix-service/src/main/java/com/cyksj/common/service/CropDutyServiceDateService.java

@@ -53,7 +53,7 @@ public class CropDutyServiceDateService {
 		if (holidyDateMap == null) {
 			return null;
 		}
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/M/d");
 		String nowDate = now.format(formatter);
 
 		List<YhServiceDto> holidayServices = holidyDateMap.get(nowDate);

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

@@ -1170,8 +1170,19 @@ public class DistributeController {
 	 * 解绑渠道关系下单金额，以及佣金
 	 */
 	@GetMapping("/get/unbind/orderMoney/detail")
-	public Result<UserDistributeUnbindOrderMoneyView> getUnbindDistributeOrderMoneyDetail() {
-		UserDistributeUnbindOrderMoneyView userDistributeUnbindOrderMoneyView = beanSearcher.searchFirst(UserDistributeUnbindOrderMoneyView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+	public Result<UserDistributeUnbindOrderMoneyView> getUnbindDistributeOrderMoneyDetail(String startTime, String endTime) {
+		String timeSql = StrUtil.EMPTY;
+		if (startTime != null) {
+			timeSql += String.format(" and o.created_time >= '%s'", startTime);
+		}
+		if (endTime != null) {
+			timeSql += String.format(" and o.created_time < '%s'", endTime);
+		}
+		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
+		if (StrUtil.isNotEmpty(timeSql)) {
+			builder.put("time", timeSql);
+		}
+		UserDistributeUnbindOrderMoneyView userDistributeUnbindOrderMoneyView = beanSearcher.searchFirst(UserDistributeUnbindOrderMoneyView.class, builder.build());
 		return GatewayResponse.SUCCESS.newBuilder().toResult(userDistributeUnbindOrderMoneyView);
 	}
 }