Browse Source

upd

release_toaliyun_real
jinguo24@163.com 7 years ago
parent
commit
c12ea25fa1
100 changed files with 752 additions and 392 deletions
  1. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java
  2. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java
  3. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java
  4. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java
  5. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java
  6. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java
  7. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java
  8. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java
  9. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java
  10. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java
  11. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java
  12. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java
  13. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java
  14. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java
  15. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java
  16. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java
  17. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java
  18. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java
  19. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java
  20. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java
  21. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java
  22. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java
  23. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java
  24. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java
  25. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java
  26. +65
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxImgUrlController.java
  27. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java
  28. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java
  29. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java
  30. +4
    -7
      mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java
  31. +65
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxMerchantEtcpController.java
  32. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java
  33. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java
  34. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java
  35. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java
  36. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java
  37. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java
  38. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java
  39. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java
  40. +65
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxParkEtcpController.java
  41. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java
  42. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java
  43. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java
  44. +4
    -6
      mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java
  45. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java
  46. +4
    -4
      mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java
  47. +0
    -1
      mallinkApi/pom.xml
  48. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java
  49. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxBLogController.java
  50. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java
  51. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxBannersController.java
  52. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java
  53. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCLogController.java
  54. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java
  55. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java
  56. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCUserController.java
  57. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java
  58. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java
  59. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java
  60. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java
  61. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCouponController.java
  62. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java
  63. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java
  64. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java
  65. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java
  66. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java
  67. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java
  68. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java
  69. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java
  70. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java
  71. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java
  72. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java
  73. +65
    -0
      mallinkApi/src/main/java/com/simple/controller/WxImgUrlController.java
  74. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java
  75. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMallController.java
  76. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java
  77. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java
  78. +65
    -0
      mallinkApi/src/main/java/com/simple/controller/WxMerchantEtcpController.java
  79. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java
  80. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java
  81. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java
  82. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMsgController.java
  83. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java
  84. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java
  85. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java
  86. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxParkController.java
  87. +65
    -0
      mallinkApi/src/main/java/com/simple/controller/WxParkEtcpController.java
  88. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java
  89. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java
  90. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java
  91. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxShopController.java
  92. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxTagsController.java
  93. +4
    -4
      mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java
  94. +1
    -1
      mallinkService/src/main/java/com/simple/common/IdWorker.java
  95. +7
    -7
      mallinkService/src/main/java/com/simple/domain/po/WxBanners.java
  96. +2
    -2
      mallinkService/src/main/java/com/simple/service/WxAppinfoService.java
  97. +2
    -2
      mallinkService/src/main/java/com/simple/service/WxBLogService.java
  98. +2
    -2
      mallinkService/src/main/java/com/simple/service/WxBUserMerchantService.java
  99. +2
    -2
      mallinkService/src/main/java/com/simple/service/WxBannersService.java
  100. +2
    -2
      mallinkService/src/main/java/com/simple/service/WxBusinessService.java

+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxAppinfoController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxAppinfo")
@Api(description="小程序配置接口")
public class WxAppinfoController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxAppinfoController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxAppinfoService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxAppinfoService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxBLogController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxBLog")
@Api(description="B端log接口")
public class WxBLogController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxBLogController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxBLogService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxBLogService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxBUserMerchantController.java View File

@@ -48,15 +48,15 @@ public class WxBUserMerchantController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxBUserMerchantService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxBUserMerchantService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxBannersController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxBanners")
@Api(description="banner相关接口")
public class WxBannersController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxBannersController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxBannersService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxBannersService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxBusinessController.java View File

@@ -48,15 +48,15 @@ public class WxBusinessController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxBusinessService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxBusinessService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxCLogController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxCLog")
@Api(description="C端log接口")
public class WxCLogController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxCLogController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCLogService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCLogService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCUserCarsController.java View File

@@ -48,15 +48,15 @@ public class WxCUserCarsController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCUserCarsService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserCarsService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCUserCloudController.java View File

@@ -48,15 +48,15 @@ public class WxCUserCloudController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCUserCloudService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserCloudService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCUserController.java View File

@@ -48,15 +48,15 @@ public class WxCUserController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCUserService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java View File

@@ -48,15 +48,15 @@ public class WxCUserEtcpTokenController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCUserEtcpTokenService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserEtcpTokenService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCUserTagsController.java View File

@@ -48,15 +48,15 @@ public class WxCUserTagsController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCUserTagsService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserTagsService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxCouponActionLogController.java View File

