|
|
|
@@ -13,6 +13,7 @@ import com.iformall.enums.EnumOrderType; |
|
|
|
import com.iformall.mapper.*; |
|
|
|
import com.iformall.service.MarkingDataReportService; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@@ -502,6 +503,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { |
|
|
|
public PageInfo<WxMerchantMicroPayVo> listMerchantMicroPayOrderReportByDate(WxOrderReportDto wxOrderReportDto,Integer pageIndex, Integer pageSize) { |
|
|
|
HashMap<String, Object> params = new HashMap<>(); |
|
|
|
|
|
|
|
if (!StringUtils.isEmpty(wxOrderReportDto.getMerchantName())) |
|
|
|
params.put("merchantName",wxOrderReportDto.getMerchantName()); |
|
|
|
|
|
|
|
if (wxOrderReportDto.getStartTime() != null) { |
|
|
|
params.put("startTime", convertDateAndAdd(wxOrderReportDto.getStartTime(), 0)); |
|
|
|
} else { |
|
|
|
|