diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 629ab6605..829a31633 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -40,6 +40,7 @@ public class WxMerchantTradeDailyController extends BaseController { cal.add(Calendar.DAY_OF_YEAR, -1); SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd"); wxMerchantTradeDaily.setReportDate(fmt.format(cal.getTime())); + wxMerchantTradeDaily.setSortColumns(WxMerchantTradeDailyVo.Field.CreateDate_DESC); final PageInfo page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index fdc2b959b..b630bbc55 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -105,13 +105,16 @@ - mtd.id as id, mtd.tenant_id as tenant_id, mtd.merchant_id as merchant_id, mtd.b_user_id as b_user_id,`trade_amt`,mtd.create_date as create_date,mtd.update_date as update_date,`report_date`, m.name as merchant_name, mbu.name as b_user_name, mbu.phone as b_user_phone + mtd.id as id, m.tenant_id as tenant_id, m.id as merchant_id, mtd.b_user_id as b_user_id, mtd.trade_amt as trade_amt, mtd.create_date as create_date,mtd.update_date as update_date,mtd.report_date as report_date, m.name as merchant_name, mbu.name as b_user_name, mbu.phone as b_user_phone