@@ -48,15 +48,15 @@ public class WxCouponActionLogController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponActionLogService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponActionLogService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxCouponActivityController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxCouponActivity")
@Api(description="卡券详情接口")
public class WxCouponActivityController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxCouponActivityController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponActivityService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponActivityService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxCoupon")
@Api(description="卡券接口")
public class WxCouponController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxCouponController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxCouponRecordController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxCouponRecord")
@Api(description="卡券使用记录接口")
public class WxCouponRecordController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxCouponRecordController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponRecordService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponRecordService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxCouponTypeController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxCouponType")
@Api(description="卡券类型接口")
public class WxCouponTypeController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxCouponTypeController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponTypeService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponTypeService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpCouponRecordController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpCouponRecordService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpCouponRecordService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkDissolutionController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkDissolutionService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkDissolutionService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkInController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkInService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkInService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkMsgSucController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkMsgSucService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkMsgSucService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkOrderunpayController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkOrderunpayService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkOrderunpayService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkOutController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkOutService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkOutService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkTransactionController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkTransactionService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkTransactionService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkUnbindController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkUnbindService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkUnbindService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxFlashSaleController.java View File

@@ -48,15 +48,15 @@ public class WxFlashSaleController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxFlashSaleService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxFlashSaleService.getById(id));
}


+ 65
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxImgUrlController.java View File

@@ -0,0 +1,65 @@
package com.simple.controller;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxImgUrl;
import com.simple.service.WxImgUrlService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxImgUrl")
public class WxImgUrlController extends BaseController
{
@Autowired
private WxImgUrlService wxImgUrlService;

private Logger logger = Logger.getLogger(WxImgUrlController.class);

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxImgUrl wxImgUrl,Integer pageNum, Integer pageSize) {
if (null == wxImgUrl) wxImgUrl = new WxImgUrl();
final PageInfo<WxImgUrl> page = wxImgUrlService.listAsPage(wxImgUrl, pageNum, pageSize);
return new ResultData(page);
}

@PostMapping("add")
public ResultData add(@RequestBody WxImgUrl wxImgUrl) {
//Assert.notNull(wxImgUrl.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxImgUrlService.saveOrUpdate(wxImgUrl);
return new ResultData();
}

@PostMapping("update")
public ResultData update(@RequestBody WxImgUrl wxImgUrl) {
wxImgUrlService.saveOrUpdate(wxImgUrl);
return new ResultData();
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxImgUrlService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxImgUrlService.getById(id));
}
}

+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMallBuildingController.java View File

@@ -48,15 +48,15 @@ public class WxMallBuildingController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMallBuildingService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMallBuildingService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxMallController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxMall")
@Api(description="商场信息接口")
public class WxMallController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxMallController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMallService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMallService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMallFloorController.java View File

@@ -48,15 +48,15 @@ public class WxMallFloorController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMallFloorService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMallFloorService.getById(id));
}


+ 4
- 7
mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java View File

@@ -11,14 +11,11 @@ import com.simple.common.ResultData;

import com.simple.domain.po.WxMerchant;
import com.simple.service.WxMerchantService;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxMerchant")
@Api(description="商户相关接口")
public class WxMerchantController extends BaseController
{
@Autowired
@@ -51,15 +48,15 @@ public class WxMerchantController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMerchantService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMerchantService.getById(id));
}


+ 65
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxMerchantEtcpController.java View File

@@ -0,0 +1,65 @@
package com.simple.controller;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMerchantEtcp;
import com.simple.service.WxMerchantEtcpService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxMerchantEtcp")
public class WxMerchantEtcpController extends BaseController
{
@Autowired
private WxMerchantEtcpService wxMerchantEtcpService;

private Logger logger = Logger.getLogger(WxMerchantEtcpController.class);

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxMerchantEtcp wxMerchantEtcp,Integer pageNum, Integer pageSize) {
if (null == wxMerchantEtcp) wxMerchantEtcp = new WxMerchantEtcp();
final PageInfo<WxMerchantEtcp> page = wxMerchantEtcpService.listAsPage(wxMerchantEtcp, pageNum, pageSize);
return new ResultData(page);
}

@PostMapping("add")
public ResultData add(@RequestBody WxMerchantEtcp wxMerchantEtcp) {
//Assert.notNull(wxMerchantEtcp.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxMerchantEtcpService.saveOrUpdate(wxMerchantEtcp);
return new ResultData();
}

