diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java index 497dc1b79..f52305a0f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java @@ -44,6 +44,17 @@ public class PileMerchantInfoController extends BaseController { return getDataTable(list); } + + /** + * 查询一级运营商列表 + */ + @PreAuthorize("@ss.hasPermi('pile:merchant:list')") + @GetMapping("queryFirstLevelMerchant") + public TableDataInfo queryFirstLevelMerchant() { + List list = pileMerchantInfoService.queryFirstLevelMerchant(); + return getDataTable(list); + } + /** * 获取运营商列表 不分页 * @param pileMerchantInfo diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java index c57aa7787..28be2bdeb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java @@ -84,4 +84,9 @@ public interface PileMerchantInfoMapper { * @return */ List queryInfoListByIds(@Param("deptIds") List deptIds); + + /** + * 查询一级运营商 + */ + List queryFirstLevelMerchant(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java index 70f33301c..488864d5d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java @@ -85,4 +85,10 @@ public interface IPileMerchantInfoService { * @return */ List queryInfoListByIds(AuthorizedDeptVO authorizedMap); + + /** + * 查询一级运营商列表 + * @return + */ + List queryFirstLevelMerchant(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 2decbd2d8..d92ac4477 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -332,4 +332,13 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); return null; } + + /** + * 查询一级运营商列表 + * @return + */ + @Override + public List queryFirstLevelMerchant() { + return pileMerchantInfoMapper.queryFirstLevelMerchant(); + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml index fcf500221..9cf85548f 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileMerchantInfoMapper.xml @@ -324,4 +324,13 @@ + + \ No newline at end of file diff --git a/jsowell-ui/src/api/adapayMember/adapayMember.js b/jsowell-ui/src/api/adapayMember/adapayMember.js index e0f39b01a..3490b211a 100644 --- a/jsowell-ui/src/api/adapayMember/adapayMember.js +++ b/jsowell-ui/src/api/adapayMember/adapayMember.js @@ -19,7 +19,7 @@ export function selectAdapayMember(data) { // 营收报表 export function getMerchantOrderReport(data) { return request({ - url: '/pile/report/getMerchantOrderReport', + url: '/order/report/getMerchantOrderReport', method: 'post', data: data }) @@ -72,4 +72,4 @@ export function withdraw(data) { method: 'post', data: data }) -} \ No newline at end of file +} diff --git a/jsowell-ui/src/views/pile/merchant/index.vue b/jsowell-ui/src/views/pile/merchant/index.vue index dcf8ab24a..4fef60e49 100644 --- a/jsowell-ui/src/views/pile/merchant/index.vue +++ b/jsowell-ui/src/views/pile/merchant/index.vue @@ -256,6 +256,32 @@ + + + + + + + + + + + + + + + +