|
|
|
@@ -2,10 +2,10 @@ package com.iformall.controller; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.BaseEntity; |
|
|
|
import com.iformall.domain.po.WxDateAmountRecord; |
|
|
|
import com.iformall.domain.po.WxMerchantBUser; |
|
|
|
import com.iformall.domain.vo.AmountRecordVo; |
|
|
|
import com.iformall.enums.EnumCouponOrderStatus; |
|
|
|
import com.iformall.enums.EnumDateAmtType; |
|
|
|
import com.iformall.service.WxDateAmountRecordService; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Collection; |
|
|
|
import java.util.Collections; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
@@ -60,7 +59,7 @@ public class WxDateAmountRecordController extends BaseController { |
|
|
|
temp.setTenantId(u.getTenantId()); |
|
|
|
temp.setMerchantId(u.getMerchantId()); |
|
|
|
temp.setType(dateAmtType); |
|
|
|
temp.setSortColumns(WxDateAmountRecord.Field.Date_DESC); |
|
|
|
temp.setSortColumns(BaseEntity.SortField.Date_DESC); |
|
|
|
|
|
|
|
SimpleDateFormat fmt = new SimpleDateFormat("MM/dd"); |
|
|
|
|
|
|
|
|