Просмотр исходного кода

[controller][修改]:按照功能分类,分别放到不同的路径下

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
7af3e6bfec
95 измененных файлов: 282 добавлений и 221 удалений
  1. +13
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  3. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
  4. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxGroupController.java
  5. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java
  6. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java
  7. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallFloorController.java
  8. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java
  9. +3
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  10. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java
  11. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProfitSharingReceiverController.java
  12. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
  13. +2
    -11
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java
  14. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java
  15. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/callback/WxPayBillController.java
  16. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/callback/WxPayController.java
  17. +10
    -12
      mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java
  18. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java
  19. +2
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  20. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  21. +2
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java
  22. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java
  23. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  24. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java
  25. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java
  26. +2
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java
  27. +2
    -8
      mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java
  28. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java
  29. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java
  30. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java
  31. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java
  32. +2
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java
  33. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxChannelController.java
  34. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java
  35. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java
  36. +2
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  37. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  38. +2
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java
  39. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java
  40. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java
  41. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java
  42. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSpreadController.java
  43. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponTypeController.java
  44. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java
  45. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java
  46. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java
  47. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java
  48. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java
  49. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java
  50. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayAccountController.java
  51. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java
  52. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java
  53. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java
  54. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java
  55. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java
  56. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java
  57. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java
  58. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java
  59. +2
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  60. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java
  61. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java
  62. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java
  63. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java
  64. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  65. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java
  66. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java
  67. +2
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java
  68. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java
  69. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java
  70. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java
  71. +2
    -18
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java
  72. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java
  73. +2
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java
  74. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java
  75. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java
  76. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java
  77. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/official/WxMallApplyController.java
  78. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java
  79. +2
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  80. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  81. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java
  82. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java
  83. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java
  84. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java
  85. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java
  86. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java
  87. +4
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
  88. +14
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java
  89. +14
    -18
      mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java
  90. +51
    -17
      mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java
  91. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java
  92. +2
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
  93. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java
  94. +2
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java
  95. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java

mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java → mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java Просмотреть файл

@@ -1,4 +1,4 @@
package com.iformall.controller;
package com.iformall.controller.app;