@PostMapping("update")
public ResultData update(@RequestBody WxMerchantEtcp wxMerchantEtcp) {
wxMerchantEtcpService.saveOrUpdate(wxMerchantEtcp);
return new ResultData();
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMerchantEtcpService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMerchantEtcpService.getById(id));
}
}

+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxMerchantShopController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxMerchantShop")
@Api(description="商户店铺接口")
public class WxMerchantShopController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxMerchantShopController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMerchantShopService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMerchantShopService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxMerchantTradeDays")
@Api(description="商户日结单额接口")
public class WxMerchantTradeDaysController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxMerchantTradeDaysController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMerchantTradeDaysService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMerchantTradeDaysService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMsgConfigController.java View File

@@ -48,15 +48,15 @@ public class WxMsgConfigController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMsgConfigService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMsgConfigService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java View File

@@ -48,15 +48,15 @@ public class WxMsgController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMsgService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMsgService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java View File

@@ -48,15 +48,15 @@ public class WxMsgModelController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMsgModelService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMsgModelService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxMsgSignatureController.java View File

@@ -48,15 +48,15 @@ public class WxMsgSignatureController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMsgSignatureService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMsgSignatureService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxOrdersController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxOrders")
@Api(description="卡卷交易使用接口")
public class WxOrdersController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxOrdersController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxOrdersService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxOrdersService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxParkController.java View File

@@ -48,15 +48,15 @@ public class WxParkController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxParkService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxParkService.getById(id));
}


+ 65
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxParkEtcpController.java View File

@@ -0,0 +1,65 @@
package com.simple.controller;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxParkEtcp;
import com.simple.service.WxParkEtcpService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxParkEtcp")
public class WxParkEtcpController extends BaseController
{
@Autowired
private WxParkEtcpService wxParkEtcpService;

private Logger logger = Logger.getLogger(WxParkEtcpController.class);

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxParkEtcp wxParkEtcp,Integer pageNum, Integer pageSize) {
if (null == wxParkEtcp) wxParkEtcp = new WxParkEtcp();
final PageInfo<WxParkEtcp> page = wxParkEtcpService.listAsPage(wxParkEtcp, pageNum, pageSize);
return new ResultData(page);
}

@PostMapping("add")
public ResultData add(@RequestBody WxParkEtcp wxParkEtcp) {
//Assert.notNull(wxParkEtcp.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxParkEtcpService.saveOrUpdate(wxParkEtcp);
return new ResultData();
}

@PostMapping("update")
public ResultData update(@RequestBody WxParkEtcp wxParkEtcp) {
wxParkEtcpService.saveOrUpdate(wxParkEtcp);
return new ResultData();
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxParkEtcpService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxParkEtcpService.getById(id));
}
}

+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxScoreHistoryController.java View File

@@ -48,15 +48,15 @@ public class WxScoreHistoryController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxScoreHistoryService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxScoreHistoryService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxScoreRulesController.java View File

@@ -48,15 +48,15 @@ public class WxScoreRulesController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxScoreRulesService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxScoreRulesService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java View File

@@ -48,15 +48,15 @@ public class WxScoreValidityPeriodController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxScoreValidityPeriodService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxScoreValidityPeriodService.getById(id));
}


+ 4
- 6
mallinkAdmin/src/main/java/com/simple/controller/WxShopController.java View File

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

import io.swagger.annotations.Api;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
@@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxShop")
@Api(description="商铺接口")
public class WxShopController extends BaseController
{
@Autowired
@@ -50,15 +48,15 @@ public class WxShopController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxShopService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxShopService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxTagsController.java View File

@@ -48,15 +48,15 @@ public class WxTagsController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxTagsService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxTagsService.getById(id));
}


+ 4
- 4
mallinkAdmin/src/main/java/com/simple/controller/WxWebLogController.java View File

@@ -48,15 +48,15 @@ public class WxWebLogController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxWebLogService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxWebLogService.getById(id));
}


+ 0
- 1
mallinkApi/pom.xml View File

@@ -32,5 +32,4 @@
</plugin>
</plugins>
</build>

</project>

+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java View File

@@ -48,15 +48,15 @@ public class WxAppinfoController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxAppinfoService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxAppinfoService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxBLogController.java View File

@@ -48,15 +48,15 @@ public class WxBLogController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxBLogService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxBLogService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxBUserMerchantController.java View File

