|
@@ -751,10 +751,10 @@ public class CmsOrderController {
|
|
|
public Result<SearchResult<RefundOrderDonServiceDataView>> getRefundOrderData(String startTime, String endTime, String operator) {
|
|
public Result<SearchResult<RefundOrderDonServiceDataView>> getRefundOrderData(String startTime, String endTime, String operator) {
|
|
|
String time = StrUtil.EMPTY;
|
|
String time = StrUtil.EMPTY;
|
|
|
if (StrUtil.isNotBlank(startTime)) {
|
|
if (StrUtil.isNotBlank(startTime)) {
|
|
|
- time += String.format(" and rd.created_time >= '%s'", startTime);
|
|
|
|
|
|
|
+ time += String.format(" and o.created_time >= '%s'", startTime);
|
|
|
}
|
|
}
|
|
|
if (StrUtil.isNotBlank(endTime)) {
|
|
if (StrUtil.isNotBlank(endTime)) {
|
|
|
- time += String.format(" and rd.created_time < '%s'", endTime);
|
|
|
|
|
|
|
+ time += String.format(" and o.created_time < '%s'", endTime);
|
|
|
}
|
|
}
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
|
|
|
if (StrUtil.isNotBlank(time)) {
|
|
if (StrUtil.isNotBlank(time)) {
|