| @@ -2,6 +2,7 @@ package com.iformall.controller.basic; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| @@ -173,6 +174,7 @@ public class WxShopController extends BaseController { | |||
| wxShopService.exportShop(wxShop, request, response); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("导出未出租店铺") | |||
| @GetMapping("/exportNotRentShop") | |||
| @SystemControllerLog(description = "商铺出租数据-未出租商铺列表-导出") | |||
| @@ -186,6 +188,7 @@ public class WxShopController extends BaseController { | |||
| wxShopService.exportNotRentShop(wxShop, request, response); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("未出租商铺分页列表接口") | |||
| @GetMapping("notRentShopList") | |||
| @ApiImplicitParams({ | |||
| @@ -1,6 +1,7 @@ | |||
| package com.iformall.controller.datatower; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| @@ -27,6 +28,7 @@ public class DataTowerController extends BaseController { | |||
| @Autowired | |||
| private DataTowerService dataTowerService; | |||
| @TenantIgnore | |||
| @ApiOperation("查询运营") | |||
| @GetMapping("/queryRunningPotal") | |||
| @SystemControllerLog(description = "数据塔台-查询运营") | |||
| @@ -36,6 +38,7 @@ public class DataTowerController extends BaseController { | |||
| return new ResultData(data); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询运营") | |||
| @GetMapping("/queryRunningMobile") | |||
| @SystemControllerLog(description = "数据塔台-查询运营") | |||
| @@ -47,19 +50,7 @@ public class DataTowerController extends BaseController { | |||
| return new ResultData(data); | |||
| } | |||
| // @ApiOperation("查询运营") | |||
| // @GetMapping("/queryRunning") | |||
| // @SystemControllerLog(description = "数据塔台-查询运营") | |||
| // public ResultData queryRunning() { | |||
| // logger.debug("[" + getIpAddr() + "] DataTowerController::queryRunning"); | |||
| // | |||
| // Map<String, Object> data = dataTowerService.queryRunning(getTenantInfo()); | |||
| // | |||
| // return new ResultData(data); | |||
| // } | |||
| @TenantIgnore | |||
| @ApiOperation("查询车流") | |||
| @GetMapping("/queryCar") | |||
| @SystemControllerLog(description = "数据塔台-查询车流") | |||
| @@ -71,6 +62,7 @@ public class DataTowerController extends BaseController { | |||
| return new ResultData(data); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询客流") | |||
| @GetMapping("/queryCustomer") | |||
| @SystemControllerLog(description = "数据塔台-查询客流") | |||
| @@ -81,7 +73,8 @@ public class DataTowerController extends BaseController { | |||
| return new ResultData(data); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("新版本查询客流") | |||
| @GetMapping("/queryCustomerNewVersion") | |||
| @SystemControllerLog(description = "数据塔台-新版本查询客流") | |||
| @@ -93,6 +86,7 @@ public class DataTowerController extends BaseController { | |||
| return new ResultData(data); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询客流") | |||
| @GetMapping("/queryCustomerData") | |||
| @SystemControllerLog(description = "数据塔台-查询客流") | |||
| @@ -102,6 +96,7 @@ public class DataTowerController extends BaseController { | |||
| return dataTowerService.queryCustomerData(getTenantInfo(), params); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("调取客流接口客流") | |||
| @PostMapping("/queryWiWideData") | |||
| @SystemControllerLog(description = "数据塔台-查询客流") | |||
| @@ -116,6 +111,7 @@ public class DataTowerController extends BaseController { | |||
| return dataTowerService.queryWiWideDataUrl(getTenantInfo(),requrl,params); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("调取图片") | |||
| @GetMapping("/getWiWidePic") | |||
| @SystemControllerLog(description = "数据塔台-获取图片") | |||
| @@ -131,21 +127,9 @@ public class DataTowerController extends BaseController { | |||
| return new ResultData(wiWidePic); | |||
| // try { | |||
| // ServletOutputStream sos = response.getOutputStream(); | |||
| // sos.write(wiWidePic, 0, wiWidePic.length); | |||
| // sos.close(); | |||
| // | |||
| // response.setHeader("Pragma", "no-cache"); | |||
| // response.setHeader("Cache-Control", "no-cache"); | |||
| // response.setDateHeader("Expires", 0); | |||
| // response.setContentType("image/jpeg, image/jpg, image/png, image/gif"); | |||
| // } catch (IOException e) { | |||
| // e.printStackTrace(); | |||
| // } | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询出租率") | |||
| @GetMapping("/queryOccupancyRate") | |||
| @SystemControllerLog(description = "数据塔台-查询出租率") | |||
| @@ -155,6 +139,7 @@ public class DataTowerController extends BaseController { | |||
| return new ResultData(data); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询租金收缴率") | |||
| @GetMapping("/queryRentCollectionRate") | |||
| @SystemControllerLog(description = "数据塔台-查询出租率") | |||
| @@ -164,6 +149,7 @@ public class DataTowerController extends BaseController { | |||
| return new ResultData(data); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询报单率") | |||
| @GetMapping("/queryDeclarationRate") | |||
| @SystemControllerLog(description = "数据塔台-查询报单率") | |||
| @@ -1,6 +1,7 @@ | |||
| package com.iformall.controller.datatower; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| @@ -33,6 +34,7 @@ public class WxChartDataController extends BaseController { | |||
| @Autowired | |||
| private WxChartDataService wxChartDataService; | |||
| @TenantIgnore | |||
| @ApiOperation( | |||
| "chart=45 卡营销数据:" + | |||
| "saleHistory销售金额历史 paymentHistory核销历史 saleCardCount售出卡数量 tranCount转增数量 subsidyCount补贴金额"+ | |||
| @@ -85,6 +87,7 @@ public class WxChartDataController extends BaseController { | |||
| return data; | |||
| } | |||
| @TenantIgnore | |||
| @GetMapping("queryWeekCount") | |||
| @ApiOperation("查询用户增长 总数,今日,近一周") | |||
| @SystemControllerLog(description = "会员首页-报表数据-查询用户增长") | |||
| @@ -97,6 +100,7 @@ public class WxChartDataController extends BaseController { | |||
| return wxChartDataService.queryWeekCount(enumChartType,getTenantInfo()); | |||
| } | |||
| @TenantIgnore | |||
| @GetMapping("queryMonthVos") | |||
| @ApiOperation("查询用户增长 总数,今日,近一周") | |||
| @SystemControllerLog(description = "会员首页-报表数据-查询用户增长") | |||
| @@ -2,6 +2,7 @@ package com.iformall.controller.datatower; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.annotation.UserDataRuleAnnotation; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.ResultData; | |||
| @@ -32,6 +33,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| private WxMerchantTradeDailyService wxMerchantTradeDailyService; | |||
| @TenantIgnore | |||
| @UserDataRuleAnnotation("merchant_trade") | |||
| @ApiOperation("获得解单列表") | |||
| @GetMapping("/list") | |||
| @@ -52,6 +54,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| return new ResultData(page); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("数据汇总") | |||
| @GetMapping("/summary") | |||
| @SystemControllerLog(description = "商户解单-数据汇总") | |||
| @@ -61,6 +64,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("获商户得近30日解单") | |||
| @GetMapping("/detail") | |||
| @SystemControllerLog(description = "商户-获商户得近30日解单detail") | |||
| @@ -69,6 +73,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| return wxMerchantTradeDailyService.getVolumeOfMonth(merchantId); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("获得商场近30日解单") | |||
| @GetMapping("/listMonth") | |||
| @SystemControllerLog(description = "商户-获得商场近30日解单") | |||
| @@ -77,6 +82,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| return wxMerchantTradeDailyService.getVolumeTotalOfMonth(getTenantInfo()); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("更新解单数据") | |||
| @PostMapping("/update") | |||
| @SystemControllerLog(description = "商户-更新解单数据") | |||
| @@ -94,6 +100,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| return wxMerchantTradeDailyService.update(wxMerchantTradeDaily); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询解单数据") | |||
| @GetMapping("/queryTradeDaily") | |||
| @SystemControllerLog(description = "商户-查询解单数据") | |||
| @@ -103,6 +110,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily); | |||
| } | |||
| @TenantIgnore | |||
| @UserDataRuleAnnotation("merchant_trade") | |||
| @GetMapping("exportData") | |||
| @SystemControllerLog(description = "商户解单数据-导出数据") | |||
| @@ -1,6 +1,7 @@ | |||
| package com.iformall.controller.datatower; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.domain.dto.WxCUserBasicInfoDto; | |||
| @@ -36,6 +37,7 @@ public class WxUserStatisticsController extends BaseController { | |||
| @Autowired | |||
| private WxMallService wxMallService; | |||
| @TenantIgnore | |||
| @ApiOperation("查询微信用户数量") | |||
| @GetMapping("/findWxUserCount") | |||
| @SystemControllerLog(description = "查询微信用户数量") | |||
| @@ -85,6 +87,7 @@ public class WxUserStatisticsController extends BaseController { | |||
| return new ResultData(map); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询微信用户趋势") | |||
| @GetMapping("/findWxUserTrend") | |||
| @SystemControllerLog(description = "查询微信用户趋势") | |||
| @@ -171,6 +174,7 @@ public class WxUserStatisticsController extends BaseController { | |||
| return new ResultData(wxCountList); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询会员数量") | |||
| @GetMapping("/findBasicUserCount") | |||
| @SystemControllerLog(description = "查询会员数量") | |||
| @@ -219,6 +223,7 @@ public class WxUserStatisticsController extends BaseController { | |||
| return new ResultData(map); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询会员趋势") | |||
| @GetMapping("/findBasicUserTrend") | |||
| @SystemControllerLog(description = "查询会员趋势") | |||
| @@ -2,6 +2,7 @@ package com.iformall.controller.datatower; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| @@ -60,6 +61,7 @@ public class WxUserStructureController extends BaseController { | |||
| /***************************会员结构*****************************/ | |||
| @TenantIgnore | |||
| @ApiOperation("查询会员性别结构") | |||
| @GetMapping("/findUserSexStructure") | |||
| @SystemControllerLog(description = "会员管理-查询会员性别结构") | |||
| @@ -85,6 +87,7 @@ public class WxUserStructureController extends BaseController { | |||
| return new ResultData(vos); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询会员年龄结构") | |||
| @GetMapping("/findUserAgeStructure") | |||
| @SystemControllerLog(description = "会员管理-查询会员年龄结构") | |||
| @@ -110,6 +113,7 @@ public class WxUserStructureController extends BaseController { | |||
| return new ResultData(vos); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询会员成长值结构") | |||
| @GetMapping("/findUserLevelStructure") | |||
| @SystemControllerLog(description = "会员管理-查询会员成长值结构") | |||
| @@ -155,6 +159,7 @@ public class WxUserStructureController extends BaseController { | |||
| return new ResultData(levelList); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询会员绑车牌结构") | |||
| @GetMapping("/findUserCarStructure") | |||
| @SystemControllerLog(description = "会员管理-查询会员绑车牌结构") | |||
| @@ -199,7 +204,7 @@ public class WxUserStructureController extends BaseController { | |||
| return new ResultData(list); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询会员手机品牌结构") | |||
| @GetMapping("/findUserPhoneBandStructure") | |||
| @SystemControllerLog(description = "会员管理-查询会员手机品牌结构") | |||
| @@ -237,7 +242,7 @@ public class WxUserStructureController extends BaseController { | |||
| return new ResultData(tagList); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询会员活跃结构") | |||
| @GetMapping("/findUserActivityStructure") | |||
| @SystemControllerLog(description = "会员管理-查询会员活跃结构") | |||
| @@ -300,6 +305,7 @@ public class WxUserStructureController extends BaseController { | |||
| return result; | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询会员数量") | |||
| @GetMapping("/findUserDataCount") | |||
| @SystemControllerLog(description = "会员管理-查询会员数量") | |||
| @@ -459,7 +465,7 @@ public class WxUserStructureController extends BaseController { | |||
| return new ResultData(map); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("拓客分析") | |||
| @GetMapping("/findUserByChannel") | |||
| @ApiImplicitParams({ | |||
| @@ -501,6 +507,7 @@ public class WxUserStructureController extends BaseController { | |||
| return new ResultData(page); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("获取用户所有渠道") | |||
| @GetMapping("/findUserStructureByChannel") | |||
| @SystemControllerLog(description = "会员管理-获取用户所有渠道") | |||
| @@ -550,7 +557,7 @@ public class WxUserStructureController extends BaseController { | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("获取用户所有渠道") | |||
| @GetMapping("/findAllUserChannel") | |||
| @SystemControllerLog(description = "会员管理-获取用户所有渠道") | |||
| @@ -600,6 +607,7 @@ public class WxUserStructureController extends BaseController { | |||
| } | |||
| // 成长值扣除 | |||
| @TenantIgnore | |||
| @ApiOperation(value = "用户成长值扣减", notes = "{\"userId\":\"Long\", \"reason\":\"String\", \"score\":\"Integer\"}") | |||
| @PostMapping("/scoreReduce") | |||
| @SystemControllerLog(description = "会员管理-用户成长值扣减") | |||
| @@ -1,6 +1,7 @@ | |||
| package com.iformall.controller.market; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.domain.dto.MarkingCouponDataReportDto; | |||
| @@ -38,6 +39,7 @@ public class MarkingDataReportController extends BaseController { | |||
| @Autowired | |||
| private WxMallService wxMallService; | |||
| @TenantIgnore | |||
| @ApiOperation("查询券数据") | |||
| @GetMapping("/couponData") | |||
| @SystemControllerLog(description = "券数据-查询券数据") | |||
| @@ -46,6 +48,7 @@ public class MarkingDataReportController extends BaseController { | |||
| return new ResultData(markingDataReportService.getCouponData(getTenantInfo())); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询券数据列表") | |||
| @GetMapping("/couponDataList") | |||
| @SystemControllerLog(description = "券数据-查询券数据列表") | |||
| @@ -57,6 +60,7 @@ public class MarkingDataReportController extends BaseController { | |||
| return new ResultData(markingDataReportService.getCouponDataList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize)); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询场景投放券数据") | |||
| @GetMapping("/sceneData") | |||
| @SystemControllerLog(description = "券数据-查询场景投放券数据") | |||
| @@ -65,6 +69,7 @@ public class MarkingDataReportController extends BaseController { | |||
| return new ResultData(markingDataReportService.getSceneData(getTenantInfo())); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询场景营销数据列表") | |||
| @GetMapping("/sceneDataList") | |||
| @SystemControllerLog(description = "券数据-查询场景营销数据列表") | |||
| @@ -76,6 +81,7 @@ public class MarkingDataReportController extends BaseController { | |||
| return new ResultData(markingDataReportService.getSceneDataList(getTenantInfo(), markingCouponDataReportDto, pageNum, pageSize)); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询触达用户数数据") | |||
| @GetMapping("/touchUsersData") | |||
| @SystemControllerLog(description = "券数据-查询触达用户数数据") | |||
| @@ -84,6 +90,7 @@ public class MarkingDataReportController extends BaseController { | |||
| return new ResultData(markingDataReportService.getTouchUsersReportData(getTenantInfo())); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询触达用户数数据列表") | |||
| @GetMapping("/touchUsersDataList") | |||
| @SystemControllerLog(description = "券数据-查询触达用户数数据列表") | |||
| @@ -100,6 +107,7 @@ public class MarkingDataReportController extends BaseController { | |||
| return new ResultData(markingDataReportService.getTouchUsersReportList(markingCouponDataReportDto, pageNum, pageSize)); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("触达用户数数据导出") | |||
| @GetMapping("/exportTouchUsersData") | |||
| @SystemControllerLog(description = "券数据-触达用户数数据导出") | |||
| @@ -2,6 +2,7 @@ package com.iformall.controller.market; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| @@ -356,7 +357,7 @@ public class WxCouponController extends BaseController { | |||
| return new ResultData(wxCouponService.getVoById(id,getTenantInfo().getTenantId())); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("卡营销列表接口") | |||
| @GetMapping("findCardCountList") | |||
| @ApiImplicitParams({ | |||
| @@ -408,6 +409,7 @@ public class WxCouponController extends BaseController { | |||
| wxCouponService.exportCardData(wxCoupon,tenantEntitys, request, response); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("券营销列表接口") | |||
| @GetMapping("findCouponCountList") | |||
| @ApiImplicitParams({ | |||
| @@ -458,6 +460,7 @@ public class WxCouponController extends BaseController { | |||
| wxCouponService.exportCouponData(wxCoupon,tenantEntitys, request, response); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("砍价营销列表接口") | |||
| @GetMapping("findPressCountList") | |||
| @ApiImplicitParams({ | |||
| @@ -2,6 +2,7 @@ package com.iformall.controller.market; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.domain.dto.WxOrderReportDto; | |||
| @@ -28,6 +29,7 @@ public class WxMerchantMicroPayController extends BaseController { | |||
| @Autowired | |||
| private MarkingDataReportService markingDataReportService; | |||
| @TenantIgnore | |||
| @ApiOperation("获得商场近30日刷卡") | |||
| @GetMapping("/listMonth") | |||
| @SystemControllerLog(description = "收银台-近30日刷卡列表") | |||
| @@ -41,7 +43,7 @@ public class WxMerchantMicroPayController extends BaseController { | |||
| return new ResultData(markingDataReportService.listOrderReportByDate(wxOrderReportDto)); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("获商户得近30日刷卡") | |||
| @GetMapping("/detail") | |||
| @SystemControllerLog(description = "收银台-近30日刷卡列表详情") | |||
| @@ -54,6 +56,7 @@ public class WxMerchantMicroPayController extends BaseController { | |||
| return new ResultData(markingDataReportService.listMicroPayOrderReportByDateAndMerchant(wxOrderReportDto)); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("获得昨日刷卡列表") | |||
| @GetMapping("/listYesterday") | |||
| @SystemControllerLog(description = "收银台-获得昨日刷卡列表") | |||
| @@ -2,6 +2,7 @@ package com.iformall.controller.market; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.domain.po.base.TenantEntity; | |||
| @@ -36,6 +37,7 @@ public class WxOrderGroupController extends BaseController { | |||
| @Autowired | |||
| WxMallService wxMallService; | |||
| @TenantIgnore | |||
| @ApiOperation(value = "拼团营销分析") | |||
| @GetMapping("queryOrderGroupMarketingList") | |||
| @ApiImplicitParams({ | |||
| @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; | |||
| import com.alibaba.fastjson.JSONObject; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| @@ -174,6 +175,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| info.setLesCredit(wxCreditHistoryService.getLesCreditSummary(wxCreditHistory)); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("分页列表接口") | |||
| @GetMapping("list") | |||
| @ApiImplicitParams({ | |||
| @@ -218,6 +220,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return wxCUserBasicInfoService.countUser(baseInfoQ); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("根据id更新接口") | |||
| @PostMapping("update") | |||
| @SystemControllerLog(description = "会员管理-更新") | |||
| @@ -269,6 +272,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| // return new ResultData(Result.SUCCESS, "删除成功", null); | |||
| // } | |||
| @TenantIgnore | |||
| @ApiOperation("根据id查询接口") | |||
| @GetMapping("/findById") | |||
| @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | |||
| @@ -286,6 +290,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return new ResultData(info); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("根据userId查询交易记录接口") | |||
| @GetMapping("/findOrderCouponByUserId") | |||
| @ApiImplicitParam(name = "userId", value = "userId", dataType = "Long", paramType = "query", required = true) | |||
| @@ -322,6 +327,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return new ResultData(Result.SUCCESS, "查询成功", page); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("导出根据userId查询交易记录接口") | |||
| @GetMapping("/exportOrderCouponByUserId") | |||
| @ApiImplicitParam(name = "userId", value = "userId", dataType = "Long", paramType = "query", required = true) | |||
| @@ -357,6 +363,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| //} | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("会员记录导出总数") | |||
| @GetMapping("/exportDataCount") | |||
| @SystemControllerLog(description = "会员管理-会员记录导出总数") | |||
| @@ -381,6 +388,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("会员记录导出") | |||
| @GetMapping("/exportData") | |||
| @SystemControllerLog(description = "会员管理-会员记录导出") | |||
| @@ -402,6 +410,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| wxCUserBasicInfoService.exportData(basicInfo, request, response); | |||
| } | |||
| @TenantIgnore | |||
| @RequestMapping("/exportTemplate") | |||
| @SystemControllerLog(description = "会员管理-导出模板") | |||
| public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { | |||
| @@ -421,6 +430,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| } | |||
| } | |||
| @TenantIgnore | |||
| @PostMapping(value = "/importTemplate", consumes = "multipart/*") | |||
| @SystemControllerLog(description = "会员管理-导入数据") | |||
| public ResultData importTemplate(@RequestParam("file") MultipartFile mFile) { | |||
| @@ -504,7 +514,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return new ResultData(Result.SUCCESS, "模板正在导入"); | |||
| } | |||
| @TenantIgnore | |||
| @GetMapping("/queryTemplateCount") | |||
| @SystemControllerLog(description = "会员管理-导入数据查询") | |||
| public ResultData queryTemplateCount() { | |||
| @@ -541,6 +551,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return new ResultData(Result.SUCCESS, "查询成功", entries); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("进出场车辆分页列表接口") | |||
| @GetMapping("carPayList") | |||
| @ApiImplicitParams({ | |||
| @@ -556,6 +567,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return new ResultData(wxCarPayRecordService.findCarPayListByPage(record,pageNum,pageSize)); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("停车会员记录导出") | |||
| @GetMapping("/exportCarPayData") | |||
| @ApiImplicitParams({ | |||
| @@ -571,6 +583,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("根据手机号查询接口") | |||
| @GetMapping("/findByPhone") | |||
| @ApiImplicitParam(name = "phone", value = "phone", dataType = "String", paramType = "query", required = true) | |||
| @@ -588,6 +601,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return new ResultData(wxCUserBasicInfo); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("获取会员过滤器") | |||
| @GetMapping("/listFilter") | |||
| @SystemControllerLog(description = "会员管理-获取会员过滤器") | |||
| @@ -596,7 +610,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return new ResultData(wxCUserBasicInfoService.listFilters(getTenantInfo())); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("会员过滤器获取数量") | |||
| @PostMapping("/countByFilter") | |||
| @SystemControllerLog(description = "会员管理-会员过滤器获取数量") | |||
| @@ -605,6 +619,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return new ResultData(wxCUserBasicInfoService.countByFilter(getTenantInfo(),filterList)); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("获取会员过滤器") | |||
| @PostMapping("/listByFilter") | |||
| @SystemControllerLog(description = "会员管理-会员过滤器获取") | |||
| @@ -613,6 +628,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return new ResultData(wxCUserBasicInfoService.listByFilter(getTenantInfo(),filterList)); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("根据ID锁定") | |||
| @PostMapping("/updateStatus") | |||
| @SystemControllerLog(description = "会员管理-根据ID锁定") | |||
| @@ -627,6 +643,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||
| return wxCUserBasicInfoService.updateStatus(wxCUserBasicInfo); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("根据手机号迁移") | |||
| @PostMapping("/cuserOldToNew") | |||
| @SystemControllerLog(description = "会员管理-迁移数据") | |||
| @@ -2,6 +2,7 @@ package com.iformall.controller.mem; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.common.Result; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.controller.base.BaseController; | |||
| @@ -23,6 +24,7 @@ public class WxCUserCarController extends BaseController { | |||
| @Autowired | |||
| private WxCUserCarService wxCUserCarService; | |||
| @TenantIgnore | |||
| @ApiOperation("分页列表接口") | |||
| @GetMapping("list") | |||
| @ApiImplicitParams({ | |||
| @@ -11,6 +11,7 @@ import java.util.List; | |||
| import java.util.Map; | |||
| import com.iformall.annotation.SystemControllerLog; | |||
| import com.iformall.annotation.TenantIgnore; | |||
| import com.iformall.controller.base.BaseController; | |||
| import com.iformall.domain.dto.MarkingCouponDataReportDto; | |||
| import com.iformall.domain.po.WxCouponOrder; | |||
| @@ -53,6 +54,7 @@ public class WxCUserDataController extends BaseController { | |||
| @Autowired | |||
| private WxMallService wxMallService; | |||
| @TenantIgnore | |||
| @GetMapping("findUserCountData") | |||
| @ApiOperation("查询用户数量接口") | |||
| @SystemControllerLog(description = "会员首页-报表数据-查询用户数量接口") | |||
| @@ -132,6 +134,7 @@ public class WxCUserDataController extends BaseController { | |||
| return new ResultData(map); | |||
| } | |||
| @TenantIgnore | |||
| @GetMapping("findUserAddCount") | |||
| @ApiOperation("查询用户增长 总数,今日,近一周") | |||
| @SystemControllerLog(description = "会员首页-报表数据-查询用户增长") | |||
| @@ -161,6 +164,7 @@ public class WxCUserDataController extends BaseController { | |||
| return new ResultData(map); | |||
| } | |||
| @TenantIgnore | |||
| @GetMapping("findBasicUserAddCount") | |||
| @ApiOperation("查询会员增长 总数,今日,近一周") | |||
| @SystemControllerLog(description = "会员首页-报表数据-查询会员增长") | |||
| @@ -187,6 +191,7 @@ public class WxCUserDataController extends BaseController { | |||
| return new ResultData(map); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询用户活跃量") | |||
| @GetMapping("findUserVisitData") | |||
| @SystemControllerLog(description = "会员首页-报表数据-查询用户活跃量") | |||
| @@ -283,6 +288,7 @@ public class WxCUserDataController extends BaseController { | |||
| return new ResultData(mapVo); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询微信用户活跃数量 昨日活跃,近一周活跃,近一月活跃") | |||
| @GetMapping("findUserVisitCount") | |||
| @SystemControllerLog(description = "会员首页-报表数据-查询微信用户活跃数量") | |||
| @@ -315,6 +321,7 @@ public class WxCUserDataController extends BaseController { | |||
| return new ResultData(mapVo); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询用户消费金额") | |||
| @GetMapping("findUserAmountData") | |||
| @SystemControllerLog(description = "会员首页-报表数据-查询用户消费金额") | |||
| @@ -396,6 +403,7 @@ public class WxCUserDataController extends BaseController { | |||
| return new ResultData(map); | |||
| } | |||
| @TenantIgnore | |||
| @ApiOperation("查询用户消费金额 今日,周,月") | |||
| @GetMapping("findUserConsumeAmount") | |||
| @SystemControllerLog(description = "会员首页-报表数据-查询用户消费金额") | |||
| @@ -105,6 +105,9 @@ public class MallRoleController extends BaseController { | |||
| public ResultData saveOrUpdate(@RequestBody MallRole sysRole) { | |||
| logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate"); | |||
| MallUserInfo currentUser = getUser(); | |||
| if(!getTenantInfo().getTenantId().equals(currentUser.getTenantId())){ | |||
| return new ResultData(ErrorCode.USER_NO_PERMISSION); | |||
| } | |||
| if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { | |||
| return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能保存角色"); | |||
| } | |||
| @@ -135,6 +138,9 @@ public class MallRoleController extends BaseController { | |||
| if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { | |||
| return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能删除角色"); | |||
| } | |||
| if(!getTenantInfo().getTenantId().equals(currentUser.getTenantId())){ | |||
| return new ResultData(ErrorCode.USER_NO_PERMISSION); | |||
| } | |||
| MallUserRole record = new MallUserRole(); | |||
| record.setRoleId(sysRole.getId()); | |||
| int count = mallUserRoleService.cntUserList(record); | |||
| @@ -121,6 +121,10 @@ public class MallUserInfoController extends BaseController { | |||
| return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能添加用户"); | |||
| } | |||
| if(!getTenantInfo().getTenantId().equals(currentUser.getTenantId())){ | |||
| return new ResultData(ErrorCode.USER_NO_PERMISSION); | |||
| } | |||
| if(checkUniqueName(userInfo.getUsername()) > 0){ | |||
| return new ResultData(ErrorCode.USER_NAME_IS_FOUND.getCode(),"用户名已存在"); | |||
| } | |||
| @@ -156,6 +160,9 @@ public class MallUserInfoController extends BaseController { | |||
| currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode()))) { | |||
| return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "系统管理员和自己才能修改信息"); | |||
| } | |||
| if(!getTenantInfo().getTenantId().equals(currentUser.getTenantId())){ | |||
| return new ResultData(ErrorCode.USER_NO_PERMISSION); | |||
| } | |||
| MallUserInfo oldUser = userInfoService.getById(userInfo.getId()); | |||
| if (!oldUser.getUsername().equals(userInfo.getUsername())) { | |||
| if(checkUniqueName(userInfo.getUsername()) > 0){ | |||
| @@ -228,6 +235,9 @@ public class MallUserInfoController extends BaseController { | |||
| if (currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { | |||
| return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能删除用户"); | |||
| } | |||
| if(!getTenantInfo().getTenantId().equals(currentUser.getTenantId())){ | |||
| return new ResultData(ErrorCode.USER_NO_PERMISSION); | |||
| } | |||
| if (currentUser.getId().equals(userInfo.getId())) { | |||
| return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "用户不能删除自己"); | |||
| } | |||
| @@ -244,6 +254,11 @@ public class MallUserInfoController extends BaseController { | |||
| logger.debug("[" + getIpAddr() + "] MallUserInfoController::modifyStatus"); | |||
| MallUserInfo currentUser = getUser(); | |||
| if (currentUser.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { | |||
| if(!getTenantInfo().getTenantId().equals(currentUser.getTenantId())){ | |||
| return new ResultData(ErrorCode.USER_NO_PERMISSION); | |||
| } | |||
| MallUserInfo userInfo1 = userInfoService.getById(userInfo.getId()); | |||
| if(userInfo1 == null) { | |||
| logger.error(ErrorCode.USER_IS_EMPTY.getMessage()); | |||
| @@ -1,6 +1,10 @@ | |||
| ALTER TABLE `mallink`.`wx_appinfo` | |||
| ADD COLUMN `sort_url` varchar(255) COMMENT '小程序链接' AFTER `plat`; | |||
| ALTER TABLE `mallink`.`wx_appinfo` | |||
| ADD COLUMN `business_license` varchar(255) COMMENT '主体营业执照' AFTER `sort_url`, | |||
| ADD COLUMN `icp` varchar(255) COMMENT '主体ICP证' AFTER `business_license`; | |||
| INSERT INTO `mallink`.`wx_msg_validationcode_model`(`id`, `tenant_id`, `parent_tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`, `open`, `msg_type`, `role_type`, `model_code`) VALUES (666429058236550321, '1028', NULL, 33, '抖音退款通知', '富茂', '您购买的[${name}]已发起全部退款申请,预计1-3个自然日商家处理完成,请耐心等待。', '2022-03-28 17:57:59', 1, 0, NULL, NULL, 0, 1, 0, 'SMS_236550321'); | |||
| @@ -49,6 +49,11 @@ public class WxAppinfo extends BaseTenantEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value="小程序链接",name="sortUrl") | |||
| private String sortUrl; | |||
| @io.swagger.annotations.ApiModelProperty(value="主体营业执照",name="businessLicense") | |||
| private String businessLicense; | |||
| @io.swagger.annotations.ApiModelProperty(value="主体ICP证",name="icp") | |||
| private String icp; | |||
| public WxAppinfo(){} | |||
| public WxAppinfo(Integer mouldType){ | |||
| this.mouldType = mouldType; | |||
| @@ -238,12 +238,16 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { | |||
| } | |||
| public void undateFinalTenantId(TenantEntity tenantEntity){ | |||
| setTenantId(tenantEntity.getTenantId()); | |||
| setParentTenantId(tenantEntity.getParentTenantId()); | |||
| // setTenantId(tenantEntity.getTenantId()); | |||
| // setParentTenantId(tenantEntity.getParentTenantId()); | |||
| setFinalTenantId(tenantEntity.getTenantId()); | |||
| if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ | |||
| setFinalTenantId(tenantEntity.getParentTenantId()); | |||
| } | |||
| if(!tenantEntity.getTenantId().equals(getFinalTenantId())){ | |||
| setTenantId(tenantEntity.getTenantId()); | |||
| } | |||
| } | |||
| } | |||
| @@ -20,15 +20,18 @@ | |||
| <result column="pay_bill_id" jdbcType="BIGINT" property="payBillId"/> | |||
| <result column="enable" jdbcType="INTEGER" property="enable"/> | |||
| <result column="plat" jdbcType="INTEGER" property="plat"/> | |||
| <result column="sort_url" jdbcType="INTEGER" property="sortUrl"/> | |||
| <result column="sort_url" jdbcType="VARCHAR" property="sortUrl"/> | |||
| <!-- <result column="group_support" jdbcType="INTEGER" property="groupSupport"/>--> | |||
| <result column="business_license" jdbcType="VARCHAR" property="businessLicense"/> | |||
| <result column="icp" jdbcType="VARCHAR" property="icp"/> | |||
| </resultMap> | |||
| <sql id="allColumns"> | |||
| `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`, | |||
| `secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`, | |||
| `pay_id`,`type`,`mould_type`,`pay_bill_id`,`enable`,`plat`,`sort_url` | |||
| `pay_id`,`type`,`mould_type`,`pay_bill_id`,`enable`,`plat`,`sort_url`,`business_license`,`icp` | |||
| </sql> | |||
| <sql id="dynamicWhereConditions"> | |||