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 8008393ff..8087f87f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -212,6 +212,7 @@ public class WxMerchantController extends BaseController { return new ResultData(wxMerchant); } + @UserDataRuleAnnotation("merchant_list") @ApiOperation("商户数据导出") @GetMapping("/exportData") @SystemControllerLog(description = "商户-商户数据导出") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index c3474daaa..c29c55730 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -94,6 +94,7 @@ public class WxMerchantTradeDailyController extends BaseController { return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily); } + @UserDataRuleAnnotation("merchant_trade") @GetMapping("exportData") @SystemControllerLog(description = "商户解单数据-导出数据") public void exportData(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response) { diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908301450_L_ALTER_MENU.sql b/mallinkAdmin/src/main/resources/db/migration/V201908301520__G_ALTER_MENU.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V201908301450_L_ALTER_MENU.sql rename to mallinkAdmin/src/main/resources/db/migration/V201908301520__G_ALTER_MENU.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 2a6659c36..ee76e9acf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -622,7 +622,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { return wxMerchantMapper.selectOne(wxMerchant); } - + @Override public void exportData(WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { List list = wxMerchantMapper.findList(wxMerchant); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 681406ce5..45f4416c6 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -124,12 +124,17 @@ not null and status in(1,2,3,4) ) + and id in #{idItem} + + + + order by ${sortColumns} @@ -150,6 +155,23 @@ + + + and m.id in( + select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms + inner join wx_merchant m on ms.merchant_id = m.id + inner join wx_shop s on s.id=ms.shop_id + where m.tenant_id=#{tenantId} and s.is_del=0 + + and m.business_id in (${businessForRule}) + + + and s.`floor` in (${floorForRule}) + + ) + + + where m.is_del = 0 @@ -232,20 +254,7 @@ #{idItem} - - and m.id in( - select ms.merchant_id from (select merchant_id,shop_id from wx_merchant_shop where is_del=0) ms - inner join wx_merchant m on ms.merchant_id = m.id - inner join wx_shop s on s.id=ms.shop_id - where m.tenant_id=#{tenantId} and s.is_del=0 - - and m.business_id in (${businessForRule}) - - - and s.`floor` in (${floorForRule}) - - ) - + order by ${sortColumns} @@ -340,6 +349,7 @@ and m.`id` = #{id} + order by m.top_time desc