import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
@@ -6,8 +6,12 @@ import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxAppinfo;
<<<<<<< HEAD:mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java
import com.iformall.exception.MallinkException;
=======
>>>>>>> [controller][修改]:按照功能分类,分别放到不同的路径下:mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
import com.iformall.service.WxAppinfoService;
import com.iformall.service.wechat.FmOpenService;
import com.iformall.utils.Constant;
@@ -18,6 +22,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +50,7 @@ public class WxAppinfoController extends BaseController {
@Autowired
private FmOpenService openService;

<<<<<<< HEAD:mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java
@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@@ -95,6 +101,12 @@ public class WxAppinfoController extends BaseController {
@ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}")
@PostMapping("/downQrCode")
public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, Object> params) throws MallinkException {
=======
@ApiOperation(value = "下载二维码", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}")
@PostMapping("/downQrCode")
@RequiresPermissions("app:qr:download")
public ResultData downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, Object> params) {
>>>>>>> [controller][修改]:按照功能分类,分别放到不同的路径下:mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
logger.debug("[" + getIpAddr() + "] WxAppinfoController::downQrCode");
String name = (String) params.get("name");
String pageUrl = (String) params.get("pageUrl");

mallinkAdmin/src/main/java/com/iformall/controller/BaseController.java → mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java Просмотреть файл

@@ -1,4 +1,4 @@
package com.iformall.controller;
package com.iformall.controller.base;

import java.beans.PropertyEditorSupport;
import java.text.ParseException;

mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBrand;
import com.iformall.service.WxBrandService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxGroupController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxGroupController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxGroup;
import com.iformall.service.WxGroupService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMallBuildingController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMallBuilding;
import com.iformall.service.WxMallBuildingService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMall;
import com.iformall.service.WxMallService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMallFloorController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallFloorController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.controller.base.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.service.WxMerchantBUserService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Просмотреть файл

@@ -1,20 +1,17 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxLevelConfig;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxProfitSharingReceiver;
import com.iformall.domain.vo.WxMerchantSimpleVo;
import com.iformall.domain.vo.WxMerchantVo;
import com.iformall.service.WxMerchantService;
import com.iformall.service.WxProfitSharingReceiverService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.beanutils.BeanUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -102,7 +99,7 @@ public class WxMerchantController extends BaseController {
public ResultData addMerchant(@RequestBody WxMerchant wxMerchant) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::addMerchant");
wxMerchant.setTenantId(getTenantId());
return wxMerchantService.addMerchant(wxMerchant, getUser().getId());
return wxMerchantService.addMerchant(wxMerchant, getUserId());
}

@ApiOperation("更新商户接口")

mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantShopController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMerchantShop;
import com.iformall.domain.po.WxShop;
import com.iformall.service.WxMerchantShopService;

mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingReceiverController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProfitSharingReceiverController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxProfitSharingReceiver;
import com.iformall.service.WxMerchantService;

mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxShop;
import com.iformall.service.WxShopService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java → mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java Просмотреть файл

@@ -1,16 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.basic;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.domain.po.WxTagsGroup;
import com.iformall.domain.po.WxTagsType;
import com.iformall.domain.vo.WxTagsGroupVo;
import com.iformall.domain.vo.WxTagsTypeVo;
import com.iformall.service.WxTagsGroupService;
import com.iformall.service.WxTagsTypeService;
import com.iformall.controller.base.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,10 +11,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import com.github.pagehelper.PageInfo;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxTags;
import com.iformall.service.WxCUserTagsService;
import com.iformall.service.WxTagsService;


mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java → mallinkAdmin/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.callback;

import com.alibaba.fastjson.JSON;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumCarCmd;
import com.iformall.enums.EnumCarVendor;

mallinkAdmin/src/main/java/com/iformall/controller/WxPayBillController.java → mallinkAdmin/src/main/java/com/iformall/controller/callback/WxPayBillController.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.controller;
package com.iformall.controller.callback;

import com.iformall.controller.base.BaseController;
import com.iformall.enums.EnumPayWay;
import com.iformall.exception.BizMessageException;
import com.iformall.exception.MallinkException;

mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java → mallinkAdmin/src/main/java/com/iformall/controller/callback/WxPayController.java Просмотреть файл

@@ -1,5 +1,6 @@
package com.iformall.controller;
package com.iformall.controller.callback;

import com.iformall.controller.base.BaseController;
import com.iformall.enums.EnumPayWay;
import com.iformall.exception.BizMessageException;
import com.iformall.exception.MallinkException;

mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java → mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java Просмотреть файл

@@ -1,10 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.car;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxCouponCar;
import com.iformall.domain.po.WxMerchant;
@@ -56,9 +57,9 @@ public class WxCarController extends BaseController {
@Autowired
WxCouponCarService wxCouponCarService;

private WxPark getCurrentPark(MallUserInfo user) {
private WxPark getCurrentPark() {
WxPark parkQ = new WxPark();
parkQ.setTenantId(user.getTenantId());
parkQ.setTenantId(getTenantId());
WxPark wxPark = wxParkService.getByObj(parkQ);
// 1, get mall's park
// future use redis to optimize
@@ -70,9 +71,8 @@ public class WxCarController extends BaseController {
@SystemControllerLog(description = "车-获取车场支持的厂家")
public ResultData getVendor() {
logger.debug("[" + getIpAddr() + "] WxCarController::getVendor");
MallUserInfo user = getUser();
// 1, get mall's park
WxPark park = getCurrentPark(user);
WxPark park = getCurrentPark();
Map map = new HashMap();
map.put("vendor", park.getVendorType());
return new ResultData(map);
@@ -125,9 +125,8 @@ public class WxCarController extends BaseController {
@SystemControllerLog(description = "车-优免券模板")
public ResultData quanTemplate(String merchantId, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxCarController::quanTemplate");
MallUserInfo user = getUser();
/// 1, get mall's park
WxPark park = getCurrentPark(user);
WxPark park = getCurrentPark();
String params = park.getVendorParams();
JSONObject objParams = JSON.parseObject(params);
String url = objParams.getString("url");
@@ -216,7 +215,7 @@ public class WxCarController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "可用库存已达到停车厂商优免券数量限制");
}
// check End
coupon.setTenantId(user.getTenantId());
coupon.setTenantId(getTenantId());

ResultData resultData = wxCouponService.saveOrUpdate(coupon);
if (resultData.code != ResultData.SUCCESS){
@@ -226,9 +225,9 @@ public class WxCarController extends BaseController {
// Save to wx_coupon_car
WxCouponCar couponCar = new WxCouponCar();
couponCar.setId(coupon.getId());
couponCar.setTenantId(user.getTenantId());
couponCar.setTenantId(getTenantId());

WxPark park = getCurrentPark(user);
WxPark park = getCurrentPark();
couponCar.setParkId(park.getId());
couponCar.setVendorType(park.getVendorType());
couponCar.setVendorParams(coupon.getVendorParams());
@@ -297,9 +296,8 @@ public class WxCarController extends BaseController {
@GetMapping("/getParkStatus")
@SystemControllerLog(description = "车-停车场状态")
public ResultData getParkStatus() {
MallUserInfo user = getUser();
/// 1, get mall's park
WxPark park = getCurrentPark(user);
WxPark park = getCurrentPark();
if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) {
String params = park.getVendorParams();
if(params == null) {

mallinkAdmin/src/main/java/com/iformall/controller/WxParkController.java → mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.car;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxPark;
import com.iformall.service.WxParkService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java → mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Просмотреть файл

@@ -1,17 +1,14 @@
package com.iformall.controller;
package com.iformall.controller.contract;

import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBillProperty;
import com.iformall.domain.po.WxFlowRecord;
import com.iformall.domain.po.WxPropertyContract;
import com.iformall.domain.po.WxRentContract;
import com.iformall.enums.EnumFlowRecordStatus;
import com.iformall.service.WxBillPropertyService;
import com.iformall.service.WxPropertyContractService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java → mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.contract;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxRentContract;

mallinkAdmin/src/main/java/com/iformall/controller/DataTowerController.java → mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java Просмотреть файл

@@ -1,18 +1,16 @@
package com.iformall.controller;
package com.iformall.controller.datatower;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.service.DataTowerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.HashMap;
import java.util.Map;

@Api(description = "数据塔台")

mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java → mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java Просмотреть файл

@@ -1,7 +1,8 @@
package com.iformall.controller;
package com.iformall.controller.datatower;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.service.WxChartDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java → mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.datatower;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.vo.WxMerchantTradeDailyVo;
import com.iformall.service.WxMerchantTradeDailyService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java → mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.datatower;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.UserStructureVo;

mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java → mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java Просмотреть файл

@@ -1,10 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.device;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;

import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxDevice;
import com.iformall.enums.EnumDeviceOnlineStatus;
import com.iformall.enums.EnumDeviceStatus;

mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java → mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java Просмотреть файл

@@ -1,13 +1,12 @@
package com.iformall.controller;
package com.iformall.controller.device;

import com.github.pagehelper.Page;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxDevice;
import com.iformall.domain.po.WxMall;
import com.iformall.domain.po.WxScreenAd;
import com.iformall.enums.EnumScreenAdStatus;
import com.iformall.enums.EnumScreenAdType;

mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java → mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java Просмотреть файл

@@ -1,14 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.device;

import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxCampaign;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxScreenAd;
import com.iformall.enums.EnumScoreType;
import com.iformall.enums.EnumScreenAdStatus;
import com.iformall.enums.EnumScreenAdType;
import com.iformall.service.WxCampaignService;
@@ -23,9 +20,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;

@RestController
@RequestMapping("wxScreenAd")
@Api(description="广告屏")

mallinkAdmin/src/main/java/com/iformall/controller/MarkingDataReportController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java Просмотреть файл

@@ -1,7 +1,8 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.MarkingCouponDataReportDto;
import com.iformall.service.MarkingDataReportService;
import io.swagger.annotations.Api;

mallinkAdmin/src/main/java/com/iformall/controller/PushLimitController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java Просмотреть файл

@@ -1,7 +1,8 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.PushLimit;
import com.iformall.service.PushLimitService;
import io.swagger.annotations.Api;

mallinkAdmin/src/main/java/com/iformall/controller/UeditorController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java Просмотреть файл

@@ -1,4 +1,4 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.iformall.ueditor.ActionEnter;
import org.springframework.beans.factory.annotation.Autowired;

mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java Просмотреть файл

@@ -1,4 +1,4 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -7,6 +7,7 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCampaign;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxCouponChannel;

mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java Просмотреть файл

@@ -1,14 +1,14 @@
package com.iformall.controller;
package com.iformall.controller.market;


import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxCardSpendVo;
import com.iformall.domain.vo.WxCardVo;
import com.iformall.enums.EnumCardSpendStatus;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxCardInfoService;
import com.iformall.service.WxCardSpendService;
@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;


mallinkAdmin/src/main/java/com/iformall/controller/WxChannelController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxChannelController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxChannel;
import com.iformall.service.WxChannelService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponActionLogController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCouponActionLog;
import com.iformall.service.WxCouponActionLogService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponCarController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCouponCar;
import com.iformall.service.WxCouponCarService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Просмотреть файл

@@ -1,18 +1,15 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxCouponChannelDto;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.vo.WxCouponChannelVo;
import com.iformall.enums.EnumCouponChannelStatus;
import com.iformall.enums.EnumCouponStatus;
import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxCouponService;
import io.swagger.annotations.Api;

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java Просмотреть файл

@@ -1,12 +1,12 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.vo.WxCouponStatisVo;
import com.iformall.enums.*;
import com.iformall.service.WxCouponService;
import com.iformall.utils.DateUtils;
import io.swagger.annotations.Api;

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponInjectController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java Просмотреть файл

@@ -1,10 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCouponInject;
import com.iformall.service.WxCouponInjectService;
import com.iformall.service.WxCUserTagsService;
@@ -18,9 +19,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;

@Api(description = "精准投放接口")
@RestController
@RequestMapping("couponInject")

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxCouponOrder;
import com.iformall.domain.vo.WxCouponOrderBVo;

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendConfigController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCouponSendConfig;
import com.iformall.service.WxCouponSendConfigService;
import io.swagger.annotations.Api;

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java Просмотреть файл

@@ -1,10 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCoupon;
import com.iformall.domain.po.WxCouponSend;
import com.iformall.domain.vo.WxCouponSendVo;
@@ -23,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.List;

@RestController
@RequestMapping("wxCouponSend")

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSpreadController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSpreadController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCouponSpread;
import com.iformall.service.WxCouponSpreadService;
import io.swagger.annotations.Api;

mallinkAdmin/src/main/java/com/iformall/controller/WxCouponTypeController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponTypeController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCouponType;
import com.iformall.service.WxCouponTypeService;
import io.swagger.annotations.Api;

mallinkAdmin/src/main/java/com/iformall/controller/WxGameController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java Просмотреть файл

@@ -1,10 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.alibaba.fastjson.JSONArray;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxGame;
import com.iformall.enums.EnumGameStatus;
import com.iformall.service.WxGameService;

mallinkAdmin/src/main/java/com/iformall/controller/WxGameTemplateController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxGameTemplate;
import com.iformall.service.WxGameTemplateService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantMicroPayController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxOrderReportDto;
import com.iformall.domain.vo.WxMerchantMicroPayVo;
import com.iformall.enums.EnumOrderStatus;

mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxMerchantSubsidy;
import com.iformall.domain.vo.WxMerchantSubsidyVo;

mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java Просмотреть файл

@@ -1,10 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.WxCouponChannel;
import com.iformall.domain.po.WxOrder;

mallinkAdmin/src/main/java/com/iformall/controller/WxOrderGroupController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.vo.WxOrderGroupMarketing;
import com.iformall.service.WxOrderGroupService;
import io.swagger.annotations.Api;

mallinkAdmin/src/main/java/com/iformall/controller/WxPayAccountController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayAccountController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.controller.base.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

mallinkAdmin/src/main/java/com/iformall/controller/WxPayOrderController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java Просмотреть файл

@@ -1,10 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxOrder;
import com.iformall.domain.po.WxPayOrder;
import com.iformall.enums.EnumPayStatus;

mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingOrderController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.vo.WxProfitSharingOrderQueryVo;
import com.iformall.domain.vo.WxProfitSharingOrderVo;
import com.iformall.service.WxProfitSharingOrderService;

mallinkAdmin/src/main/java/com/iformall/controller/WxQuestionController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java Просмотреть файл

@@ -1,10 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.alibaba.fastjson.JSONObject;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxQuestion;
import com.iformall.domain.po.WxQuestionConfig;
import com.iformall.enums.EnumQuestionConfigStatus;

mallinkAdmin/src/main/java/com/iformall/controller/WxRefundOrderController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.controller.base.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

mallinkAdmin/src/main/java/com/iformall/controller/WxSubsidyController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.exception.MallinkException;
import com.iformall.utils.PayUtil;

mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java Просмотреть файл

@@ -1,7 +1,8 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumWxTopicStatus;
import com.iformall.service.*;

mallinkAdmin/src/main/java/com/iformall/controller/WxUserCouponController.java → mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.market;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxUserCouponDto;
import com.iformall.service.WxUserCouponService;
import io.swagger.annotations.ApiOperation;

mallinkAdmin/src/main/java/com/iformall/controller/AsyncTask.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java Просмотреть файл

@@ -1,4 +1,4 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ImportParams;

mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java Просмотреть файл

@@ -1,4 +1,4 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -8,7 +8,7 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.WxCUserBasicInfoFilterDto;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumAssignTagsTrigger;
@@ -40,7 +40,6 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

import static com.iformall.domain.po.WxCouponOrder.Field.CreateDate_DESC;
import static com.iformall.ueditor.define.AppInfo.info;

@RestController
@RequestMapping("wxCUserBasicInfo")

mallinkAdmin/src/main/java/com/iformall/controller/WxCUserCarController.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCUserCar;
import com.iformall.service.WxCUserCarService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxCUserController.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.controller.base.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java Просмотреть файл

@@ -1,4 +1,4 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import java.text.DecimalFormat;
import java.text.NumberFormat;
@@ -11,6 +11,7 @@ import java.util.List;
import java.util.Map;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCouponOrder;
import com.iformall.mapper.WxCUserBasicInfoMapper;
import com.iformall.service.WxCUserBasicInfoService;

mallinkAdmin/src/main/java/com/iformall/controller/WxCUserTagsController.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCUserTags;
import com.iformall.service.WxCUserTagsService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import com.github.pagehelper.PageInfo;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxCreditHistory;
import com.iformall.domain.vo.WxCreditHistoryVo;
import com.iformall.exception.MallinkException;

mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import com.iformall.common.ErrorCode;
import com.iformall.controller.base.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

mallinkAdmin/src/main/java/com/iformall/controller/WxScoreHistoryController.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxScoreHistory;
import com.iformall.service.WxScoreHistoryService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java Просмотреть файл

@@ -1,14 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxScoreRules;
import com.iformall.service.WxScoreRulesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

mallinkAdmin/src/main/java/com/iformall/controller/WxUserChannelController.java → mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.mem;

import com.github.pagehelper.PageInfo;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxUserChannel;
import com.iformall.service.WxUserChannelService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java → mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.msg;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMsgCallback;
import com.iformall.service.WxMsgCallbackService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMsgConfigController.java → mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.msg;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMsgConfig;
import com.iformall.service.WxMsgConfigService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java → mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java Просмотреть файл

@@ -1,32 +1,17 @@
package com.iformall.controller;
package com.iformall.controller.msg;

import com.alibaba.fastjson.JSON;
import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto;
import com.iformall.domain.po.PushLimit;
import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.msg.WxMsg;
import com.iformall.domain.po.WxMsgConfig;
import com.iformall.enums.EnumMsgSend;
import com.iformall.enums.EnumMsgStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxMsgConfigMapper;
import com.iformall.service.PushLimitService;
import com.iformall.service.WxCUserBasicInfoService;
import com.iformall.service.WxCUserTagsService;
import com.iformall.service.WxMsgService;
import com.iformall.utils.Constant;
import com.iformall.utils.DateUtils;
import io.netty.util.internal.StringUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +21,6 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.FileOutputStream;
import java.util.*;
import java.util.stream.Collectors;

/**
* @author gongbiao

mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java → mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.msg;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMsgModel;
import com.iformall.service.WxMsgModelService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java → mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java Просмотреть файл

@@ -1,7 +1,7 @@
package com.iformall.controller;
package com.iformall.controller.msg;

import com.alibaba.fastjson.JSONArray;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.msg.MailMsg;
import com.iformall.domain.po.msg.SmartAppMsg;
import com.iformall.domain.po.msg.WxMsg;
@@ -11,7 +11,6 @@ import com.iformall.mapper.WxMsgMapper;
import com.iformall.mq.MqBaseProducer;
import com.iformall.service.WxMsgRecordService;
import com.iformall.service.msg.impl.SendCallBackSmsServiceImpl;
import com.iformall.utils.DateUtils;
import com.iformall.utils.JsonUtil;
import io.swagger.annotations.Api;
import org.slf4j.Logger;

mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java → mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.msg;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMsgSignature;
import com.iformall.service.WxMsgSignatureService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java → mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.msg;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMsgValidationcode;
import com.iformall.service.WxMsgValidationcodeService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java → mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.msg;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMsgValidationcodeModel;
import com.iformall.service.WxMsgValidationcodeModelService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxMallApplyController.java → mallinkAdmin/src/main/java/com/iformall/controller/official/WxMallApplyController.java Просмотреть файл

@@ -1,9 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.official;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxMallApply;
import com.iformall.domain.po.WxMsgValidationcode;
import com.iformall.service.WxMallApplyService;

mallinkAdmin/src/main/java/com/iformall/controller/WxBillActionController.java → mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.rent;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBillAction;
import com.iformall.service.WxBillActionService;
import io.swagger.annotations.Api;

mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java → mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -1,8 +1,8 @@
package com.iformall.controller;
package com.iformall.controller.rent;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxShop;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.service.WxBillAllService;
import io.swagger.annotations.ApiImplicitParam;
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

/**

mallinkAdmin/src/main/java/com/iformall/controller/WxBillDailyController.java → mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.rent;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBillDaily;
import com.iformall.service.WxBillDailyService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java → mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.rent;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBillDeposit;
import com.iformall.service.WxBillDepositService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherController.java → mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.rent;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBillOther;
import com.iformall.service.WxBillOtherService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java → mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.rent;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBillOtherDeposit;
import com.iformall.service.WxBillOtherDepositService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java → mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.rent;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBillProperty;
import com.iformall.service.WxBillPropertyService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java → mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.rent;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBillPropertyDeposit;
import com.iformall.service.WxBillPropertyDepositService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java → mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.rent;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBillRent;
import com.iformall.service.WxBillRentService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java → mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java Просмотреть файл

@@ -1,16 +1,16 @@
package com.iformall.controller;
package com.iformall.controller.sys;

import com.google.code.kaptcha.Constants;
import com.google.code.kaptcha.Producer;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.MallUserInfoVo;
import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.mq.MqBaseProducer;
import com.iformall.service.*;
import com.iformall.shiro.UserSession;
import com.iformall.shiro.UseriFormallToken;
@@ -71,6 +71,7 @@ public class HomeController extends BaseController {
@Autowired
private MallUserActionService mallUserActionService;

@ApiOperation("验证码")
@GetMapping("/captcha.jpg")
public void captcha(HttpServletResponse response)throws ServletException, IOException {
logger.debug("[" + getIpAddr() + "] HomeController::captcha");
@@ -246,6 +247,7 @@ public class HomeController extends BaseController {
return data;
}

@ApiOperation("发送手机验证码")
@GetMapping("sendLoginPhoneCode")
@ApiImplicitParams({
@ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true)})

mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java → mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java Просмотреть файл

@@ -1,10 +1,11 @@
package com.iformall.controller;
package com.iformall.controller.sys;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallRole;
import com.iformall.domain.po.MallRolePermission;
import com.iformall.domain.po.MallUserInfo;
@@ -12,12 +13,13 @@ import com.iformall.domain.po.MallUserRole;
import com.iformall.enums.EnumUserAdmin;
import com.iformall.service.MallRolePermissionService;
import com.iformall.service.MallRoleService;
import com.iformall.service.MallUserInfoService;
import com.iformall.service.MallUserRoleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,13 +43,12 @@ public class MallRoleController extends BaseController {
@Autowired
private MallRolePermissionService sysRolePermissionService;

@Autowired
private MallUserInfoService mallUserInfoService;

@Autowired
private MallUserRoleService mallUserRoleService;

@ApiOperation("角色列表")
@GetMapping("list")
@RequiresPermissions("sys:role:list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@@ -75,7 +76,9 @@ public class MallRoleController extends BaseController {
}


@ApiOperation("角色保存")
@PostMapping("saveOrUpdate")
@RequiresPermissions("sys:role:save")
@SystemControllerLog(description = "用户管理-rule保存")
public ResultData saveOrUpdate(@RequestBody MallRole sysRole) {
logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate");
@@ -101,8 +104,9 @@ public class MallRoleController extends BaseController {
return new ResultData();
}

@ApiOperation("角色增加")
@PostMapping("add")
@RequiresPermissions("sys:role:add")
@SystemControllerLog(description = "用户管理-rule添加")
public ResultData add(MallRole sysRole) {
logger.debug("[" + getIpAddr() + "] MallRoleController::add");
@@ -116,7 +120,9 @@ public class MallRoleController extends BaseController {
return new ResultData();
}

@ApiOperation("角色更新")
@PostMapping("update")
@RequiresPermissions("sys:role:update")
@SystemControllerLog(description = "用户管理-rule更新")
public ResultData update(MallRole sysRole) {
logger.debug("[" + getIpAddr() + "] MallRoleController::update");
@@ -132,8 +138,9 @@ public class MallRoleController extends BaseController {
return new ResultData();
}

@ApiOperation("角色删除")
@PostMapping("/del")
@RequiresPermissions("sys:role:del")
@SystemControllerLog(description = "用户管理-rule删除")
public ResultData delete(@RequestBody MallRole sysRole) {
logger.debug("[" + getIpAddr() + "] MallRoleController::delete");

mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java → mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java Просмотреть файл

@@ -1,21 +1,18 @@
package com.iformall.controller;
package com.iformall.controller.sys;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
import com.iformall.domain.vo.MallUserInfoVo;
import com.iformall.enums.EnumMallUserStatus;
import com.iformall.enums.EnumUserAdmin;
import com.iformall.enums.EnumFlowPermissionType;
import com.iformall.enums.EnumUserWechat;
import com.iformall.service.*;
import com.iformall.shiro.PasswordHelper;
import com.iformall.shiro.UserSession;
import com.iformall.utils.Constant;
import com.sun.tools.internal.jxc.ap.Const;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -23,13 +20,13 @@ import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import javax.print.DocFlavor;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -68,6 +65,7 @@ public class MallUserInfoController extends BaseController {

@ApiOperation(value = "用户分页接口", response = String.class)
@GetMapping("lists")
@RequiresPermissions("sys:user:list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@@ -100,6 +98,7 @@ public class MallUserInfoController extends BaseController {

@ApiOperation(value = "用户详情接口", response = String.class)
@GetMapping("detail")
@RequiresPermissions("sys:user:info")
@SystemControllerLog(description = "用户管理-用户详情")
public ResultData detail(Long id) {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::detail");
@@ -115,6 +114,7 @@ public class MallUserInfoController extends BaseController {

@ApiOperation(value = "创建用户接口", response = String.class)
@PostMapping("add")
@RequiresPermissions("sys:user:add")
@SystemControllerLog(description = "用户管理-创建用户")
public ResultData createUser(@RequestBody MallUserInfo userInfo) {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::createUser");
@@ -147,6 +147,7 @@ public class MallUserInfoController extends BaseController {

@ApiOperation(value = "修改用户接口", response = String.class)
@PostMapping("update")
@RequiresPermissions("sys:user:update")
@SystemControllerLog(description = "用户管理-修改用户")
public ResultData updateUser(@RequestBody MallUserInfo userInfo) {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::updateUser");
@@ -221,6 +222,7 @@ public class MallUserInfoController extends BaseController {

@ApiOperation(value = "删除用户接口", response = String.class)
@PostMapping("/del")
@RequiresPermissions("sys:user:del")
@SystemControllerLog(description = "用户管理-删除用户")
public ResultData deleteUser(@RequestBody MallUserInfo userInfo) {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::deleteUser");
@@ -236,13 +238,9 @@ public class MallUserInfoController extends BaseController {
return new ResultData();
}

/**
* 启用,停用用户
*
* @return
*/
@ApiOperation(value = "起停用户接口")
@PostMapping("updateStatus")
@RequiresPermissions("sys:user:update")
@SystemControllerLog(description = "用户管理-起停用户")
public ResultData modifyStatus(@RequestBody MallUserInfo userInfo) {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::modifyStatus");
@@ -273,6 +271,7 @@ public class MallUserInfoController extends BaseController {
}


@ApiOperation(value = "用户权限检查")
@GetMapping("hasButtonPermission")
@SystemControllerLog(description = "用户管理-用户权限检查")
public ResultData hasButtonPermission(String permissions) {
@@ -285,17 +284,12 @@ public class MallUserInfoController extends BaseController {
boolean has = userInfoService.hasButtonPermission(userId, name);
map.put(name, has);
}
// StringBuffer buffer = new StringBuffer();
// for(Entry<String, Boolean> entrySet :map.entrySet()){
// buffer.append("var "+entrySet.getKey());
// buffer.append("="+entrySet.getValue());
// buffer.append(";");
// }
//return new ResultData(buffer.toString());
return new ResultData(map);
}

@ApiOperation(value = "用户权限检查")
@GetMapping("getUser")
@RequiresPermissions("sys:user:info")
@SystemControllerLog(description = "用户管理-用户信息")
public ResultData getUserInfo() {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo");
@@ -345,6 +339,7 @@ public class MallUserInfoController extends BaseController {
return new ResultData(info);
}

@ApiOperation(value = "用户密码发送验证码")
@GetMapping("sendvalidationcode")
@ApiImplicitParams({
@ApiImplicitParam(name = "userName", value = "手机号", dataType = "String", paramType = "query", required = true),
@@ -419,6 +414,7 @@ public class MallUserInfoController extends BaseController {

@ApiOperation(value = "审批权限用户列表", response = String.class)
@GetMapping("getFlowPermissionList")
@RequiresPermissions("sys:user:flowlist")
@SystemControllerLog(description = "用户管理-审批权限用户列表")
public ResultData getFlowPermissionList() {
logger.debug("[" + getIpAddr() + "] MallUserInfoController::getFlowPermissionList");

mallinkAdmin/src/main/java/com/iformall/controller/SysMenuController.java → mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java Просмотреть файл

@@ -1,9 +1,10 @@
package com.iformall.controller;
package com.iformall.controller.sys;

import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallPermission;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.enums.EnumPermissionType;
@@ -11,6 +12,7 @@ import com.iformall.exception.MallinkException;
import com.iformall.service.MallPermissionService;
import com.iformall.service.MallUserInfoService;
import com.iformall.utils.Constant;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.util.Assert;
@@ -21,11 +23,12 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;

/**
* @author Stormeye Wu
@@ -42,9 +45,7 @@ public class SysMenuController extends BaseController {
@Autowired
private MallUserInfoService mallUserInfoService;

/**
* 导航菜单
*/
@ApiOperation("导航菜单")
@GetMapping("/nav")
public ResultData nav(){
logger.debug("[" + getIpAddr() + "] MallPermissionController::nav");
@@ -57,21 +58,18 @@ public class SysMenuController extends BaseController {
return new ResultData(map);
}


/**
* 所有菜单列表
* @return
*/
@ApiOperation("所有菜单列表")
@GetMapping("list")
@RequiresPermissions("sys:menu:list")
@SystemControllerLog(description = "用户管理-权限")
public ResultData getList() {
logger.debug("[" + getIpAddr() + "] MallPermissionController::list");
MallUserInfo user = getUser();
List<MallPermission> menuList = mallPermissionService.getUserMenuList(user);
List<MallPermission> menuList = mallUserInfoService.getAllPermissions(user);
return new ResultData(Result.SUCCESS, "查询成功", menuList);
}

@ApiOperation("添加菜单/权限")
@PostMapping("add")
@RequiresPermissions("sys:menu:save")
@SystemControllerLog(description = "用户管理-权限添加")
@@ -85,6 +83,7 @@ public class SysMenuController extends BaseController {
return new ResultData(mallPermission.getId());
}

@ApiOperation("更新菜单/权限")
@PostMapping("update")
@RequiresPermissions("sys:menu:update")
@SystemControllerLog(description = "用户管理-权限更新")
@@ -97,6 +96,7 @@ public class SysMenuController extends BaseController {
return new ResultData();
}

@ApiOperation("删除菜单/权限")
@GetMapping("/del")
@RequiresPermissions("sys:menu:delete")
@SystemControllerLog(description = "用户管理-权限删除")
@@ -116,9 +116,7 @@ public class SysMenuController extends BaseController {
return new ResultData(Result.SUCCESS, "删除成功");
}

/**
* 菜单信息
*/
@ApiOperation("菜单信息")
@GetMapping("/findById")
@RequiresPermissions("sys:menu:info")
@SystemControllerLog(description = "用户管理-权限查找")
@@ -127,6 +125,42 @@ public class SysMenuController extends BaseController {
return new ResultData(Result.SUCCESS, "成功", mallPermissionService.getById(id));
}

@Autowired
private RequestMappingHandlerMapping requestMappingHandlerMapping;

@ApiOperation("导出菜单")
@GetMapping("/export")
//@RequiresPermissions("sys:menu:import")
@SystemControllerLog(description = "用户管理-导出权限")
public ResultData export() {
logger.debug("[" + getIpAddr() + "] MallPermissionController::export");
List<Map> resourceList = new ArrayList<Map>();
//获取所有Controller的方法
Map<RequestMappingInfo, HandlerMethod> map = requestMappingHandlerMapping.getHandlerMethods();
for (Map.Entry<RequestMappingInfo, HandlerMethod> m : map.entrySet()) {
RequestMappingInfo info = m.getKey();
HandlerMethod method = m.getValue();
PatternsRequestCondition p = info.getPatternsCondition();
//扫描Shiro的权限资源标签
RequiresPermissions requiresPermissions = method.getMethod().getAnnotation(RequiresPermissions.class);
if (requiresPermissions != null) {
Map newSource = new HashMap();
String[] strArr = requiresPermissions.value();
newSource.put("permission", strArr[0]);
//扫描Swagger注解
ApiOperation apiOperation = method.getMethod().getAnnotation(ApiOperation.class);
if (apiOperation != null) {
newSource.put("name", apiOperation.value());
Set<String> urls = p.getPatterns();
newSource.put("url", urls.toArray()[0]);
}
resourceList.add(newSource);
}
}

return new ResultData(resourceList);
}

/**
* 验证参数是否正确
*/

mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java → mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java Просмотреть файл

@@ -1,4 +1,4 @@
package com.iformall.controller;
package com.iformall.controller.sys;


import com.amazonaws.AmazonClientException;
@@ -13,6 +13,7 @@ import com.amazonaws.services.s3.model.ObjectMetadata;
import com.amazonaws.services.s3.model.PutObjectRequest;
import com.iformall.common.ResultData;
import com.iformall.config.AwsProperty;
import com.iformall.controller.base.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;

mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java → mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Просмотреть файл

@@ -1,15 +1,15 @@
package com.iformall.controller;
package com.iformall.controller.sys;

import com.alibaba.fastjson.JSON;
import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserAction;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.vo.MallUserInfoVo;
import com.iformall.enums.EnumMallUserAction;
import com.iformall.enums.EnumUserAdmin;
import com.iformall.exception.MallinkException;
import com.iformall.service.MallUserActionService;
import com.iformall.service.MallUserInfoService;
import com.iformall.service.MallUserRoleService;
@@ -46,10 +46,8 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.*;
import java.util.concurrent.TimeUnit;


@Controller

mallinkAdmin/src/main/java/com/iformall/controller/WxAdminLogController.java → mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.sys;

import com.github.pagehelper.PageInfo;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxAdminLog;
import com.iformall.service.WxAdminLogService;
import io.swagger.annotations.ApiImplicitParam;

mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java → mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java Просмотреть файл

@@ -1,9 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.sys;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBusiness;
import com.iformall.domain.po.WxSubBusiness;
import com.iformall.service.WxBusinessService;
@@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.stream.Collectors;

@RestController
@RequestMapping("wxBusiness")

mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java → mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java Просмотреть файл

@@ -1,8 +1,9 @@
package com.iformall.controller;
package com.iformall.controller.workflow;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxFlowRecord;
import com.iformall.enums.EnumFlowRecordStatus;
import com.iformall.service.WxFlowService;

Загрузка…
Отмена
Сохранить