|
|
|
@@ -9,6 +9,9 @@ import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.BaseEntity; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxProfitSharingReceiver; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.vo.WxBusinessDataVo; |
|
|
|
import com.iformall.domain.vo.WxMerchantTradeDetailVo; |
|
|
|
import com.iformall.domain.vo.WxMerchantTradeVo; |
|
|
|
import com.iformall.domain.vo.WxMerchantVo; |
|
|
|
import com.iformall.service.QrCodeService; |
|
|
|
@@ -282,16 +285,15 @@ public class WxMerchantController extends BaseController { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); |
|
|
|
if (null == wxMerchant) wxMerchant = new WxMerchant(); |
|
|
|
wxMerchant.setTenantId(getTenantId()); |
|
|
|
wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); |
|
|
|
final PageInfo<WxMerchantTradeVo> page = wxMerchantService.userTradeList(wxMerchant, pageNum, pageSize); |
|
|
|
final PageInfo<WxMerchantTradeDetailVo> page = wxMerchantService.userTradeDetailList(wxMerchant, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("导出商户会员消费分页列表") |
|
|
|
@GetMapping("exportUserTradeList") |
|
|
|
@GetMapping("exportUserTradeDetailList") |
|
|
|
@SystemControllerLog(description = "导出商户会员消费分页列表") |
|
|
|
public void exportUserTradeList(@ModelAttribute WxMerchant wxMerchant,HttpServletRequest request, HttpServletResponse response) throws Exception{ |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBusinessController::exportUserTradeList"); |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBusinessController::exportUserTradeDetailList"); |
|
|
|
wxMerchantService.exportUserTradeList(wxMerchant, request,response); |
|
|
|
} |
|
|
|
|
|
|
|
|