diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 6c7ed898b..77cbfeaa8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -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 page = wxMerchantService.userTradeList(wxMerchant, pageNum, pageSize); + final PageInfo 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); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909261053__G_MENU_CHANGED.sql b/mallinkAdmin/src/main/resources/db/migration/V201909261528__G_MENU_CHANGED.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V201909261053__G_MENU_CHANGED.sql rename to mallinkAdmin/src/main/resources/db/migration/V201909261528__G_MENU_CHANGED.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909261054__L_MENU_CHANGED.sql b/mallinkAdmin/src/main/resources/db/migration/V201909261529__L_MENU_CHANGED.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V201909261054__L_MENU_CHANGED.sql rename to mallinkAdmin/src/main/resources/db/migration/V201909261529__L_MENU_CHANGED.sql diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 032cbd6a4..cfe9f2610 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -748,8 +748,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public void exportUserTradeList(WxMerchant record,HttpServletRequest request, HttpServletResponse response) { - List datalist = wxMerchantMapper.userTradeList(record); - excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeVo.class, "商户会员消费列表.xlsx", response, false); + List datalist = wxMerchantMapper.userTradeDetailList(record); + excelService.exportExcel(datalist, null, "商户会员消费列表", WxMerchantTradeDetailVo.class, "商户会员消费列表.xlsx", response, false); } @Override