@@ -48,15 +48,15 @@ public class WxBUserMerchantController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxBUserMerchantService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxBUserMerchantService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxBannersController.java View File

@@ -48,15 +48,15 @@ public class WxBannersController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxBannersService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxBannersService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java View File

@@ -48,15 +48,15 @@ public class WxBusinessController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxBusinessService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxBusinessService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCLogController.java View File

@@ -48,15 +48,15 @@ public class WxCLogController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCLogService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCLogService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java View File

@@ -48,15 +48,15 @@ public class WxCUserCarsController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCUserCarsService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserCarsService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCUserCloudController.java View File

@@ -48,15 +48,15 @@ public class WxCUserCloudController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCUserCloudService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserCloudService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCUserController.java View File

@@ -48,15 +48,15 @@ public class WxCUserController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCUserService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCUserEtcpTokenController.java View File

@@ -48,15 +48,15 @@ public class WxCUserEtcpTokenController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCUserEtcpTokenService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserEtcpTokenService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java View File

@@ -48,15 +48,15 @@ public class WxCUserTagsController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCUserTagsService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCUserTagsService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java View File

@@ -48,15 +48,15 @@ public class WxCouponActionLogController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponActionLogService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponActionLogService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCouponActivityController.java View File

@@ -48,15 +48,15 @@ public class WxCouponActivityController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponActivityService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponActivityService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCouponController.java View File

@@ -48,15 +48,15 @@ public class WxCouponController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCouponRecordController.java View File

@@ -48,15 +48,15 @@ public class WxCouponRecordController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponRecordService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponRecordService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java View File

@@ -48,15 +48,15 @@ public class WxCouponTypeController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponTypeService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponTypeService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpCouponRecordController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpCouponRecordService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpCouponRecordService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkDissolutionController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkDissolutionService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkDissolutionService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkInController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkInService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkInService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkMsgSucController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkMsgSucService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkMsgSucService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkOrderunpayController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkOrderunpayService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkOrderunpayService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkOutController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkOutService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkOutService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkTransactionController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkTransactionService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkTransactionService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java View File

@@ -48,15 +48,15 @@ public class WxEtcpParkUnbindController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxEtcpParkUnbindService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkUnbindService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java View File

@@ -48,15 +48,15 @@ public class WxFlashSaleController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxFlashSaleService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxFlashSaleService.getById(id));
}


+ 65
- 0
mallinkApi/src/main/java/com/simple/controller/WxImgUrlController.java View File

@@ -0,0 +1,65 @@
package com.simple.controller;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxImgUrl;
import com.simple.service.WxImgUrlService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxImgUrl")
public class WxImgUrlController extends BaseController
{
@Autowired
private WxImgUrlService wxImgUrlService;

private Logger logger = Logger.getLogger(WxImgUrlController.class);

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxImgUrl wxImgUrl,Integer pageNum, Integer pageSize) {
if (null == wxImgUrl) wxImgUrl = new WxImgUrl();
final PageInfo<WxImgUrl> page = wxImgUrlService.listAsPage(wxImgUrl, pageNum, pageSize);
return new ResultData(page);
}

@PostMapping("add")
public ResultData add(@RequestBody WxImgUrl wxImgUrl) {
//Assert.notNull(wxImgUrl.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxImgUrlService.saveOrUpdate(wxImgUrl);
return new ResultData();
}

@PostMapping("update")
public ResultData update(@RequestBody WxImgUrl wxImgUrl) {
wxImgUrlService.saveOrUpdate(wxImgUrl);
return new ResultData();
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxImgUrlService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxImgUrlService.getById(id));
}
}

+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java View File

@@ -48,15 +48,15 @@ public class WxMallBuildingController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMallBuildingService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMallBuildingService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxMallController.java View File

@@ -48,15 +48,15 @@ public class WxMallController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMallService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMallService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java View File

@@ -48,15 +48,15 @@ public class WxMallFloorController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMallFloorService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMallFloorService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java View File

@@ -48,15 +48,15 @@ public class WxMerchantController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMerchantService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMerchantService.getById(id));
}


+ 65
- 0
mallinkApi/src/main/java/com/simple/controller/WxMerchantEtcpController.java View File

