From b7e9fd5cc23956889e5cad53e3bda1281c51b4c0 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 20 Aug 2018 13:27:42 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF=E5=90=8E=E5=8F=B0][=E6=B8=85?= =?UTF-8?q?=E7=90=86]:=E6=B8=85=E7=90=86B=E7=AB=AF=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxBannersController.java | 71 ---------- .../controller/WxBusinessController.java | 71 ---------- .../simple/controller/WxCLogController.java | 71 ---------- .../controller/WxCUserCarController.java | 70 --------- .../simple/controller/WxCUserController.java | 71 ---------- .../controller/WxCUserTagsController.java | 71 ---------- .../WxCouponActionLogController.java | 71 ---------- .../controller/WxCouponCarController.java | 71 ---------- .../controller/WxCouponChannelController.java | 71 ---------- .../simple/controller/WxCouponController.java | 66 ++------- .../controller/WxCouponSendController.java | 71 ---------- .../controller/WxCouponTypeController.java | 71 ---------- .../controller/WxCouponVerifyController.java | 71 ---------- .../WxDateAmountRecordController.java | 45 ------ .../controller/WxMallBuildingController.java | 71 ---------- .../simple/controller/WxMallController.java | 71 ---------- .../controller/WxMallFloorController.java | 71 ---------- .../controller/WxMerchantController.java | 71 ---------- .../controller/WxMerchantShopController.java | 71 ---------- .../WxMerchantTradeDailyController.java | 78 ---------- .../controller/WxMsgCallbackController.java | 71 ---------- .../controller/WxMsgConfigController.java | 71 ---------- .../simple/controller/WxMsgController.java | 71 ---------- .../controller/WxMsgModelController.java | 71 ---------- .../controller/WxMsgSignatureController.java | 71 ---------- .../simple/controller/WxParkController.java | 71 ---------- .../controller/WxPayOrderController.java | 133 ------------------ .../controller/WxRefundOrderController.java | 58 +++----- .../controller/WxScoreHistoryController.java | 71 ---------- .../controller/WxScoreRulesController.java | 71 ---------- .../WxScoreValidityPeriodController.java | 71 ---------- .../simple/controller/WxShopController.java | 71 ---------- .../simple/controller/WxTagsController.java | 71 ---------- .../simple/controller/WxWebLogController.java | 71 ---------- 34 files changed, 30 insertions(+), 2408 deletions(-) delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxBannersController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxBusinessController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxCLogController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxCUserCarController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxCUserController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxCUserTagsController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxCouponActionLogController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxCouponCarController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxCouponChannelController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxCouponSendController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxCouponTypeController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxCouponVerifyController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMallBuildingController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMallController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMallFloorController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMerchantController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMerchantShopController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMsgCallbackController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMsgConfigController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMsgController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMsgModelController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxMsgSignatureController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxParkController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxPayOrderController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxScoreHistoryController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxScoreRulesController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxShopController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxTagsController.java delete mode 100644 mallinkBApi/src/main/java/com/simple/controller/WxWebLogController.java diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxBannersController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBannersController.java deleted file mode 100644 index e148e2402..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxBannersController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxBanners; -import com.simple.service.WxBannersService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxBanners") -public class WxBannersController extends BaseController -{ - @Autowired - private WxBannersService wxBannersService; - - private Logger logger = Logger.getLogger(WxBannersController.class); - - @ApiOperation("分页列表接口") - @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 WxBanners wxBanners,Integer pageNum, Integer pageSize) { - if (null == wxBanners) wxBanners = new WxBanners(); - final PageInfo page = wxBannersService.listAsPage(wxBanners, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxBanners wxBanners) { - //Assert.notNull(wxBanners.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxBannersService.saveOrUpdate(wxBanners); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxBanners wxBanners) { - wxBannersService.saveOrUpdate(wxBanners); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBannersService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBusinessController.java deleted file mode 100644 index 3f0d53b90..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxBusinessController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxBusiness; -import com.simple.service.WxBusinessService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxBusiness") -public class WxBusinessController extends BaseController -{ - @Autowired - private WxBusinessService wxBusinessService; - - private Logger logger = Logger.getLogger(WxBusinessController.class); - - @ApiOperation("分页列表接口") - @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 WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { - if (null == wxBusiness) wxBusiness = new WxBusiness(); - final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxBusiness wxBusiness) { - //Assert.notNull(wxBusiness.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxBusinessService.saveOrUpdate(wxBusiness); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxBusiness wxBusiness) { - wxBusinessService.saveOrUpdate(wxBusiness); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBusinessService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCLogController.java deleted file mode 100644 index 934c12628..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCLogController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxCLog; -import com.simple.service.WxCLogService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCLog") -public class WxCLogController extends BaseController -{ - @Autowired - private WxCLogService wxCLogService; - - private Logger logger = Logger.getLogger(WxCLogController.class); - - @ApiOperation("分页列表接口") - @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 WxCLog wxCLog,Integer pageNum, Integer pageSize) { - if (null == wxCLog) wxCLog = new WxCLog(); - final PageInfo page = wxCLogService.listAsPage(wxCLog, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCLog wxCLog) { - //Assert.notNull(wxCLog.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCLogService.saveOrUpdate(wxCLog); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCLog wxCLog) { - wxCLogService.saveOrUpdate(wxCLog); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCLogService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCUserCarController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCUserCarController.java deleted file mode 100644 index 1f3136a83..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCUserCarController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.simple.controller; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -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.WxCUserCar; -import com.simple.service.WxCUserCarService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCUserCars") -public class WxCUserCarController extends BaseController -{ - @Autowired - private WxCUserCarService wxCUserCarService; - - private Logger logger = Logger.getLogger(WxCUserCarController.class); - - @ApiOperation("分页列表接口") - @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 WxCUserCar wxCUserCars,Integer pageNum, Integer pageSize) { - if (null == wxCUserCars) wxCUserCars = new WxCUserCar(); - final PageInfo page = wxCUserCarService.listAsPage(wxCUserCars, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCUserCar wxCUserCars) { - //Assert.notNull(wxCUserCars.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCUserCarService.saveOrUpdate(wxCUserCars); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCUserCar wxCUserCar) { - wxCUserCarService.saveOrUpdate(wxCUserCar); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCUserCarService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCUserCarService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCUserController.java deleted file mode 100644 index f93ce3c99..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCUserController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxCUser; -import com.simple.service.WxCUserService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCUser") -public class WxCUserController extends BaseController -{ - @Autowired - private WxCUserService wxCUserService; - - private Logger logger = Logger.getLogger(WxCUserController.class); - - @ApiOperation("分页列表接口") - @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 WxCUser wxCUser,Integer pageNum, Integer pageSize) { - if (null == wxCUser) wxCUser = new WxCUser(); - final PageInfo page = wxCUserService.listAsPage(wxCUser, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCUser wxCUser) { - //Assert.notNull(wxCUser.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCUserService.saveOrUpdate(wxCUser); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCUser wxCUser) { - wxCUserService.saveOrUpdate(wxCUser); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCUserService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCUserTagsController.java deleted file mode 100644 index 8dc774b51..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCUserTagsController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxCUserTags; -import com.simple.service.WxCUserTagsService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCUserTags") -public class WxCUserTagsController extends BaseController -{ - @Autowired - private WxCUserTagsService wxCUserTagsService; - - private Logger logger = Logger.getLogger(WxCUserTagsController.class); - - @ApiOperation("分页列表接口") - @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 WxCUserTags wxCUserTags,Integer pageNum, Integer pageSize) { - if (null == wxCUserTags) wxCUserTags = new WxCUserTags(); - final PageInfo page = wxCUserTagsService.listAsPage(wxCUserTags, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCUserTags wxCUserTags) { - //Assert.notNull(wxCUserTags.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCUserTagsService.saveOrUpdate(wxCUserTags); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCUserTags wxCUserTags) { - wxCUserTagsService.saveOrUpdate(wxCUserTags); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCUserTagsService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponActionLogController.java deleted file mode 100644 index 8b0605cc3..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponActionLogController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxCouponActionLog; -import com.simple.service.WxCouponActionLogService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCouponActionLog") -public class WxCouponActionLogController extends BaseController -{ - @Autowired - private WxCouponActionLogService wxCouponActionLogService; - - private Logger logger = Logger.getLogger(WxCouponActionLogController.class); - - @ApiOperation("分页列表接口") - @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 WxCouponActionLog wxCouponActionLog,Integer pageNum, Integer pageSize) { - if (null == wxCouponActionLog) wxCouponActionLog = new WxCouponActionLog(); - final PageInfo page = wxCouponActionLogService.listAsPage(wxCouponActionLog, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponActionLog wxCouponActionLog) { - //Assert.notNull(wxCouponActionLog.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponActionLogService.saveOrUpdate(wxCouponActionLog); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponActionLog wxCouponActionLog) { - wxCouponActionLogService.saveOrUpdate(wxCouponActionLog); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponActionLogService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponCarController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponCarController.java deleted file mode 100644 index 6da6ef31d..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponCarController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxCouponCar; -import com.simple.service.WxCouponCarService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCouponCar") -public class WxCouponCarController extends BaseController -{ - @Autowired - private WxCouponCarService wxCouponCarService; - - private Logger logger = Logger.getLogger(WxCouponCarController.class); - - @ApiOperation("分页列表接口") - @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 WxCouponCar wxCouponCar,Integer pageNum, Integer pageSize) { - if (null == wxCouponCar) wxCouponCar = new WxCouponCar(); - final PageInfo page = wxCouponCarService.listAsPage(wxCouponCar, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponCar wxCouponCar) { - //Assert.notNull(wxCouponCar.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponCarService.saveOrUpdate(wxCouponCar); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponCar wxCouponCar) { - wxCouponCarService.saveOrUpdate(wxCouponCar); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCouponCarService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponCarService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponChannelController.java deleted file mode 100644 index f86461c8b..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponChannelController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxCouponChannel; -import com.simple.service.WxCouponChannelService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCouponChannel") -public class WxCouponChannelController extends BaseController -{ - @Autowired - private WxCouponChannelService wxCouponChannelService; - - private Logger logger = Logger.getLogger(WxCouponChannelController.class); - - @ApiOperation("分页列表接口") - @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 WxCouponChannel wxCouponChannel,Integer pageNum, Integer pageSize) { - if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); - final PageInfo page = wxCouponChannelService.listAsPage(wxCouponChannel, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponChannel wxCouponChannel) { - //Assert.notNull(wxCouponChannel.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponChannelService.saveOrUpdate(wxCouponChannel); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { - wxCouponChannelService.saveOrUpdate(wxCouponChannel); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCouponChannelService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponChannelService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java index a74c1a659..670e08e9c 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java @@ -1,71 +1,31 @@ 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.WxCoupon; import com.simple.service.WxCouponService; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("wxCoupon") -public class WxCouponController extends BaseController -{ +@RequestMapping("/api/coupon") +public class WxCouponController extends BaseController { private Logger logger = Logger.getLogger(WxCouponController.class); - @Autowired + @Autowired private WxCouponService wxCouponService; - @ApiOperation("分页列表接口") - @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 WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { - if (null == wxCoupon) wxCoupon = new WxCoupon(); - final PageInfo page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); - return new ResultData(page); - } - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCoupon wxCoupon) { - //Assert.notNull(wxCoupon.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponService.saveOrUpdate(wxCoupon); - return new ResultData(); + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS, "查询成功", wxCouponService.getById(id)); } - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCoupon wxCoupon) { - wxCouponService.saveOrUpdate(wxCoupon); - return new ResultData(); - } - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponService.getById(id)); - } - - - } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponSendController.java deleted file mode 100644 index b43a78ab1..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponSendController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxCouponSend; -import com.simple.service.WxCouponSendService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCouponSend") -public class WxCouponSendController extends BaseController -{ - @Autowired - private WxCouponSendService wxCouponSendService; - - private Logger logger = Logger.getLogger(WxCouponSendController.class); - - @ApiOperation("分页列表接口") - @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 WxCouponSend wxCouponSend,Integer pageNum, Integer pageSize) { - if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); - final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponSend wxCouponSend) { - //Assert.notNull(wxCouponSend.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponSendService.saveOrUpdate(wxCouponSend); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponSend wxCouponSend) { - wxCouponSendService.saveOrUpdate(wxCouponSend); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCouponSendService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponSendService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponTypeController.java deleted file mode 100644 index e61f27b76..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponTypeController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxCouponType; -import com.simple.service.WxCouponTypeService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCouponType") -public class WxCouponTypeController extends BaseController -{ - @Autowired - private WxCouponTypeService wxCouponTypeService; - - private Logger logger = Logger.getLogger(WxCouponTypeController.class); - - @ApiOperation("分页列表接口") - @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 WxCouponType wxCouponType,Integer pageNum, Integer pageSize) { - if (null == wxCouponType) wxCouponType = new WxCouponType(); - final PageInfo page = wxCouponTypeService.listAsPage(wxCouponType, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponType wxCouponType) { - //Assert.notNull(wxCouponType.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponTypeService.saveOrUpdate(wxCouponType); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponType wxCouponType) { - wxCouponTypeService.saveOrUpdate(wxCouponType); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponTypeService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponVerifyController.java deleted file mode 100644 index 95b91de39..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponVerifyController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxCouponVerify; -import com.simple.service.WxCouponVerifyService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCouponVerify") -public class WxCouponVerifyController extends BaseController -{ - @Autowired - private WxCouponVerifyService wxCouponVerifyService; - - private Logger logger = Logger.getLogger(WxCouponVerifyController.class); - - @ApiOperation("分页列表接口") - @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 WxCouponVerify wxCouponVerify,Integer pageNum, Integer pageSize) { - if (null == wxCouponVerify) wxCouponVerify = new WxCouponVerify(); - final PageInfo page = wxCouponVerifyService.listAsPage(wxCouponVerify, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponVerify wxCouponVerify) { - //Assert.notNull(wxCouponVerify.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponVerifyService.saveOrUpdate(wxCouponVerify); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponVerify wxCouponVerify) { - wxCouponVerifyService.saveOrUpdate(wxCouponVerify); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCouponVerifyService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxCouponVerifyService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java index d00ea71a0..5fa00b2eb 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java @@ -62,50 +62,5 @@ public class WxDateAmountRecordController extends BaseController } return list; } - - -// @ApiOperation("分页列表接口") -// @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 WxDateAmountRecord wxDateAmountRecord,Integer pageNum, Integer pageSize) { -// if (null == wxDateAmountRecord) wxDateAmountRecord = new WxDateAmountRecord(); -// final PageInfo page = wxDateAmountRecordService.listAsPage(wxDateAmountRecord, pageNum, pageSize); -// return new ResultData(page); -// } - -// @ApiOperation("新增接口") -// @PostMapping("add") -// public ResultData add(@RequestBody WxDateAmountRecord wxDateAmountRecord) { -// //Assert.notNull(wxDateAmountRecord.getName(), "角色名不能为空"); -// //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); -// wxDateAmountRecordService.saveOrUpdate(wxDateAmountRecord); -// return new ResultData(); -// } -// -// @ApiOperation("根据id更新接口") -// @PostMapping("update") -// public ResultData update(@RequestBody WxDateAmountRecord wxDateAmountRecord) { -// wxDateAmountRecordService.saveOrUpdate(wxDateAmountRecord); -// return new ResultData(); -// } -// -// @ApiOperation("根据id删除接口") -// @GetMapping("/del") -// @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) -// public ResultData delete(Long id) { -// wxDateAmountRecordService.deleteById(id); -// return new ResultData(Result.SUCCESS, "删除成功", null); -// } -// -// @ApiOperation("根据id查询接口") -// @GetMapping("/findById") -// @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) -// public ResultData findById(Long id) { -// return new ResultData(Result.SUCCESS,"查询成功",wxDateAmountRecordService.getById(id)); -// } - - } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallBuildingController.java deleted file mode 100644 index 170a712bb..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMallBuildingController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxMallBuilding; -import com.simple.service.WxMallBuildingService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxMallBuilding") -public class WxMallBuildingController extends BaseController -{ - @Autowired - private WxMallBuildingService wxMallBuildingService; - - private Logger logger = Logger.getLogger(WxMallBuildingController.class); - - @ApiOperation("分页列表接口") - @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 WxMallBuilding wxMallBuilding,Integer pageNum, Integer pageSize) { - if (null == wxMallBuilding) wxMallBuilding = new WxMallBuilding(); - final PageInfo page = wxMallBuildingService.listAsPage(wxMallBuilding, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMallBuilding wxMallBuilding) { - //Assert.notNull(wxMallBuilding.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMallBuildingService.saveOrUpdate(wxMallBuilding); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMallBuilding wxMallBuilding) { - wxMallBuildingService.saveOrUpdate(wxMallBuilding); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMallBuildingService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java deleted file mode 100644 index def24e2a4..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxMall; -import com.simple.service.WxMallService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxMall") -public class WxMallController extends BaseController -{ - @Autowired - private WxMallService wxMallService; - - private Logger logger = Logger.getLogger(WxMallController.class); - - @ApiOperation("分页列表接口") - @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 WxMall wxMall,Integer pageNum, Integer pageSize) { - if (null == wxMall) wxMall = new WxMall(); - final PageInfo page = wxMallService.listAsPage(wxMall, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMall wxMall) { - //Assert.notNull(wxMall.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMallService.saveOrUpdate(wxMall); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMall wxMall) { - wxMallService.saveOrUpdate(wxMall); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMallService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallFloorController.java deleted file mode 100644 index 23e580207..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMallFloorController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxMallFloor; -import com.simple.service.WxMallFloorService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxMallFloor") -public class WxMallFloorController extends BaseController -{ - @Autowired - private WxMallFloorService wxMallFloorService; - - private Logger logger = Logger.getLogger(WxMallFloorController.class); - - @ApiOperation("分页列表接口") - @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 WxMallFloor wxMallFloor,Integer pageNum, Integer pageSize) { - if (null == wxMallFloor) wxMallFloor = new WxMallFloor(); - final PageInfo page = wxMallFloorService.listAsPage(wxMallFloor, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMallFloor wxMallFloor) { - //Assert.notNull(wxMallFloor.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMallFloorService.saveOrUpdate(wxMallFloor); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMallFloor wxMallFloor) { - wxMallFloorService.saveOrUpdate(wxMallFloor); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMallFloorService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantController.java deleted file mode 100644 index 91e177f88..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxMerchant; -import com.simple.service.WxMerchantService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxMerchant") -public class WxMerchantController extends BaseController -{ - @Autowired - private WxMerchantService wxMerchantService; - - private Logger logger = Logger.getLogger(WxMerchantController.class); - - @ApiOperation("分页列表接口") - @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 WxMerchant wxMerchant,Integer pageNum, Integer pageSize) { - if (null == wxMerchant) wxMerchant = new WxMerchant(); - final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMerchant wxMerchant) { - //Assert.notNull(wxMerchant.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMerchantService.saveOrUpdate(wxMerchant); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMerchant wxMerchant) { - wxMerchantService.saveOrUpdate(wxMerchant); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMerchantService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantShopController.java deleted file mode 100644 index f0c78f729..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantShopController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxMerchantShop; -import com.simple.service.WxMerchantShopService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxMerchantShop") -public class WxMerchantShopController extends BaseController -{ - @Autowired - private WxMerchantShopService wxMerchantShopService; - - private Logger logger = Logger.getLogger(WxMerchantShopController.class); - - @ApiOperation("分页列表接口") - @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 WxMerchantShop wxMerchantShop,Integer pageNum, Integer pageSize) { - if (null == wxMerchantShop) wxMerchantShop = new WxMerchantShop(); - final PageInfo page = wxMerchantShopService.listAsPage(wxMerchantShop, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMerchantShop wxMerchantShop) { - //Assert.notNull(wxMerchantShop.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMerchantShopService.saveOrUpdate(wxMerchantShop); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMerchantShop wxMerchantShop) { - wxMerchantShopService.saveOrUpdate(wxMerchantShop); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMerchantShopService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java deleted file mode 100644 index 0303f9590..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java +++ /dev/null @@ -1,78 +0,0 @@ -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.WxMerchantTradeDaily; -import com.simple.service.WxMerchantTradeDailyService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("/api/wxMerchantTradeDaily") -public class WxMerchantTradeDailyController extends BaseController -{ - @Autowired - private WxMerchantTradeDailyService wxMerchantTradeDailyService; - - private Logger logger = Logger.getLogger(WxMerchantTradeDailyController.class); - - @ApiOperation("分页列表接口") - @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 WxMerchantTradeDaily wxMerchantTradeDaily,Integer pageNum, Integer pageSize) { - if (null == wxMerchantTradeDaily) wxMerchantTradeDaily = new WxMerchantTradeDaily(); - final PageInfo page = wxMerchantTradeDailyService.listAsPage(wxMerchantTradeDaily, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { - //Assert.notNull(wxMerchantTradeDaily.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { - wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxMerchantTradeDailyService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMerchantTradeDailyService.getById(id)); - } - - @ApiOperation("上报每日解单") - @GetMapping("/reportDailyVolume") - @ApiImplicitParam(name="volume",value="总金额(分)",dataType="Integer", paramType = "query",required=true) - public ResultData saveDailyTradingVolume(Integer volume) { - return wxMerchantTradeDailyService.saveDailyTradingVolume(getUser().getId(),volume); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgCallbackController.java deleted file mode 100644 index fe83b1398..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMsgCallbackController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxMsgCallback; -import com.simple.service.WxMsgCallbackService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxMsgCallback") -public class WxMsgCallbackController extends BaseController -{ - @Autowired - private WxMsgCallbackService wxMsgCallbackService; - - private Logger logger = Logger.getLogger(WxMsgCallbackController.class); - - @ApiOperation("分页列表接口") - @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 WxMsgCallback wxMsgCallback,Integer pageNum, Integer pageSize) { - if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); - final PageInfo page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMsgCallback wxMsgCallback) { - //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgCallbackService.saveOrUpdate(wxMsgCallback); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMsgCallback wxMsgCallback) { - wxMsgCallbackService.saveOrUpdate(wxMsgCallback); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxMsgCallbackService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgCallbackService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgConfigController.java deleted file mode 100644 index 7ec2199c4..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMsgConfigController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxMsgConfig; -import com.simple.service.WxMsgConfigService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxMsgConfig") -public class WxMsgConfigController extends BaseController -{ - @Autowired - private WxMsgConfigService wxMsgConfigService; - - private Logger logger = Logger.getLogger(WxMsgConfigController.class); - - @ApiOperation("分页列表接口") - @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 WxMsgConfig wxMsgConfig,Integer pageNum, Integer pageSize) { - if (null == wxMsgConfig) wxMsgConfig = new WxMsgConfig(); - final PageInfo page = wxMsgConfigService.listAsPage(wxMsgConfig, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMsgConfig wxMsgConfig) { - //Assert.notNull(wxMsgConfig.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgConfigService.saveOrUpdate(wxMsgConfig); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) { - wxMsgConfigService.saveOrUpdate(wxMsgConfig); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgConfigService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMsgController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgController.java deleted file mode 100644 index e97b4a3c6..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMsgController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxMsg; -import com.simple.service.WxMsgService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxMsg") -public class WxMsgController extends BaseController -{ - @Autowired - private WxMsgService wxMsgService; - - private Logger logger = Logger.getLogger(WxMsgController.class); - - @ApiOperation("分页列表接口") - @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 WxMsg wxMsg,Integer pageNum, Integer pageSize) { - if (null == wxMsg) wxMsg = new WxMsg(); - final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMsg wxMsg) { - //Assert.notNull(wxMsg.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgService.saveOrUpdate(wxMsg); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMsg wxMsg) { - wxMsgService.saveOrUpdate(wxMsg); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgModelController.java deleted file mode 100644 index 38a746c01..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMsgModelController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxMsgModel; -import com.simple.service.WxMsgModelService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxMsgModel") -public class WxMsgModelController extends BaseController -{ - @Autowired - private WxMsgModelService wxMsgModelService; - - private Logger logger = Logger.getLogger(WxMsgModelController.class); - - @ApiOperation("分页列表接口") - @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 WxMsgModel wxMsgModel,Integer pageNum, Integer pageSize) { - if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); - final PageInfo page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMsgModel wxMsgModel) { - //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgModelService.saveOrUpdate(wxMsgModel); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMsgModel wxMsgModel) { - wxMsgModelService.saveOrUpdate(wxMsgModel); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgModelService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgSignatureController.java deleted file mode 100644 index e1bc56cce..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMsgSignatureController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxMsgSignature; -import com.simple.service.WxMsgSignatureService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxMsgSignature") -public class WxMsgSignatureController extends BaseController -{ - @Autowired - private WxMsgSignatureService wxMsgSignatureService; - - private Logger logger = Logger.getLogger(WxMsgSignatureController.class); - - @ApiOperation("分页列表接口") - @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 WxMsgSignature wxMsgSignature,Integer pageNum, Integer pageSize) { - if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); - final PageInfo page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxMsgSignature wxMsgSignature) { - //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxMsgSignatureService.saveOrUpdate(wxMsgSignature); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxMsgSignature wxMsgSignature) { - wxMsgSignatureService.saveOrUpdate(wxMsgSignature); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxMsgSignatureService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkBApi/src/main/java/com/simple/controller/WxParkController.java deleted file mode 100644 index 2f7309c99..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxParkController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxPark; -import com.simple.service.WxParkService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxPark") -public class WxParkController extends BaseController -{ - @Autowired - private WxParkService wxParkService; - - private Logger logger = Logger.getLogger(WxParkController.class); - - @ApiOperation("分页列表接口") - @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 WxPark wxPark,Integer pageNum, Integer pageSize) { - if (null == wxPark) wxPark = new WxPark(); - final PageInfo page = wxParkService.listAsPage(wxPark, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxPark wxPark) { - //Assert.notNull(wxPark.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxParkService.saveOrUpdate(wxPark); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxPark wxPark) { - wxParkService.saveOrUpdate(wxPark); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxParkService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxPayOrderController.java deleted file mode 100644 index 13709709f..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxPayOrderController.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.simple.controller; - -import com.simple.common.ErrorCode; -import com.simple.domain.po.WxAppinfo; -import com.simple.domain.po.WxCUser; -import com.simple.enums.EnumPayStatus; -import com.simple.enums.EnumPayWay; -import com.simple.exception.BizMessageException; -import com.simple.exception.MallinkException; -import com.simple.pay.WxPayment; -import com.simple.utils.IPUtil; -import org.apache.commons.codec.Charsets; -import org.apache.log4j.Logger; -import org.apache.commons.io.IOUtils; -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.WxPayOrder; -import com.simple.service.WxPayOrderService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -import javax.servlet.http.HttpServletRequest; -import java.nio.charset.Charset; -import java.util.Map; - -@RestController -@RequestMapping("wxPayOrder") -public class WxPayOrderController extends BaseController { - - private Logger logger = Logger.getLogger(WxPayOrderController.class); - - @Autowired - private WxPayOrderService wxPayOrderService; - - /** - * - * @return 接收微信异步通知 - * @throws Exception 可能产生的任何异常 - */ - @RequestMapping(value = "/notify", method = RequestMethod.POST) - public String __doNotify(HttpServletRequest request) throws Exception { - Map paramMap = null; - String response; - try { - String xml = IOUtils.toString(request.getInputStream(), Charset.forName("UTF-8")); - paramMap = WxPayment.xmlToMap(xml); - logger.info("payment wxpay, notify, param: " + paramMap.toString() ); - response = wxPayOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP); - logger.info("payment wxpay, notify success, req : " + paramMap.toString() + ", resp: " + response.toString()); - return response; - } catch (BizMessageException e) { - logger.error("payment wxpay, notify error, req: " + paramMap.toString() + ", e:" + e.getLocalizedMessage()); - return e.getMessage(); - } catch (MallinkException e) { - logger.error("payment wxpay, notify error, req: " + paramMap.toString() + ", e:" +e.getLocalizedMessage()); - return e.getMessage(); - } catch (Exception e) { - logger.error("payment wxpay, order create error, req: " + paramMap.toString() + ", e: " + e.getMessage()); - return e.getMessage(); - } - } - - /** - * - * @return 同步回调(订单状态主动检查) - * @throws Exception 可能产生的任何异常 - */ - @RequestMapping(value = "callback", method = {RequestMethod.GET, RequestMethod.POST}) - public String __doCallback(HttpServletRequest request) throws Exception { - - logger.info("payment wxpay, callback,request:" + request.toString()); - - return "\n" + - "\n" + - "\n" + - "\n" + - " \n" + - " \n" + - "\n"; - } - - @ApiOperation("分页列表接口") - @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 WxPayOrder wxPayOrder,Integer pageNum, Integer pageSize) { - if (null == wxPayOrder) wxPayOrder = new WxPayOrder(); - final PageInfo page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxPayOrder wxPayOrder) { - //Assert.notNull(wxPayOrder.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxPayOrderService.saveOrUpdate(wxPayOrder); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxPayOrder wxPayOrder) { - wxPayOrderService.saveOrUpdate(wxPayOrder); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxPayOrderService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxPayOrderService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java index b86f6a1e9..054dd7615 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java @@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.*; +import com.simple.domain.po.WxAppinfo; +import com.simple.domain.po.WxMerchantBUser; +import com.simple.domain.po.WxRefundOrder; import com.simple.enums.EnumPayWay; import com.simple.exception.MallinkException; import com.simple.service.WxRefundOrderService; @@ -20,11 +22,10 @@ import java.util.Map; @RestController @RequestMapping("/api/refund") -public class WxRefundOrderController extends BaseController -{ +public class WxRefundOrderController extends BaseController { private Logger logger = Logger.getLogger(WxRefundOrderController.class); - @Autowired + @Autowired private WxRefundOrderService wxRefundOrderService; @ApiOperation(value = "发起退款", notes = "{\"orderId\":,\"string\", \"payOrderId\":\"string\"}") @@ -67,49 +68,24 @@ public class WxRefundOrderController extends BaseController return new ResultData(ErrorCode.REFUND_ORDER_ERROR); } } - - @ApiOperation("分页列表接口") + + @ApiOperation("分页列表接口") @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 WxRefundOrder wxRefundOrder,Integer pageNum, Integer pageSize) { - if (null == wxRefundOrder) wxRefundOrder = new WxRefundOrder(); + @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 WxRefundOrder wxRefundOrder, Integer pageNum, Integer pageSize) { + if (null == wxRefundOrder) wxRefundOrder = new WxRefundOrder(); final PageInfo page = wxRefundOrderService.listAsPage(wxRefundOrder, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxRefundOrder wxRefundOrder) { - //Assert.notNull(wxRefundOrder.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxRefundOrderService.saveOrUpdate(wxRefundOrder); - return new ResultData(); + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS, "查询成功", wxRefundOrderService.getById(id)); } - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxRefundOrder wxRefundOrder) { - wxRefundOrderService.saveOrUpdate(wxRefundOrder); - return new ResultData(); - } - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxRefundOrderService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxRefundOrderService.getById(id)); - } - - - } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkBApi/src/main/java/com/simple/controller/WxScoreHistoryController.java deleted file mode 100644 index 56794ac8a..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxScoreHistoryController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxScoreHistory; -import com.simple.service.WxScoreHistoryService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxScoreHistory") -public class WxScoreHistoryController extends BaseController -{ - @Autowired - private WxScoreHistoryService wxScoreHistoryService; - - private Logger logger = Logger.getLogger(WxScoreHistoryController.class); - - @ApiOperation("分页列表接口") - @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 WxScoreHistory wxScoreHistory,Integer pageNum, Integer pageSize) { - if (null == wxScoreHistory) wxScoreHistory = new WxScoreHistory(); - final PageInfo page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxScoreHistory wxScoreHistory) { - //Assert.notNull(wxScoreHistory.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxScoreHistoryService.saveOrUpdate(wxScoreHistory); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxScoreHistory wxScoreHistory) { - wxScoreHistoryService.saveOrUpdate(wxScoreHistory); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxScoreHistoryService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkBApi/src/main/java/com/simple/controller/WxScoreRulesController.java deleted file mode 100644 index 21cb402b7..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxScoreRulesController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxScoreRules; -import com.simple.service.WxScoreRulesService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxScoreRules") -public class WxScoreRulesController extends BaseController -{ - @Autowired - private WxScoreRulesService wxScoreRulesService; - - private Logger logger = Logger.getLogger(WxScoreRulesController.class); - - @ApiOperation("分页列表接口") - @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 WxScoreRules wxScoreRules,Integer pageNum, Integer pageSize) { - if (null == wxScoreRules) wxScoreRules = new WxScoreRules(); - final PageInfo page = wxScoreRulesService.listAsPage(wxScoreRules, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxScoreRules wxScoreRules) { - //Assert.notNull(wxScoreRules.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxScoreRulesService.saveOrUpdate(wxScoreRules); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxScoreRules wxScoreRules) { - wxScoreRulesService.saveOrUpdate(wxScoreRules); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxScoreRulesService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkBApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java deleted file mode 100644 index 1271b55d5..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxScoreValidityPeriod; -import com.simple.service.WxScoreValidityPeriodService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxScoreValidityPeriod") -public class WxScoreValidityPeriodController extends BaseController -{ - @Autowired - private WxScoreValidityPeriodService wxScoreValidityPeriodService; - - private Logger logger = Logger.getLogger(WxScoreValidityPeriodController.class); - - @ApiOperation("分页列表接口") - @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 WxScoreValidityPeriod wxScoreValidityPeriod,Integer pageNum, Integer pageSize) { - if (null == wxScoreValidityPeriod) wxScoreValidityPeriod = new WxScoreValidityPeriod(); - final PageInfo page = wxScoreValidityPeriodService.listAsPage(wxScoreValidityPeriod, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxScoreValidityPeriod wxScoreValidityPeriod) { - //Assert.notNull(wxScoreValidityPeriod.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxScoreValidityPeriodService.saveOrUpdate(wxScoreValidityPeriod); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxScoreValidityPeriod wxScoreValidityPeriod) { - wxScoreValidityPeriodService.saveOrUpdate(wxScoreValidityPeriod); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxScoreValidityPeriodService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxShopController.java b/mallinkBApi/src/main/java/com/simple/controller/WxShopController.java deleted file mode 100644 index 5685653d4..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxShopController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxShop; -import com.simple.service.WxShopService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxShop") -public class WxShopController extends BaseController -{ - @Autowired - private WxShopService wxShopService; - - private Logger logger = Logger.getLogger(WxShopController.class); - - @ApiOperation("分页列表接口") - @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 WxShop wxShop,Integer pageNum, Integer pageSize) { - if (null == wxShop) wxShop = new WxShop(); - final PageInfo page = wxShopService.listAsPage(wxShop, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxShop wxShop) { - //Assert.notNull(wxShop.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxShopService.saveOrUpdate(wxShop); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxShop wxShop) { - wxShopService.saveOrUpdate(wxShop); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxShopService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxTagsController.java b/mallinkBApi/src/main/java/com/simple/controller/WxTagsController.java deleted file mode 100644 index 52929d3c4..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxTagsController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxTags; -import com.simple.service.WxTagsService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxTags") -public class WxTagsController extends BaseController -{ - @Autowired - private WxTagsService wxTagsService; - - private Logger logger = Logger.getLogger(WxTagsController.class); - - @ApiOperation("分页列表接口") - @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 WxTags wxTags,Integer pageNum, Integer pageSize) { - if (null == wxTags) wxTags = new WxTags(); - final PageInfo page = wxTagsService.listAsPage(wxTags, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxTags wxTags) { - //Assert.notNull(wxTags.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxTagsService.saveOrUpdate(wxTags); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxTags wxTags) { - wxTagsService.saveOrUpdate(wxTags); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxTagsService.getById(id)); - } - - - -} diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxWebLogController.java deleted file mode 100644 index a74b33363..000000000 --- a/mallinkBApi/src/main/java/com/simple/controller/WxWebLogController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxWebLog; -import com.simple.service.WxWebLogService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxWebLog") -public class WxWebLogController extends BaseController -{ - @Autowired - private WxWebLogService wxWebLogService; - - private Logger logger = Logger.getLogger(WxWebLogController.class); - - @ApiOperation("分页列表接口") - @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 WxWebLog wxWebLog,Integer pageNum, Integer pageSize) { - if (null == wxWebLog) wxWebLog = new WxWebLog(); - final PageInfo page = wxWebLogService.listAsPage(wxWebLog, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxWebLog wxWebLog) { - //Assert.notNull(wxWebLog.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxWebLogService.saveOrUpdate(wxWebLog); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxWebLog wxWebLog) { - wxWebLogService.saveOrUpdate(wxWebLog); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @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); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxWebLogService.getById(id)); - } - - - -}