|
|
|
@@ -4,22 +4,15 @@ import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.dto.WxOrderReportDto; |
|
|
|
import com.iformall.domain.vo.WxMerchantMicroPayVo; |
|
|
|
import com.iformall.domain.vo.WxMerchantTradeDailyVo; |
|
|
|
import com.iformall.enums.EnumOrderStatus; |
|
|
|
import com.iformall.enums.EnumOrderType; |
|
|
|
import com.iformall.service.MarkingDataReportService; |
|
|
|
import com.iformall.service.WxMerchantTradeDailyService; |
|
|
|
import com.iformall.service.WxOrderService; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.Calendar; |
|
|
|
import java.util.Date; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@RequestMapping("wxMerchantMicroPay") |
|
|
|
@@ -36,6 +29,7 @@ public class WxMerchantMicroPayController extends BaseController { |
|
|
|
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto(); |
|
|
|
wxOrderReportDto.setTenantId(getTenantId()); |
|
|
|
wxOrderReportDto.setType(EnumOrderType.MICROPAY.getCode()); |
|
|
|
wxOrderReportDto.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); |
|
|
|
return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto)); |
|
|
|
} |
|
|
|
|
|
|
|
|