@@ -0,0 +1,65 @@
package com.simple.controller;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxMerchantEtcp;
import com.simple.service.WxMerchantEtcpService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxMerchantEtcp")
public class WxMerchantEtcpController extends BaseController
{
@Autowired
private WxMerchantEtcpService wxMerchantEtcpService;

private Logger logger = Logger.getLogger(WxMerchantEtcpController.class);

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxMerchantEtcp wxMerchantEtcp,Integer pageNum, Integer pageSize) {
if (null == wxMerchantEtcp) wxMerchantEtcp = new WxMerchantEtcp();
final PageInfo<WxMerchantEtcp> page = wxMerchantEtcpService.listAsPage(wxMerchantEtcp, pageNum, pageSize);
return new ResultData(page);
}

@PostMapping("add")
public ResultData add(@RequestBody WxMerchantEtcp wxMerchantEtcp) {
//Assert.notNull(wxMerchantEtcp.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxMerchantEtcpService.saveOrUpdate(wxMerchantEtcp);
return new ResultData();
}

@PostMapping("update")
public ResultData update(@RequestBody WxMerchantEtcp wxMerchantEtcp) {
wxMerchantEtcpService.saveOrUpdate(wxMerchantEtcp);
return new ResultData();
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMerchantEtcpService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMerchantEtcpService.getById(id));
}
}

+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java View File

@@ -48,15 +48,15 @@ public class WxMerchantShopController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMerchantShopService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMerchantShopService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDaysController.java View File

@@ -48,15 +48,15 @@ public class WxMerchantTradeDaysController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMerchantTradeDaysService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMerchantTradeDaysService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java View File

@@ -48,15 +48,15 @@ public class WxMsgConfigController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMsgConfigService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMsgConfigService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxMsgController.java View File

@@ -48,15 +48,15 @@ public class WxMsgController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMsgService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMsgService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java View File

@@ -48,15 +48,15 @@ public class WxMsgModelController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMsgModelService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMsgModelService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java View File

@@ -48,15 +48,15 @@ public class WxMsgSignatureController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxMsgSignatureService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMsgSignatureService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java View File

@@ -48,15 +48,15 @@ public class WxOrdersController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxOrdersService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxOrdersService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxParkController.java View File

@@ -48,15 +48,15 @@ public class WxParkController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxParkService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxParkService.getById(id));
}


+ 65
- 0
mallinkApi/src/main/java/com/simple/controller/WxParkEtcpController.java View File

@@ -0,0 +1,65 @@
package com.simple.controller;

import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;

import com.simple.domain.po.WxParkEtcp;
import com.simple.service.WxParkEtcpService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;

@RestController
@RequestMapping("wxParkEtcp")
public class WxParkEtcpController extends BaseController
{
@Autowired
private WxParkEtcpService wxParkEtcpService;

private Logger logger = Logger.getLogger(WxParkEtcpController.class);

@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxParkEtcp wxParkEtcp,Integer pageNum, Integer pageSize) {
if (null == wxParkEtcp) wxParkEtcp = new WxParkEtcp();
final PageInfo<WxParkEtcp> page = wxParkEtcpService.listAsPage(wxParkEtcp, pageNum, pageSize);
return new ResultData(page);
}

@PostMapping("add")
public ResultData add(@RequestBody WxParkEtcp wxParkEtcp) {
//Assert.notNull(wxParkEtcp.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxParkEtcpService.saveOrUpdate(wxParkEtcp);
return new ResultData();
}

@PostMapping("update")
public ResultData update(@RequestBody WxParkEtcp wxParkEtcp) {
wxParkEtcpService.saveOrUpdate(wxParkEtcp);
return new ResultData();
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxParkEtcpService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxParkEtcpService.getById(id));
}
}

+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java View File

@@ -48,15 +48,15 @@ public class WxScoreHistoryController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxScoreHistoryService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxScoreHistoryService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java View File

@@ -48,15 +48,15 @@ public class WxScoreRulesController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxScoreRulesService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxScoreRulesService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java View File

@@ -48,15 +48,15 @@ public class WxScoreValidityPeriodController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxScoreValidityPeriodService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxScoreValidityPeriodService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxShopController.java View File

@@ -48,15 +48,15 @@ public class WxShopController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxShopService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxShopService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxTagsController.java View File

@@ -48,15 +48,15 @@ public class WxTagsController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxTagsService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxTagsService.getById(id));
}


+ 4
- 4
mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java View File

@@ -48,15 +48,15 @@ public class WxWebLogController extends BaseController
}

@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData delete(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxWebLogService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true)
public ResultData findById(String id) {
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxWebLogService.getById(id));
}


+ 1
- 1
mallinkService/src/main/java/com/simple/common/IdWorker.java View File

@@ -124,7 +124,7 @@ public class IdWorker {
/** 测试 */
public static void main(String[] args) {
System.out.println(System.currentTimeMillis());
IdWorker idWorker = new IdWorker(1, 1);
IdWorker idWorker = new IdWorker(0, 0);
long startTime = System.nanoTime();
for (int i = 0; i < 50000; i++) {
long id = idWorker.nextId();


+ 7
- 7
mallinkService/src/main/java/com/simple/domain/po/WxBanners.java View File

@@ -54,8 +54,8 @@ public class WxBanners implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="链接",name="url")
private String url;
/*排序**/
@io.swagger.annotations.ApiModelProperty(value="排序",name="order")
private Integer order;
@io.swagger.annotations.ApiModelProperty(value="排序",name="sortNum")
private Integer sortNum;
/*创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime")
private Date createtime;
@@ -92,11 +92,11 @@ public class WxBanners implements Serializable {
public void setUrl(String _url) {
url = _url;
}
public Integer getOrder() {
return order;
public Integer getSortNum() {
return sortNum;
}
public void setOrder(Integer _order) {
order = _order;
public void setSortNum(Integer _sortNum) {
sortNum = _sortNum;
}
public Date getCreatetime() {
return createtime;
@@ -132,7 +132,7 @@ public class WxBanners implements Serializable {
,FacePicUrl_ASC("`facePicUrl` ASC"),FacePicUrl_DESC("`facePicUrl` DESC")
,ActivityType_ASC("`activityType` ASC"),ActivityType_DESC("`activityType` DESC")
,Url_ASC("`url` ASC"),Url_DESC("`url` DESC")
,Order_ASC("`order` ASC"),Order_DESC("`order` DESC")
,SortNum_ASC("`sortNum` ASC"),SortNum_DESC("`sortNum` DESC")
,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC")
,Uptime_ASC("`uptime` ASC"),Uptime_DESC("`uptime` DESC")
,Desc_ASC("`desc` ASC"),Desc_DESC("`desc` DESC")


+ 2
- 2
mallinkService/src/main/java/com/simple/service/WxAppinfoService.java View File

@@ -22,7 +22,7 @@ public interface WxAppinfoService {
* @param id
* @return
*/
WxAppinfo getById(String id);
WxAppinfo getById(Long id);
/**
* 保存或更新实体
@@ -36,7 +36,7 @@ public interface WxAppinfoService {
*
* @param id
*/
void deleteById(String id);
void deleteById(Long id);


+ 2
- 2
mallinkService/src/main/java/com/simple/service/WxBLogService.java View File

@@ -22,7 +22,7 @@ public interface WxBLogService {
* @param id
* @return
*/
WxBLog getById(String id);
WxBLog getById(Long id);
/**
* 保存或更新实体
@@ -36,7 +36,7 @@ public interface WxBLogService {
*
* @param id
*/
void deleteById(String id);
void deleteById(Long id);


+ 2
- 2
mallinkService/src/main/java/com/simple/service/WxBUserMerchantService.java View File

@@ -22,7 +22,7 @@ public interface WxBUserMerchantService {
* @param id
* @return
*/
WxBUserMerchant getById(String id);
WxBUserMerchant getById(Long id);
/**
* 保存或更新实体
@@ -36,7 +36,7 @@ public interface WxBUserMerchantService {
*
* @param id
*/
void deleteById(String id);
void deleteById(Long id);


+ 2
- 2
mallinkService/src/main/java/com/simple/service/WxBannersService.java View File

@@ -22,7 +22,7 @@ public interface WxBannersService {
* @param id
* @return
*/
WxBanners getById(String id);
WxBanners getById(Long id);
/**
* 保存或更新实体
@@ -36,7 +36,7 @@ public interface WxBannersService {
*
* @param id
*/
void deleteById(String id);
void deleteById(Long id);


+ 2
- 2
mallinkService/src/main/java/com/simple/service/WxBusinessService.java View File

@@ -22,7 +22,7 @@ public interface WxBusinessService {
* @param id
* @return
*/
WxBusiness getById(String id);
WxBusiness getById(Long id);
/**
* 保存或更新实体
@@ -36,7 +36,7 @@ public interface WxBusinessService {
*
* @param id
*/
void deleteById(String id);
void deleteById(Long id);


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save