diff --git a/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java b/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java index 48b530085..5b537c7e7 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/RoleController.java @@ -2,7 +2,7 @@ package com.simple.controller; import com.simple.domain.po.MallRole; import com.simple.service.MallRoleService; -import com.simple.service.MallUserRolePermissionService; +import com.simple.service.MallRolePermissionService; import io.swagger.annotations.Api; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +26,7 @@ public class RoleController { private MallRoleService sysRoleService; @Autowired - private MallUserRolePermissionService SysRolePermissionService; + private MallRolePermissionService SysRolePermissionService; private Logger logger = Logger.getLogger(RoleController.class); diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java new file mode 100644 index 000000000..95b91de39 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponVerifyController.java @@ -0,0 +1,71 @@ +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/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java new file mode 100644 index 000000000..5b7ec6a03 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -0,0 +1,71 @@ +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.WxMerchantBUser; +import com.simple.service.WxMerchantBUserService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMerchantBUser") +public class WxMerchantBUserController extends BaseController +{ + @Autowired + private WxMerchantBUserService wxMerchantBUserService; + + private Logger logger = Logger.getLogger(WxMerchantBUserController.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 WxMerchantBUser wxMerchantBUser,Integer pageNum, Integer pageSize) { + if (null == wxMerchantBUser) wxMerchantBUser = new WxMerchantBUser(); + final PageInfo page = wxMerchantBUserService.listAsPage(wxMerchantBUser, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMerchantBUser wxMerchantBUser) { + //Assert.notNull(wxMerchantBUser.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMerchantBUser wxMerchantBUser) { + wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMerchantBUserService.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,"查询成功",wxMerchantBUserService.getById(id)); + } + + + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java new file mode 100644 index 000000000..eccfc627a --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -0,0 +1,71 @@ +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("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)); + } + + + +} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java new file mode 100644 index 000000000..fe83b1398 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgCallbackController.java @@ -0,0 +1,71 @@ +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/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java index 036c1bb97..39879d02c 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java @@ -81,13 +81,15 @@ public class WxMsgController extends BaseController return new ResultData(Result.SUCCESS,"上传文件不能为空"); } - return wxMsgService.sendmsgbyexcel(file,wxMsg); + //wxMsgService.sendmsgbyexcel(file,wxMsg); + return new ResultData(); } @RequestMapping("/sendmsgbylabel") public ResultData sendmsgbylabel(@RequestBody WxMsg wxMsg) throws Exception { - return wxMsgService.sendmsgbylabel(wxMsg); + //wxMsgService.sendmsgbylabel(wxMsg); + return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java index cd515a386..508200fad 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java @@ -37,13 +37,15 @@ public class WxMsgModelController extends BaseController public ResultData add(@RequestBody WxMsgModel wxMsgModel) { //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - return wxMsgModelService.saveOrUpdate(wxMsgModel); + //return wxMsgModelService.saveOrUpdate(wxMsgModel); + return new ResultData(); } @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxMsgModel wxMsgModel) { - return wxMsgModelService.saveOrUpdate(wxMsgModel); + wxMsgModelService.saveOrUpdate(wxMsgModel); + return new ResultData(); } @ApiOperation("根据id删除接口") diff --git a/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java index 4bfeeef6b..d228e669b 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxAppinfoController.java @@ -13,6 +13,7 @@ import com.simple.domain.po.WxAppinfo; import com.simple.service.WxAppinfoService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxAppinfo") @@ -22,7 +23,8 @@ public class WxAppinfoController extends BaseController private WxAppinfoService wxAppinfoService; private Logger logger = Logger.getLogger(WxAppinfoController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxAppinfoController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxAppinfo wxAppinfo) { //Assert.notNull(wxAppinfo.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxAppinfoController extends BaseController return new ResultData(); } + @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxAppinfo wxAppinfo) { wxAppinfoService.saveOrUpdate(wxAppinfo); return new ResultData(); } + @ApiOperation("根据id删除接口") @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { @@ -54,6 +59,7 @@ public class WxAppinfoController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java index 150bd10f9..f438992e0 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxBLogController.java @@ -13,6 +13,7 @@ import com.simple.domain.po.WxBLog; import com.simple.service.WxBLogService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxBLog") @@ -22,7 +23,8 @@ public class WxBLogController extends BaseController private WxBLogService wxBLogService; private Logger logger = Logger.getLogger(WxBLogController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxBLogController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxBLog wxBLog) { //Assert.notNull(wxBLog.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxBLogController extends BaseController return new ResultData(); } + @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxBLog wxBLog) { wxBLogService.saveOrUpdate(wxBLog); return new ResultData(); } + @ApiOperation("根据id删除接口") @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { @@ -54,6 +59,7 @@ public class WxBLogController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java b/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java index 32f83d8c0..e148e2402 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxBannersController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxBannersController extends BaseController private WxBannersService wxBannersService; private Logger logger = Logger.getLogger(WxBannersController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxBannersController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxBanners wxBanners) { //Assert.notNull(wxBanners.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxBannersController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxBannersController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java index adea1acf8..3f0d53b90 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxBusinessController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxBusinessController extends BaseController private WxBusinessService wxBusinessService; private Logger logger = Logger.getLogger(WxBusinessController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxBusinessController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxBusiness wxBusiness) { //Assert.notNull(wxBusiness.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxBusinessController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxBusinessController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java index f198c1562..934c12628 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCLogController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxCLogController extends BaseController private WxCLogService wxCLogService; private Logger logger = Logger.getLogger(WxCLogController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxCLogController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCLog wxCLog) { //Assert.notNull(wxCLog.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxCLogController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxCLogController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java index 8a9478d3a..8b9374f21 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserCarsController.java @@ -13,6 +13,7 @@ import com.simple.domain.po.WxCUserCars; import com.simple.service.WxCUserCarsService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxCUserCars") @@ -22,7 +23,8 @@ public class WxCUserCarsController extends BaseController private WxCUserCarsService wxCUserCarsService; private Logger logger = Logger.getLogger(WxCUserCarsController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxCUserCarsController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCUserCars wxCUserCars) { //Assert.notNull(wxCUserCars.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxCUserCarsController extends BaseController return new ResultData(); } + @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxCUserCars wxCUserCars) { wxCUserCarsService.saveOrUpdate(wxCUserCars); return new ResultData(); } + @ApiOperation("根据id删除接口") @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { @@ -54,6 +59,7 @@ public class WxCUserCarsController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java index cc6dfd119..f93ce3c99 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxCUserController extends BaseController private WxCUserService wxCUserService; private Logger logger = Logger.getLogger(WxCUserController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxCUserController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCUser wxCUser) { //Assert.notNull(wxCUser.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxCUserController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxCUserController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java index be11d6158..8dc774b51 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCUserTagsController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxCUserTagsController extends BaseController private WxCUserTagsService wxCUserTagsService; private Logger logger = Logger.getLogger(WxCUserTagsController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxCUserTagsController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCUserTags wxCUserTags) { //Assert.notNull(wxCUserTags.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxCUserTagsController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxCUserTagsController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java index e5d515591..8b0605cc3 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponActionLogController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxCouponActionLogController extends BaseController private WxCouponActionLogService wxCouponActionLogService; private Logger logger = Logger.getLogger(WxCouponActionLogController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxCouponActionLogController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponActionLog wxCouponActionLog) { //Assert.notNull(wxCouponActionLog.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxCouponActionLogController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxCouponActionLogController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java index c91303e00..dd39b05b8 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponController.java @@ -13,6 +13,7 @@ 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; @RestController @RequestMapping("wxCoupon") @@ -22,7 +23,8 @@ public class WxCouponController extends BaseController private WxCouponService wxCouponService; private Logger logger = Logger.getLogger(WxCouponController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxCouponController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCoupon wxCoupon) { //Assert.notNull(wxCoupon.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxCouponController extends BaseController return new ResultData(); } + @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) { @@ -54,6 +59,7 @@ public class WxCouponController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponSendController.java new file mode 100644 index 000000000..b43a78ab1 --- /dev/null +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponSendController.java @@ -0,0 +1,71 @@ +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/mallinkApi/src/main/java/com/simple/controller/WxCouponTargetController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponTargetController.java new file mode 100644 index 000000000..38e656110 --- /dev/null +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponTargetController.java @@ -0,0 +1,71 @@ +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.WxCouponTarget; +import com.simple.service.WxCouponTargetService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponTarget") +public class WxCouponTargetController extends BaseController +{ + @Autowired + private WxCouponTargetService wxCouponTargetService; + + private Logger logger = Logger.getLogger(WxCouponTargetController.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 WxCouponTarget wxCouponTarget,Integer pageNum, Integer pageSize) { + if (null == wxCouponTarget) wxCouponTarget = new WxCouponTarget(); + final PageInfo page = wxCouponTargetService.listAsPage(wxCouponTarget, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponTarget wxCouponTarget) { + //Assert.notNull(wxCouponTarget.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponTargetService.saveOrUpdate(wxCouponTarget); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponTarget wxCouponTarget) { + wxCouponTargetService.saveOrUpdate(wxCouponTarget); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponTargetService.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,"查询成功",wxCouponTargetService.getById(id)); + } + + + +} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java index 31a99a5ad..e61f27b76 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponTypeController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxCouponTypeController extends BaseController private WxCouponTypeService wxCouponTypeService; private Logger logger = Logger.getLogger(WxCouponTypeController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxCouponTypeController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxCouponType wxCouponType) { //Assert.notNull(wxCouponType.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxCouponTypeController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxCouponTypeController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponVerifyController.java new file mode 100644 index 000000000..95b91de39 --- /dev/null +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponVerifyController.java @@ -0,0 +1,71 @@ +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/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java b/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java index 43b1d33a9..6f71d5f0d 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxFlashSaleController.java @@ -13,6 +13,7 @@ import com.simple.domain.po.WxFlashSale; import com.simple.service.WxFlashSaleService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxFlashSale") @@ -22,7 +23,8 @@ public class WxFlashSaleController extends BaseController private WxFlashSaleService wxFlashSaleService; private Logger logger = Logger.getLogger(WxFlashSaleController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxFlashSaleController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxFlashSale wxFlashSale) { //Assert.notNull(wxFlashSale.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxFlashSaleController extends BaseController return new ResultData(); } + @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxFlashSale wxFlashSale) { wxFlashSaleService.saveOrUpdate(wxFlashSale); return new ResultData(); } + @ApiOperation("根据id删除接口") @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { @@ -54,6 +59,7 @@ public class WxFlashSaleController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java index 016d48960..170a712bb 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMallBuildingController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxMallBuildingController extends BaseController private WxMallBuildingService wxMallBuildingService; private Logger logger = Logger.getLogger(WxMallBuildingController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxMallBuildingController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMallBuilding wxMallBuilding) { //Assert.notNull(wxMallBuilding.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxMallBuildingController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxMallBuildingController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkApi/src/main/java/com/simple/controller/WxMallController.java index 03e9b0bcd..def24e2a4 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMallController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMallController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxMallController extends BaseController private WxMallService wxMallService; private Logger logger = Logger.getLogger(WxMallController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxMallController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMall wxMall) { //Assert.notNull(wxMall.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxMallController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxMallController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java index b2b0ec484..23e580207 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMallFloorController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxMallFloorController extends BaseController private WxMallFloorService wxMallFloorService; private Logger logger = Logger.getLogger(WxMallFloorController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxMallFloorController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMallFloor wxMallFloor) { //Assert.notNull(wxMallFloor.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxMallFloorController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxMallFloorController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkApi/src/main/java/com/simple/controller/WxMerchantBUserController.java new file mode 100644 index 000000000..5b7ec6a03 --- /dev/null +++ b/mallinkApi/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -0,0 +1,71 @@ +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.WxMerchantBUser; +import com.simple.service.WxMerchantBUserService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMerchantBUser") +public class WxMerchantBUserController extends BaseController +{ + @Autowired + private WxMerchantBUserService wxMerchantBUserService; + + private Logger logger = Logger.getLogger(WxMerchantBUserController.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 WxMerchantBUser wxMerchantBUser,Integer pageNum, Integer pageSize) { + if (null == wxMerchantBUser) wxMerchantBUser = new WxMerchantBUser(); + final PageInfo page = wxMerchantBUserService.listAsPage(wxMerchantBUser, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMerchantBUser wxMerchantBUser) { + //Assert.notNull(wxMerchantBUser.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMerchantBUser wxMerchantBUser) { + wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMerchantBUserService.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,"查询成功",wxMerchantBUserService.getById(id)); + } + + + +} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java index 43fa7a1d9..91e177f88 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMerchantController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxMerchantController extends BaseController private WxMerchantService wxMerchantService; private Logger logger = Logger.getLogger(WxMerchantController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxMerchantController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMerchant wxMerchant) { //Assert.notNull(wxMerchant.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxMerchantController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxMerchantController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java index cc357d822..f0c78f729 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMerchantShopController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxMerchantShopController extends BaseController private WxMerchantShopService wxMerchantShopService; private Logger logger = Logger.getLogger(WxMerchantShopController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxMerchantShopController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMerchantShop wxMerchantShop) { //Assert.notNull(wxMerchantShop.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxMerchantShopController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxMerchantShopController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java new file mode 100644 index 000000000..eccfc627a --- /dev/null +++ b/mallinkApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -0,0 +1,71 @@ +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("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)); + } + + + +} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgCallbackController.java new file mode 100644 index 000000000..fe83b1398 --- /dev/null +++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgCallbackController.java @@ -0,0 +1,71 @@ +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/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java index 7b5c3715d..7ec2199c4 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgConfigController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxMsgConfigController extends BaseController private WxMsgConfigService wxMsgConfigService; private Logger logger = Logger.getLogger(WxMsgConfigController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxMsgConfigController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgConfig wxMsgConfig) { //Assert.notNull(wxMsgConfig.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxMsgConfigController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxMsgConfigController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java index eaa74fa3a..e97b4a3c6 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxMsgController extends BaseController private WxMsgService wxMsgService; private Logger logger = Logger.getLogger(WxMsgController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxMsgController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsg wxMsg) { //Assert.notNull(wxMsg.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxMsgController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxMsgController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java index 77ecd5f28..38a746c01 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgModelController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxMsgModelController extends BaseController private WxMsgModelService wxMsgModelService; private Logger logger = Logger.getLogger(WxMsgModelController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxMsgModelController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgModel wxMsgModel) { //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxMsgModelController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxMsgModelController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java index 4867dd52e..e1bc56cce 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxMsgSignatureController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxMsgSignatureController extends BaseController private WxMsgSignatureService wxMsgSignatureService; private Logger logger = Logger.getLogger(WxMsgSignatureController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxMsgSignatureController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxMsgSignature wxMsgSignature) { //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxMsgSignatureController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxMsgSignatureController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java b/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java index b523e38f3..b097ba462 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxOrdersController.java @@ -13,6 +13,7 @@ import com.simple.domain.po.WxOrders; import com.simple.service.WxOrdersService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("wxOrders") @@ -22,7 +23,8 @@ public class WxOrdersController extends BaseController private WxOrdersService wxOrdersService; private Logger logger = Logger.getLogger(WxOrdersController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxOrdersController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxOrders wxOrders) { //Assert.notNull(wxOrders.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxOrdersController extends BaseController return new ResultData(); } + @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxOrders wxOrders) { wxOrdersService.saveOrUpdate(wxOrders); return new ResultData(); } + @ApiOperation("根据id删除接口") @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { @@ -54,6 +59,7 @@ public class WxOrdersController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkApi/src/main/java/com/simple/controller/WxParkController.java index 3ea7bf402..2f7309c99 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxParkController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxParkController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxParkController extends BaseController private WxParkService wxParkService; private Logger logger = Logger.getLogger(WxParkController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxParkController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxPark wxPark) { //Assert.notNull(wxPark.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxParkController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxParkController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java index 1006141d5..56794ac8a 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxScoreHistoryController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxScoreHistoryController extends BaseController private WxScoreHistoryService wxScoreHistoryService; private Logger logger = Logger.getLogger(WxScoreHistoryController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxScoreHistoryController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxScoreHistory wxScoreHistory) { //Assert.notNull(wxScoreHistory.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxScoreHistoryController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxScoreHistoryController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java index f5035a1c8..21cb402b7 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxScoreRulesController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxScoreRulesController extends BaseController private WxScoreRulesService wxScoreRulesService; private Logger logger = Logger.getLogger(WxScoreRulesController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxScoreRulesController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxScoreRules wxScoreRules) { //Assert.notNull(wxScoreRules.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxScoreRulesController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxScoreRulesController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java index b8804de1b..1271b55d5 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxScoreValidityPeriodController extends BaseController private WxScoreValidityPeriodService wxScoreValidityPeriodService; private Logger logger = Logger.getLogger(WxScoreValidityPeriodController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxScoreValidityPeriodController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxScoreValidityPeriod wxScoreValidityPeriod) { //Assert.notNull(wxScoreValidityPeriod.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxScoreValidityPeriodController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxScoreValidityPeriodController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxShopController.java b/mallinkApi/src/main/java/com/simple/controller/WxShopController.java index 27b06e8ed..5685653d4 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxShopController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxShopController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxShopController extends BaseController private WxShopService wxShopService; private Logger logger = Logger.getLogger(WxShopController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxShopController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxShop wxShop) { //Assert.notNull(wxShop.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxShopController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxShopController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java b/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java index 03a9a5378..52929d3c4 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxTagsController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxTagsController extends BaseController private WxTagsService wxTagsService; private Logger logger = Logger.getLogger(WxTagsController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxTagsController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxTags wxTags) { //Assert.notNull(wxTags.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxTagsController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxTagsController extends BaseController 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) { diff --git a/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java index 6b5f36db9..a74b33363 100644 --- a/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxWebLogController.java @@ -13,6 +13,7 @@ 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") @@ -22,7 +23,8 @@ public class WxWebLogController extends BaseController private WxWebLogService wxWebLogService; private Logger logger = Logger.getLogger(WxWebLogController.class); - + + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @@ -33,6 +35,7 @@ public class WxWebLogController extends BaseController return new ResultData(page); } + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxWebLog wxWebLog) { //Assert.notNull(wxWebLog.getName(), "角色名不能为空"); @@ -41,12 +44,14 @@ public class WxWebLogController extends BaseController 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) { @@ -54,6 +59,7 @@ public class WxWebLogController extends BaseController 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) { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java index 2b58ef88d..4f223f734 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBusiness.java @@ -47,6 +47,12 @@ public class WxBusiness implements Serializable { /*业态名**/ @io.swagger.annotations.ApiModelProperty(value="业态名",name="title") private String title; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; public String getTenantId() { return tenantId; } @@ -59,6 +65,18 @@ public class WxBusiness implements Serializable { public void setTitle(String _title) { title = _title; } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } @@ -67,6 +85,8 @@ public class WxBusiness implements Serializable { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java index d43ae3437..512523e16 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUser.java @@ -77,30 +77,33 @@ public class WxCUser implements Serializable { /*用户手机区号**/ @io.swagger.annotations.ApiModelProperty(value="用户手机区号",name="countryCode") private String countryCode; - /*注册时记录用户扫码渠道,如朋友圈广告**/ - @io.swagger.annotations.ApiModelProperty(value="注册时记录用户扫码渠道,如朋友圈广告",name="qrcodeSource") - private String qrcodeSource; /*用户注册IP**/ @io.swagger.annotations.ApiModelProperty(value="用户注册IP",name="registerIp") private String registerIp; - /*二维码**/ - @io.swagger.annotations.ApiModelProperty(value="二维码",name="scene") + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="verifyCodePhone") + private String verifyCodePhone; + /*注册时记录用户扫码渠道,如朋友圈广告**/ + @io.swagger.annotations.ApiModelProperty(value="注册时记录用户扫码渠道,如朋友圈广告",name="qrcodeSource") + private String qrcodeSource; + /*二维码来源,小程序**/ + @io.swagger.annotations.ApiModelProperty(value="二维码来源,小程序",name="scene") private String scene; - /*渠道**/ - @io.swagger.annotations.ApiModelProperty(value="渠道",name="sceneAddress") + /*渠道,小程序**/ + @io.swagger.annotations.ApiModelProperty(value="渠道,小程序",name="sceneAddress") private String sceneAddress; - /*session key**/ - @io.swagger.annotations.ApiModelProperty(value="session key",name="sessionKey") + /*session key for 微信小程序**/ + @io.swagger.annotations.ApiModelProperty(value="session key for 微信小程序",name="sessionKey") private String sessionKey; + /*积分**/ + @io.swagger.annotations.ApiModelProperty(value="积分",name="score") + private Integer score; /*更新时间**/ @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - /*积分**/ - @io.swagger.annotations.ApiModelProperty(value="积分",name="score") - private Integer score; public String getTenantId() { return tenantId; } @@ -173,18 +176,24 @@ public class WxCUser implements Serializable { public void setCountryCode(String _countryCode) { countryCode = _countryCode; } - public String getQrcodeSource() { - return qrcodeSource; - } - public void setQrcodeSource(String _qrcodeSource) { - qrcodeSource = _qrcodeSource; - } public String getRegisterIp() { return registerIp; } public void setRegisterIp(String _registerIp) { registerIp = _registerIp; } + public String getVerifyCodePhone() { + return verifyCodePhone; + } + public void setVerifyCodePhone(String _verifyCodePhone) { + verifyCodePhone = _verifyCodePhone; + } + public String getQrcodeSource() { + return qrcodeSource; + } + public void setQrcodeSource(String _qrcodeSource) { + qrcodeSource = _qrcodeSource; + } public String getScene() { return scene; } @@ -203,6 +212,12 @@ public class WxCUser implements Serializable { public void setSessionKey(String _sessionKey) { sessionKey = _sessionKey; } + public Integer getScore() { + return score; + } + public void setScore(Integer _score) { + score = _score; + } public Date getUpdateDate() { return updateDate; } @@ -215,12 +230,6 @@ public class WxCUser implements Serializable { public void setCreateDate(Date _createDate) { createDate = _createDate; } - public Integer getScore() { - return score; - } - public void setScore(Integer _score) { - score = _score; - } @@ -239,14 +248,15 @@ public class WxCUser implements Serializable { ,Province_ASC("`province` ASC"),Province_DESC("`province` DESC") ,Language_ASC("`language` ASC"),Language_DESC("`language` DESC") ,CountryCode_ASC("`countryCode` ASC"),CountryCode_DESC("`countryCode` DESC") - ,QrcodeSource_ASC("`qrcodeSource` ASC"),QrcodeSource_DESC("`qrcodeSource` DESC") ,RegisterIp_ASC("`registerIp` ASC"),RegisterIp_DESC("`registerIp` DESC") + ,VerifyCodePhone_ASC("`verifyCodePhone` ASC"),VerifyCodePhone_DESC("`verifyCodePhone` DESC") + ,QrcodeSource_ASC("`qrcodeSource` ASC"),QrcodeSource_DESC("`qrcodeSource` DESC") ,Scene_ASC("`scene` ASC"),Scene_DESC("`scene` DESC") ,SceneAddress_ASC("`sceneAddress` ASC"),SceneAddress_DESC("`sceneAddress` DESC") ,SessionKey_ASC("`sessionKey` ASC"),SessionKey_DESC("`sessionKey` DESC") + ,Score_ASC("`score` ASC"),Score_DESC("`score` DESC") ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,Score_ASC("`score` ASC"),Score_DESC("`score` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java index caee5c124..1d58646a1 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserCars.java @@ -50,6 +50,12 @@ public class WxCUserCars implements Serializable { /*车牌号**/ @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") private String carNumber; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; public String getTenantId() { return tenantId; } @@ -68,6 +74,18 @@ public class WxCUserCars implements Serializable { public void setCarNumber(String _carNumber) { carNumber = _carNumber; } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } @@ -77,6 +95,8 @@ public class WxCUserCars implements Serializable { ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC") ,CarNumber_ASC("`carNumber` ASC"),CarNumber_DESC("`carNumber` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java b/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java index 750b4267d..6281e62aa 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCUserTags.java @@ -50,6 +50,12 @@ public class WxCUserTags implements Serializable { /***/ @io.swagger.annotations.ApiModelProperty(value="",name="tags") private String tags; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; public String getTenantId() { return tenantId; } @@ -68,6 +74,18 @@ public class WxCUserTags implements Serializable { public void setTags(String _tags) { tags = _tags; } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } @@ -77,6 +95,8 @@ public class WxCUserTags implements Serializable { ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,UserId_ASC("`userId` ASC"),UserId_DESC("`userId` DESC") ,Tags_ASC("`tags` ASC"),Tags_DESC("`tags` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponCar.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponCar.java index 0f352d322..691e410c7 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCouponCar.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponCar.java @@ -47,6 +47,21 @@ public class WxCouponCar implements Serializable { /*停车场ID**/ @io.swagger.annotations.ApiModelProperty(value="停车场ID",name="parkId") private Long parkId; + /*商户ID**/ + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") + private Long merchantId; + /*车场服务商类型(1: ETCP,2:停简单)**/ + @io.swagger.annotations.ApiModelProperty(value="车场服务商类型(1: ETCP,2:停简单)",name="vendorType") + private Integer vendorType; + /*车场厂商相关信息**/ + @io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams") + private String vendorParams; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; public Long getTenantId() { return tenantId; } @@ -59,6 +74,36 @@ public class WxCouponCar implements Serializable { public void setParkId(Long _parkId) { parkId = _parkId; } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public Integer getVendorType() { + return vendorType; + } + public void setVendorType(Integer _vendorType) { + vendorType = _vendorType; + } + public String getVendorParams() { + return vendorParams; + } + public void setVendorParams(String _vendorParams) { + vendorParams = _vendorParams; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } @@ -67,6 +112,11 @@ public class WxCouponCar implements Serializable { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,ParkId_ASC("`parkId` ASC"),ParkId_DESC("`parkId` DESC") + ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,VendorType_ASC("`vendorType` ASC"),VendorType_DESC("`vendorType` DESC") + ,VendorParams_ASC("`vendorParams` ASC"),VendorParams_DESC("`vendorParams` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCouponVerify.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponVerify.java new file mode 100644 index 000000000..12f6d48f5 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponVerify.java @@ -0,0 +1,201 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; +import java.io.Serializable; + +@Table(name = "wx_coupon_verify") +public class WxCouponVerify implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + /*coupon id**/ + @io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId") + private Long couponId; + /*订单id**/ + @io.swagger.annotations.ApiModelProperty(value="订单id",name="orderId") + private Long orderId; + /*c端用户id**/ + @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") + private Long cUserId; + /*购买日期/领取日期**/ + @io.swagger.annotations.ApiModelProperty(value="购买日期/领取日期",name="buyDate") + private Date buyDate; + /*截止日期**/ + @io.swagger.annotations.ApiModelProperty(value="截止日期",name="limitDate") + private Date limitDate; + /*c状态(0:default,1:未支付,2:已支付/已领取,3:已使用,4:已退回/已退券)**/ + @io.swagger.annotations.ApiModelProperty(value="c状态(0:default,1:未支付,2:已支付/已领取,3:已使用,4:已退回/已退券)",name="cStatus") + private Integer cStatus; + /*b端用户id**/ + @io.swagger.annotations.ApiModelProperty(value="b端用户id",name="bUserId") + private Long bUserId; + /*核销日期**/ + @io.swagger.annotations.ApiModelProperty(value="核销日期",name="verificationDate") + private Date verificationDate; + /*核销状态(0:未核销,1:已核销)**/ + @io.swagger.annotations.ApiModelProperty(value="核销状态(0:未核销,1:已核销)",name="verificationStatus") + private Integer verificationStatus; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getCouponId() { + return couponId; + } + public void setCouponId(Long _couponId) { + couponId = _couponId; + } + public Long getOrderId() { + return orderId; + } + public void setOrderId(Long _orderId) { + orderId = _orderId; + } + public Long getCUserId() { + return cUserId; + } + public void setCUserId(Long _cUserId) { + cUserId = _cUserId; + } + public Date getBuyDate() { + return buyDate; + } + public void setBuyDate(Date _buyDate) { + buyDate = _buyDate; + } + public Date getLimitDate() { + return limitDate; + } + public void setLimitDate(Date _limitDate) { + limitDate = _limitDate; + } + public Integer getCStatus() { + return cStatus; + } + public void setCStatus(Integer _cStatus) { + cStatus = _cStatus; + } + public Long getBUserId() { + return bUserId; + } + public void setBUserId(Long _bUserId) { + bUserId = _bUserId; + } + public Date getVerificationDate() { + return verificationDate; + } + public void setVerificationDate(Date _verificationDate) { + verificationDate = _verificationDate; + } + public Integer getVerificationStatus() { + return verificationStatus; + } + public void setVerificationStatus(Integer _verificationStatus) { + verificationStatus = _verificationStatus; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC") + ,OrderId_ASC("`orderId` ASC"),OrderId_DESC("`orderId` DESC") + ,CUserId_ASC("`cUserId` ASC"),CUserId_DESC("`cUserId` DESC") + ,BuyDate_ASC("`buyDate` ASC"),BuyDate_DESC("`buyDate` DESC") + ,LimitDate_ASC("`limitDate` ASC"),LimitDate_DESC("`limitDate` DESC") + ,CStatus_ASC("`cStatus` ASC"),CStatus_DESC("`cStatus` DESC") + ,BUserId_ASC("`bUserId` ASC"),BUserId_DESC("`bUserId` DESC") + ,VerificationDate_ASC("`verificationDate` ASC"),VerificationDate_DESC("`verificationDate` DESC") + ,VerificationStatus_ASC("`verificationStatus` ASC"),VerificationStatus_DESC("`verificationStatus` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxCouponVerify.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java b/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java index 7eafc3ad7..929513f47 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxFlashSale.java @@ -47,15 +47,15 @@ public class WxFlashSale implements Serializable { /*优惠券活动ID**/ @io.swagger.annotations.ApiModelProperty(value="优惠券活动ID",name="activityId") private Long activityId; - /*创建时间**/ - @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") - private Date createtime; - /*上线时间**/ - @io.swagger.annotations.ApiModelProperty(value="上线时间",name="uptime") - private Date uptime; /*状态 1启用 2停用**/ @io.swagger.annotations.ApiModelProperty(value="状态 1启用 2停用",name="isEnable") private Integer isEnable; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*上线时间**/ + @io.swagger.annotations.ApiModelProperty(value="上线时间",name="upDate") + private Date upDate; public String getTenantId() { return tenantId; } @@ -68,24 +68,24 @@ public class WxFlashSale implements Serializable { public void setActivityId(Long _activityId) { activityId = _activityId; } - public Date getCreatetime() { - return createtime; - } - public void setCreatetime(Date _createtime) { - createtime = _createtime; - } - public Date getUptime() { - return uptime; - } - public void setUptime(Date _uptime) { - uptime = _uptime; - } public Integer getIsEnable() { return isEnable; } public void setIsEnable(Integer _isEnable) { isEnable = _isEnable; } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpDate() { + return upDate; + } + public void setUpDate(Date _upDate) { + upDate = _upDate; + } @@ -94,9 +94,9 @@ public class WxFlashSale implements Serializable { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,ActivityId_ASC("`activityId` ASC"),ActivityId_DESC("`activityId` DESC") - ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") - ,Uptime_ASC("`uptime` ASC"),Uptime_DESC("`uptime` DESC") ,IsEnable_ASC("`isEnable` ASC"),IsEnable_DESC("`isEnable` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpDate_ASC("`upDate` ASC"),UpDate_DESC("`upDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java index 8306f37b6..8cb95aae2 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallBuilding.java @@ -53,6 +53,12 @@ public class WxMallBuilding implements Serializable { /*楼层数**/ @io.swagger.annotations.ApiModelProperty(value="楼层数",name="floorNumber") private Integer floorNumber; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; public String getTenantId() { return tenantId; } @@ -77,6 +83,18 @@ public class WxMallBuilding implements Serializable { public void setFloorNumber(Integer _floorNumber) { floorNumber = _floorNumber; } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } @@ -87,6 +105,8 @@ public class WxMallBuilding implements Serializable { ,MallId_ASC("`mallId` ASC"),MallId_DESC("`mallId` DESC") ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") ,FloorNumber_ASC("`floorNumber` ASC"),FloorNumber_DESC("`floorNumber` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java b/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java index 661d76988..48475056f 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMallFloor.java @@ -53,6 +53,15 @@ public class WxMallFloor implements Serializable { /*楼层名**/ @io.swagger.annotations.ApiModelProperty(value="楼层名",name="floorName") private String floorName; + /*底图路径**/ + @io.swagger.annotations.ApiModelProperty(value="底图路径",name="backgroundImg") + private String backgroundImg; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; public String getTenantId() { return tenantId; } @@ -77,6 +86,24 @@ public class WxMallFloor implements Serializable { public void setFloorName(String _floorName) { floorName = _floorName; } + public String getBackgroundImg() { + return backgroundImg; + } + public void setBackgroundImg(String _backgroundImg) { + backgroundImg = _backgroundImg; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } @@ -87,6 +114,9 @@ public class WxMallFloor implements Serializable { ,MallId_ASC("`mallId` ASC"),MallId_DESC("`mallId` DESC") ,BuildingId_ASC("`buildingId` ASC"),BuildingId_DESC("`buildingId` DESC") ,FloorName_ASC("`floorName` ASC"),FloorName_DESC("`floorName` DESC") + ,BackgroundImg_ASC("`backgroundImg` ASC"),BackgroundImg_DESC("`backgroundImg` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index b28c0258a..812064e59 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -59,7 +59,15 @@ public class WxMerchant implements Serializable { /*银行开户行**/ @io.swagger.annotations.ApiModelProperty(value="银行开户行",name="bankName") private String bankName; - + /*微信支付账号**/ + @io.swagger.annotations.ApiModelProperty(value="微信支付账号",name="wxchatAccount") + private String wxchatAccount; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; public String getTenantId() { return tenantId; } @@ -96,7 +104,24 @@ public class WxMerchant implements Serializable { public void setBankName(String _bankName) { bankName = _bankName; } - + public String getWxchatAccount() { + return wxchatAccount; + } + public void setWxchatAccount(String _wxchatAccount) { + wxchatAccount = _wxchatAccount; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } @@ -109,7 +134,9 @@ public class WxMerchant implements Serializable { ,LinkPhone_ASC("`linkPhone` ASC"),LinkPhone_DESC("`linkPhone` DESC") ,BankCard_ASC("`bankCard` ASC"),BankCard_DESC("`bankCard` DESC") ,BankName_ASC("`bankName` ASC"),BankName_DESC("`bankName` DESC") - ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,WxchatAccount_ASC("`wxchatAccount` ASC"),WxchatAccount_DESC("`wxchatAccount` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java new file mode 100644 index 000000000..b516c565b --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java @@ -0,0 +1,161 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; +import java.io.Serializable; + +@Table(name = "wx_merchant_b_user") +public class WxMerchantBUser implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + /*B端用户id**/ + @io.swagger.annotations.ApiModelProperty(value="B端用户id",name="bUserId") + private Long bUserId; + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="bUserPwd") + private String bUserPwd; + /*商户id**/ + @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") + private Long merchantId; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getBUserId() { + return bUserId; + } + public void setBUserId(Long _bUserId) { + bUserId = _bUserId; + } + public String getBUserPwd() { + return bUserPwd; + } + public void setBUserPwd(String _bUserPwd) { + bUserPwd = _bUserPwd; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,BUserId_ASC("`bUserId` ASC"),BUserId_DESC("`bUserId` DESC") + ,BUserPwd_ASC("`bUserPwd` ASC"),BUserPwd_DESC("`bUserPwd` DESC") + ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxMerchantBUser.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDaily.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDaily.java new file mode 100644 index 000000000..2fde8545d --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantTradeDaily.java @@ -0,0 +1,141 @@ +package com.simple.domain.po; + +import javax.persistence.*; +import java.util.*; +import java.math.*; +import javax.persistence.Transient; +import java.util.List; +import javax.persistence.Id; +import java.io.Serializable; + +@Table(name = "wx_merchant_trade_daily") +public class WxMerchantTradeDaily implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + /*商户id**/ + @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") + private Long merchantId; + /*交易额**/ + @io.swagger.annotations.ApiModelProperty(value="交易额",name="tradeAmt") + private BigDecimal tradeAmt; + /*解单日期**/ + @io.swagger.annotations.ApiModelProperty(value="解单日期",name="createDate") + private Date createDate; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public BigDecimal getTradeAmt() { + return tradeAmt; + } + public void setTradeAmt(BigDecimal _tradeAmt) { + tradeAmt = _tradeAmt; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,TradeAmt_ASC("`tradeAmt` ASC"),TradeAmt_DESC("`tradeAmt` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxMerchantTradeDaily.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java index 3cd38474a..c4fffcc03 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java @@ -1,11 +1,12 @@ package com.simple.domain.po; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; +import java.util.*; +import java.math.*; import javax.persistence.Transient; -import java.io.Serializable; -import java.util.Date; import java.util.List; +import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_msg") public class WxMsg implements Serializable { @@ -68,24 +69,20 @@ public class WxMsg implements Serializable { @io.swagger.annotations.ApiModelProperty(value="",name="returnResult") private String returnResult; /***/ - @io.swagger.annotations.ApiModelProperty(value="手机号",name="phones") + @io.swagger.annotations.ApiModelProperty(value="",name="phones") private String phones; - - @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="signature") private String signature; - - @io.swagger.annotations.ApiModelProperty(value="短信名称",name="name") - private String name; - - @io.swagger.annotations.ApiModelProperty(value="是否立即发送",name="isright") + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="isright") private Integer isright; - - @io.swagger.annotations.ApiModelProperty(value="标签人群",name="label") - private String label; - - @io.swagger.annotations.ApiModelProperty(value="发送状态",name="sendstatus") + /***/ + @io.swagger.annotations.ApiModelProperty(value="",name="name") + private String name; + /*发送状态0未发送 1已发送 2草稿箱**/ + @io.swagger.annotations.ApiModelProperty(value="发送状态0未发送 1已发送 2草稿箱",name="sendstatus") private Integer sendstatus; - public String getTenantId() { return tenantId; } @@ -146,47 +143,33 @@ public class WxMsg implements Serializable { public void setPhones(String _phones) { phones = _phones; } - - public String getSignature() { + public String getSignature() { return signature; } - - public void setSignature(String signature) { - this.signature = signature; - } - - public String getName() { - return name; + public void setSignature(String _signature) { + signature = _signature; } - - public void setName(String name) { - this.name = name; - } - - public Integer getIsright() { + public Integer getIsright() { return isright; } - - public void setIsright(Integer isright) { - this.isright = isright; + public void setIsright(Integer _isright) { + isright = _isright; } - - public String getLabel() { - return label; + public String getName() { + return name; } - - public void setLabel(String label) { - this.label = label; + public void setName(String _name) { + name = _name; } - - public Integer getSendstatus() { + public Integer getSendstatus() { return sendstatus; } - - public void setSendstatus(Integer sendstatus) { - this.sendstatus = sendstatus; + public void setSendstatus(Integer _sendstatus) { + sendstatus = _sendstatus; } + + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") @@ -200,6 +183,10 @@ public class WxMsg implements Serializable { ,ErrorNumber_ASC("`errorNumber` ASC"),ErrorNumber_DESC("`errorNumber` DESC") ,ReturnResult_ASC("`returnResult` ASC"),ReturnResult_DESC("`returnResult` DESC") ,Phones_ASC("`phones` ASC"),Phones_DESC("`phones` DESC") + ,Signature_ASC("`signature` ASC"),Signature_DESC("`signature` DESC") + ,Isright_ASC("`isright` ASC"),Isright_DESC("`isright` DESC") + ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") + ,Sendstatus_ASC("`sendstatus` ASC"),Sendstatus_DESC("`sendstatus` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgCallback.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgCallback.java index f868555ff..58414a866 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgCallback.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgCallback.java @@ -1,31 +1,33 @@ package com.simple.domain.po; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; +import java.util.*; +import java.math.*; import javax.persistence.Transient; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; import java.util.List; +import javax.persistence.Id; +import java.io.Serializable; @Table(name = "wx_msg_callback") public class WxMsgCallback implements Serializable { private static final long serialVersionUID = 1L; @Id - protected String id; + protected Long id; @Transient protected List ids; @Transient protected String sortColumns; - public String getId() { + public Long getId() { return id; } - public void setId(String id) { + + public void setId(Long id) { this.id = id; } + public String getSortColumns() { return sortColumns; } @@ -152,7 +154,7 @@ public class WxMsgCallback implements Serializable { } } - public void setSortColumns(Field... fields) + public void setSortColumns(WxMsgCallback.Field... fields) { if (fields == null || fields.length == 0) { return; @@ -177,7 +179,7 @@ public class WxMsgCallback implements Serializable { } if (sortColumns.contains(",")) { String[] cols = sortColumns.split(","); - List fList = new ArrayList(); + java.util.List fList = new java.util.ArrayList(); for (int k = 0; k < cols.length; k++) { fList.add(Field.valueOf(cols[k])); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java index ab3f59015..6fd38f73d 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgConfig.java @@ -74,6 +74,9 @@ public class WxMsgConfig implements Serializable { /***/ @io.swagger.annotations.ApiModelProperty(value="",name="phone") private String phone; + /*回调地址**/ + @io.swagger.annotations.ApiModelProperty(value="回调地址",name="notifyurl") + private String notifyurl; public String getTenantId() { return tenantId; } @@ -140,6 +143,12 @@ public class WxMsgConfig implements Serializable { public void setPhone(String _phone) { phone = _phone; } + public String getNotifyurl() { + return notifyurl; + } + public void setNotifyurl(String _notifyurl) { + notifyurl = _notifyurl; + } @@ -157,6 +166,7 @@ public class WxMsgConfig implements Serializable { ,Reminderstatus_ASC("`reminderstatus` ASC"),Reminderstatus_DESC("`reminderstatus` DESC") ,Reminder_ASC("`reminder` ASC"),Reminder_DESC("`reminder` DESC") ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") + ,Notifyurl_ASC("`notifyurl` ASC"),Notifyurl_DESC("`notifyurl` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java b/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java index 1333fd5ca..dd08c3de2 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxOrders.java @@ -53,8 +53,8 @@ public class WxOrders implements Serializable { /*支付金额**/ @io.swagger.annotations.ApiModelProperty(value="支付金额",name="payment") private BigDecimal payment; - /*状态(0.待付款1.已支付,2.已退款3.已取消)**/ - @io.swagger.annotations.ApiModelProperty(value="状态(0.待付款1.已支付,2.已退款3.已取消)",name="status") + /*状态(0.待付款 1.已支付 2.已退款 3.已核销 4.已取消 )**/ + @io.swagger.annotations.ApiModelProperty(value="状态(0.待付款 1.已支付 2.已退款 3.已核销 4.已取消 )",name="status") private Integer status; /*创建时间**/ @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java index 628d5d12e..e5bea1113 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java @@ -53,6 +53,18 @@ public class WxPark implements Serializable { /*出入口数量**/ @io.swagger.annotations.ApiModelProperty(value="出入口数量",name="entryExit") private Integer entryExit; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + /*厂商类型(1:ETCP,2:停简单)**/ + @io.swagger.annotations.ApiModelProperty(value="厂商类型(1:ETCP,2:停简单)",name="vendorType") + private Integer vendorType; + /*厂商参数etcp{"url":"http://mapi.test.etcp.cn","appId":"FMLK","merchantNo":"C7AEAF80BA8C44ADB42F3DB3CBC7D18A","merchantKey":"C292FFC7DCFB46AFB02792CD43F6DCC7","version": "1.0.0","parkId":"Wj7YdvqyiYM="},TJD{"url":"http://prep.tingjiandan.com/openapi/gateway","partner":"7dbc8ec9037d403b822cb60addfdc681","key":"f356cb1bf5a74fb7a564e86128d2c49f","version":"1.0"}**/ + @io.swagger.annotations.ApiModelProperty(value="厂商参数etcp{\"url\":\"http://mapi.test.etcp.cn\",\"appId\":\"FMLK\",\"merchantNo\":\"C7AEAF80BA8C44ADB42F3DB3CBC7D18A\",\"merchantKey\":\"C292FFC7DCFB46AFB02792CD43F6DCC7\",\"version\": \"1.0.0\",\"parkId\":\"Wj7YdvqyiYM=\"},TJD{\"url\":\"http://prep.tingjiandan.com/openapi/gateway\",\"partner\":\"7dbc8ec9037d403b822cb60addfdc681\",\"key\":\"f356cb1bf5a74fb7a564e86128d2c49f\",\"version\":\"1.0\"}",name="vendorParams") + private String vendorParams; public String getTenantId() { return tenantId; } @@ -77,6 +89,30 @@ public class WxPark implements Serializable { public void setEntryExit(Integer _entryExit) { entryExit = _entryExit; } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + public Integer getVendorType() { + return vendorType; + } + public void setVendorType(Integer _vendorType) { + vendorType = _vendorType; + } + public String getVendorParams() { + return vendorParams; + } + public void setVendorParams(String _vendorParams) { + vendorParams = _vendorParams; + } @@ -87,6 +123,10 @@ public class WxPark implements Serializable { ,Addr_ASC("`addr` ASC"),Addr_DESC("`addr` DESC") ,Number_ASC("`number` ASC"),Number_DESC("`number` DESC") ,EntryExit_ASC("`entryExit` ASC"),EntryExit_DESC("`entryExit` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,VendorType_ASC("`vendorType` ASC"),VendorType_DESC("`vendorType` DESC") + ,VendorParams_ASC("`vendorParams` ASC"),VendorParams_DESC("`vendorParams` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java index d81232178..38d941e72 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreRules.java @@ -50,6 +50,12 @@ public class WxScoreRules implements Serializable { /*获取积分**/ @io.swagger.annotations.ApiModelProperty(value="获取积分",name="scoreNumber") private Integer scoreNumber; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; public String getTenantId() { return tenantId; } @@ -68,6 +74,18 @@ public class WxScoreRules implements Serializable { public void setScoreNumber(Integer _scoreNumber) { scoreNumber = _scoreNumber; } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } @@ -77,6 +95,8 @@ public class WxScoreRules implements Serializable { ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,ConsumptionAmount_ASC("`consumptionAmount` ASC"),ConsumptionAmount_DESC("`consumptionAmount` DESC") ,ScoreNumber_ASC("`scoreNumber` ASC"),ScoreNumber_DESC("`scoreNumber` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java b/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java index d3e26e012..1c4915cd6 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxScoreValidityPeriod.java @@ -47,6 +47,12 @@ public class WxScoreValidityPeriod implements Serializable { /*年**/ @io.swagger.annotations.ApiModelProperty(value="年",name="year") private String year; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; public String getTenantId() { return tenantId; } @@ -59,6 +65,18 @@ public class WxScoreValidityPeriod implements Serializable { public void setYear(String _year) { year = _year; } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } @@ -67,6 +85,8 @@ public class WxScoreValidityPeriod implements Serializable { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,Year_ASC("`year` ASC"),Year_DESC("`year` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxTags.java b/mallinkService/src/main/java/com/simple/domain/po/WxTags.java index 879edd9a9..df8cba9f0 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxTags.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxTags.java @@ -53,6 +53,12 @@ public class WxTags implements Serializable { /*二级属性 性别等**/ @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="type2") private String type2; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; public String getTenantId() { return tenantId; } @@ -77,6 +83,18 @@ public class WxTags implements Serializable { public void setType2(String _type2) { type2 = _type2; } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } @@ -87,6 +105,8 @@ public class WxTags implements Serializable { ,Name_ASC("`name` ASC"),Name_DESC("`name` DESC") ,Type1_ASC("`type1` ASC"),Type1_DESC("`type1` DESC") ,Type2_ASC("`type2` ASC"),Type2_DESC("`type2` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponVerifyMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponVerifyMapper.java new file mode 100644 index 000000000..01786d1ee --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponVerifyMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxCouponVerify; + +public interface WxCouponVerifyMapper extends CommonMapper { + + List findList(WxCouponVerify wxCouponVerify); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMerchantBUserMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMerchantBUserMapper.java new file mode 100644 index 000000000..aefde7bac --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxMerchantBUserMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxMerchantBUser; + +public interface WxMerchantBUserMapper extends CommonMapper { + + List findList(WxMerchantBUser wxMerchantBUser); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java new file mode 100644 index 000000000..f08ec96df --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxMerchantTradeDaily; + +public interface WxMerchantTradeDailyMapper extends CommonMapper { + + List findList(WxMerchantTradeDaily wxMerchantTradeDaily); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxMsgCallbackMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxMsgCallbackMapper.java index c42e2fbcc..321cc7d23 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxMsgCallbackMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxMsgCallbackMapper.java @@ -1,10 +1,10 @@ package com.simple.mapper; +import java.util.*; import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxMsgCallback; -import java.util.List; - public interface WxMsgCallbackMapper extends CommonMapper { List findList(WxMsgCallback wxMsgCallback); diff --git a/mallinkService/src/main/java/com/simple/service/MallRolePermissionService.java b/mallinkService/src/main/java/com/simple/service/MallRolePermissionService.java index 2b346a462..645373c15 100644 --- a/mallinkService/src/main/java/com/simple/service/MallRolePermissionService.java +++ b/mallinkService/src/main/java/com/simple/service/MallRolePermissionService.java @@ -3,7 +3,7 @@ package com.simple.service; import com.github.pagehelper.PageInfo; import com.simple.domain.po.MallRolePermission; -public interface MallUserRolePermissionService { +public interface MallRolePermissionService { /** * 根据实体查询分页列表 diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java b/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java index 9f4242bdb..24c3e48c1 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java @@ -10,8 +10,8 @@ public interface WxCUserCarsService { * 根据实体查询分页列表 * * @param record - * @param pageIndex - * @param pageSize + * @param offset + * @param limit * @return */ PageInfo listAsPage(WxCUserCars record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponVerifyService.java b/mallinkService/src/main/java/com/simple/service/WxCouponVerifyService.java new file mode 100644 index 000000000..03b371e26 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxCouponVerifyService.java @@ -0,0 +1,48 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCouponVerify; + +public interface WxCouponVerifyService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxCouponVerify record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxCouponVerify getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxCouponVerify record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java new file mode 100644 index 000000000..546a89063 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantBUserService.java @@ -0,0 +1,48 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxMerchantBUser; + +public interface WxMerchantBUserService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxMerchantBUser record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxMerchantBUser getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxMerchantBUser record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java new file mode 100644 index 000000000..42e327f17 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java @@ -0,0 +1,48 @@ +package com.simple.service; + +import java.util.*; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxMerchantTradeDaily; + +public interface WxMerchantTradeDailyService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param offset + * @param limit + * @return + */ + PageInfo listAsPage(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxMerchantTradeDaily getById(Long id); + + /** + * 保存或更新实体 + * + * @param record + */ + void saveOrUpdate(WxMerchantTradeDaily record); + + /** + * 根据Id删除实体 + * + * @param id + */ + void deleteById(Long id); + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java b/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java index 6d34560d0..0cfc3452c 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMsgCallbackService.java @@ -22,7 +22,7 @@ public interface WxMsgCallbackService { * @param id * @return */ - WxMsgCallback getById(String id); + WxMsgCallback getById(Long id); /** * 保存或更新实体 @@ -36,7 +36,7 @@ public interface WxMsgCallbackService { * * @param id */ - void deleteById(String id); + void deleteById(Long id); diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java b/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java index 81b65da7c..9494055e0 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMsgModelService.java @@ -2,7 +2,6 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.common.ResultData; import com.simple.domain.po.WxMsgModel; public interface WxMsgModelService { @@ -30,7 +29,7 @@ public interface WxMsgModelService { * * @param record */ - ResultData saveOrUpdate(WxMsgModel record); + void saveOrUpdate(WxMsgModel record); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/simple/service/WxMsgService.java b/mallinkService/src/main/java/com/simple/service/WxMsgService.java index c11db756c..d4ddf5485 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMsgService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMsgService.java @@ -2,9 +2,7 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.common.ResultData; import com.simple.domain.po.WxMsg; -import org.springframework.web.multipart.MultipartFile; public interface WxMsgService { @@ -39,9 +37,12 @@ public interface WxMsgService { * @param id */ void deleteById(Long id); + + + - - ResultData sendmsgbyexcel(MultipartFile file, WxMsg wxMsg); - - ResultData sendmsgbylabel(WxMsg wxMsg); + + + + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java index 8374cba87..9e8b0410b 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MallRolePermissionServiceImpl.java @@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo; import com.simple.common.IdWorker; import com.simple.domain.po.MallRolePermission; import com.simple.mapper.MallRolePermissionMapper; -import com.simple.service.MallUserRolePermissionService; +import com.simple.service.MallRolePermissionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.Map; @Service -public class MallUserRolePermissionServiceImpl implements MallUserRolePermissionService { +public class MallRolePermissionServiceImpl implements MallRolePermissionService { @Autowired MallRolePermissionMapper mallUserRolePermissionMapper; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java new file mode 100644 index 000000000..cbaaf722e --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponVerifyServiceImpl.java @@ -0,0 +1,54 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCouponVerify; +import com.simple.mapper.WxCouponVerifyMapper; +import com.simple.service.WxCouponVerifyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.simple.common.IdWorker; + +@Service +public class WxCouponVerifyServiceImpl implements WxCouponVerifyService { + + @Autowired + WxCouponVerifyMapper wxCouponVerifyMapper; + + + @Override + public PageInfo listAsPage(WxCouponVerify record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponVerifyMapper.findList(record)); + } + + @Override + public WxCouponVerify getById(Long id) { + return wxCouponVerifyMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxCouponVerify record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + wxCouponVerifyMapper.insertSelective(record); + } else { + wxCouponVerifyMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxCouponVerifyMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java new file mode 100644 index 000000000..f06977958 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantBUserServiceImpl.java @@ -0,0 +1,54 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxMerchantBUser; +import com.simple.mapper.WxMerchantBUserMapper; +import com.simple.service.WxMerchantBUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.simple.common.IdWorker; + +@Service +public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { + + @Autowired + WxMerchantBUserMapper wxMerchantBUserMapper; + + + @Override + public PageInfo listAsPage(WxMerchantBUser record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantBUserMapper.findList(record)); + } + + @Override + public WxMerchantBUser getById(Long id) { + return wxMerchantBUserMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxMerchantBUser record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + wxMerchantBUserMapper.insertSelective(record); + } else { + wxMerchantBUserMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxMerchantBUserMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java new file mode 100644 index 000000000..5c31ca88d --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -0,0 +1,54 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxMerchantTradeDaily; +import com.simple.mapper.WxMerchantTradeDailyMapper; +import com.simple.service.WxMerchantTradeDailyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.simple.common.IdWorker; + +@Service +public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyService { + + @Autowired + WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; + + + @Override + public PageInfo listAsPage(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record)); + } + + @Override + public WxMerchantTradeDaily getById(Long id) { + return wxMerchantTradeDailyMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxMerchantTradeDaily record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + wxMerchantTradeDailyMapper.insertSelective(record); + } else { + wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxMerchantTradeDailyMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java index e6460fa79..0f84797ca 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgCallbackServiceImpl.java @@ -8,6 +8,7 @@ import com.simple.mapper.WxMsgCallbackMapper; import com.simple.service.WxMsgCallbackService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.simple.common.IdWorker; @Service public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { @@ -22,14 +23,16 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { } @Override - public WxMsgCallback getById(String id) { + public WxMsgCallback getById(Long id) { return wxMsgCallbackMapper.selectByPrimaryKey(id); } @Override public void saveOrUpdate(WxMsgCallback record) { if (record.getId() == null) { - record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); wxMsgCallbackMapper.insertSelective(record); } else { wxMsgCallbackMapper.updateByPrimaryKeySelective(record); @@ -37,7 +40,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { } @Override - public void deleteById(String id) { + public void deleteById(Long id) { wxMsgCallbackMapper.deleteByPrimaryKey(id); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java index dccb3efa6..dbebf2d89 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java @@ -1,24 +1,14 @@ package com.simple.service.impl; -import com.alibaba.fastjson.JSONObject; +import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.common.IdWorker; -import com.simple.common.Result; -import com.simple.common.ResultData; -import com.simple.domain.po.WxMsgConfig; import com.simple.domain.po.WxMsgModel; -import com.simple.mapper.WxMsgConfigMapper; import com.simple.mapper.WxMsgModelMapper; import com.simple.service.WxMsgModelService; -import com.simple.utils.AesUtil; -import com.simple.utils.HMACSHA256; -import com.simple.utils.HttpUtil; -import com.simple.utils.RsaUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - -import java.util.*; +import com.simple.common.IdWorker; @Service public class WxMsgModelServiceImpl implements WxMsgModelService { @@ -26,8 +16,6 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { @Autowired WxMsgModelMapper wxMsgModelMapper; - @Autowired - WxMsgConfigMapper wxMsgConfigMapper; @Override public PageInfo listAsPage(WxMsgModel record, Integer pageIndex, Integer pageSize) { @@ -40,78 +28,15 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { } @Override - public ResultData saveOrUpdate(WxMsgModel wxMsgModel) { - //从短信配置中查询密钥 bid 等信息 - WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId("1"); - List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); - if(wxMsgConfigs.size()==0)return new ResultData(Result.SUCCESS, "您还未接入短信运营商,请联系平台管理员"); - wxMsgConfig = wxMsgConfigs.get(0); - - String secret = wxMsgConfig.getSecret(); - String bid = wxMsgConfig.getBid(); - String signature = wxMsgModel.getSignature(); - String content = wxMsgModel.getContent(); - //查看用户最新数据是否存在 - List wxMsgModels = wxMsgModelMapper.findList(wxMsgModel); - if (wxMsgModel.getId() == null && wxMsgModels.size() == 1) { - return new ResultData(Result.SUCCESS, "您添加的短信模板已存在"); - } - if (wxMsgModel.getId() != null && wxMsgModels.size() == 1) { - WxMsgModel wxmsgmodel = wxMsgModels.get(0); - if(wxmsgmodel.getContent().equals(wxMsgModel.getContent()) && wxmsgmodel.getSignature().equals(wxMsgModel.getSignature())) { - return new ResultData(Result.SUCCESS, "您添加的短信模板已存在"); - } - } - - //请求api数据排序 - TreeMap message = new TreeMap<>(); - message.put("bid", bid); - message.put("signature", signature); - message.put("content", content); - - StringBuilder sb = new StringBuilder(); - Set> entries = message.entrySet(); - for (Map.Entry entry : entries) { - sb.append(entry.getKey()).append("=").append(entry.getValue()); - } - sb.append("&secret=").append(secret); - String sign = HMACSHA256.sha256_HMAC(sb.toString(), secret); - message.put("sign", sign.toUpperCase()); - - String str32 = "198b02e8fd704e96198b02e8fd704e96"; - String iv = "198b02e8fd704e96"; - - Map params = new HashMap<>(); - params.put("iv", iv); - params.put("bid", bid); - try { - String data = AesUtil.AESEncode(str32, JSONObject.toJSONString(message), iv); - String sc = RsaUtil.RSAEncode(str32.getBytes(), wxMsgConfig.getPublickey()); - params.put("data", data); - params.put("sc", sc); - } catch (Exception e) { - e.printStackTrace(); - } - - String requestUrl = "https://webapp.wiwide.com/apisms/addtemplate"; - String result = HttpUtil.doPost(requestUrl, params); - JSONObject jsonObjectResult = JSONObject.parseObject(result); - String ret = jsonObjectResult.get("ret").toString(); - if (ret.equals("1") || ret.equals("-6")) { - if (wxMsgModel.getId() == null) { - IdWorker idWorker = new IdWorker(0, 0); - wxMsgModel.setId(idWorker.nextId()); - wxMsgModel.setCreatetime(new Date()); - wxMsgModelMapper.insertSelective(wxMsgModel); - } else { - wxMsgModelMapper.updateByPrimaryKeySelective(wxMsgModel); - } - return new ResultData(Result.SUCCESS, "创建模板成功"); - }else if (ret == "-4") { - return new ResultData(Result.SUCCESS, "短信签名或内容错误"); + public void saveOrUpdate(WxMsgModel record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + wxMsgModelMapper.insertSelective(record); + } else { + wxMsgModelMapper.updateByPrimaryKeySelective(record); } - return new ResultData(Result.SUCCESS, "创建模板失败"); } @Override diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java index 5f38b6d7c..1b1b4aad5 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMsgServiceImpl.java @@ -1,25 +1,14 @@ package com.simple.service.impl; -import com.alibaba.fastjson.JSONObject; +import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.common.IdWorker; -import com.simple.common.ResultData; import com.simple.domain.po.WxMsg; import com.simple.mapper.WxMsgMapper; import com.simple.service.WxMsgService; -import com.simple.utils.AesUtil; -import com.simple.utils.HMACSHA256; -import com.simple.utils.HttpUtil; -import com.simple.utils.RsaUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; +import com.simple.common.IdWorker; @Service public class WxMsgServiceImpl implements WxMsgService { @@ -40,54 +29,6 @@ public class WxMsgServiceImpl implements WxMsgService { @Override public void saveOrUpdate(WxMsg record) { - String secret="7305150347587283553aa8898e7dbf20"; - String bid="465565";//通过短信配置数据查询出来 - String phone="13810135185"; - String signature="123"; - String msg="测试"; - String notifyUrl="http://07d393ee.ngrok.io/receivemsg/"+bid; - TreeMap message = new TreeMap<>(); - message.put("bid",bid); - message.put("phone",phone); - message.put("signature",signature); - message.put("msg",msg); - message.put("notify_url",notifyUrl); - - StringBuilder sb=new StringBuilder(); - Set> entries = message.entrySet(); - for(Map.Entry entry:entries){ - sb.append(entry.getKey()).append("=").append(entry.getValue()); - } - sb.append("&secret=").append(secret); - String sign = HMACSHA256.sha256_HMAC(sb.toString(), secret); - message.put("sign",sign.toUpperCase()); - - String str32="198b02e8fd704e96198b02e8fd704e96"; - String iv="198b02e8fd704e96"; - - Map params=new HashMap<>(); - params.put("iv",iv); - params.put("bid",bid); - - try { - String data = AesUtil.AESEncode(str32, JSONObject.toJSONString(message), iv); - String sc = RsaUtil.RSAEncode(str32.getBytes(),""); - params.put("data",data); - params.put("sc",sc); - } catch (Exception e) { - e.printStackTrace(); - } - - String requestUrl="https://webapp.wiwide.com/apisms/send"; - String result = HttpUtil.doPost(requestUrl, params); - JSONObject jsonObjectResult = JSONObject.parseObject(result); - String ret=jsonObjectResult.get("ret").toString(); - if(ret.equals("1")){ - System.out.println("发送成功"); - }else{ - System.out.println("发送失败"); - } - if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); IdWorker idWorker = new IdWorker(0, 0); @@ -102,16 +43,12 @@ public class WxMsgServiceImpl implements WxMsgService { public void deleteById(Long id) { wxMsgMapper.deleteByPrimaryKey(id); } - - @Override - public ResultData sendmsgbyexcel(MultipartFile file, WxMsg wxMsg) { - return null; - } - - @Override - public ResultData sendmsgbylabel(WxMsg wxMsg) { - return null; - } - - + + + + + + + + } diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index 00609bef8..10d581658 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -5,10 +5,12 @@ + + - `id`,`tenant_id`,`title` + `id`,`tenant_id`,`title`,`create_date`,`update_date` @@ -27,6 +29,16 @@ and `title` like concat('%', #{title},'%') + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml index b9d30c3c5..04040d13c 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarsMapper.xml @@ -6,10 +6,12 @@ + + - `id`,`tenant_id`,`c_user_id`,`car_number` + `id`,`tenant_id`,`c_user_id`,`car_number`,`create_date`,`update_date` @@ -33,6 +35,16 @@ and `car_number` like concat('%', #{carNumber},'%') + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 308f06c80..5815c77be 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -15,18 +15,19 @@ - + + + - - `id`,`tenant_id`,`open_id`,`union_id`,`nick_name`,`gender`,`avatar_url`,`phone`,`pure_phone`,`city`,`province`,`language`,`country_code`,`qrcode_source`,`register_ip`,`scene`,`scene_address`,`session_key`,`update_date`,`create_date`,`score` + `id`,`tenant_id`,`open_id`,`union_id`,`nick_name`,`gender`,`avatar_url`,`phone`,`pure_phone`,`city`,`province`,`language`,`country_code`,`register_ip`,`verify_code_phone`,`qrcode_source`,`scene`,`scene_address`,`session_key`,`score`,`update_date`,`create_date` @@ -97,13 +98,18 @@ - - and `qrcode_source` like concat('%', #{qrcodeSource},'%') + + and `register_ip` like concat('%', #{registerIp},'%') - - and `register_ip` like concat('%', #{registerIp},'%') + + and `verify_code_phone` like concat('%', #{verifyCodePhone},'%') + + + + + and `qrcode_source` like concat('%', #{qrcodeSource},'%') @@ -122,6 +128,11 @@ + + and `score` = #{score} + + + and `update_date` = #{updateDate} @@ -130,11 +141,6 @@ and `create_date` = #{createDate} - - - - and `score` = #{score} - and id in diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index 9961e5781..7225a3dc6 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -6,10 +6,12 @@ + + - `id`,`tenant_id`,`user_id`,`tags` + `id`,`tenant_id`,`user_id`,`tags`,`create_date`,`update_date` @@ -33,6 +35,16 @@ and `tags` like concat('%', #{tags},'%') + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml index 198708b94..593463c99 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml @@ -5,10 +5,15 @@ + + + + + - `id`,`tenant_id`,`park_id` + `id`,`tenant_id`,`park_id`,`merchant_id`,`vendor_type`,`vendor_params`,`create_date`,`update_date` @@ -27,6 +32,31 @@ and `park_id` = #{parkId} + + + + and `merchant_id` = #{merchantId} + + + + + and `vendor_type` = #{vendorType} + + + + + and `vendor_params` like concat('%', #{vendorParams},'%') + + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxCouponVerifyMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponVerifyMapper.xml new file mode 100644 index 000000000..ef79ffe66 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCouponVerifyMapper.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + `id`,`tenant_id`,`coupon_id`,`order_id`,`c_user_id`,`buy_date`,`limit_date`,`c_status`,`b_user_id`,`verification_date`,`verification_status` + + + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `coupon_id` = #{couponId} + + + + + and `order_id` = #{orderId} + + + + + and `c_user_id` = #{cUserId} + + + + + and `buy_date` = #{buyDate} + + + + + and `limit_date` = #{limitDate} + + + + + and `c_status` = #{cStatus} + + + + + and `b_user_id` = #{bUserId} + + + + + and `verification_date` = #{verificationDate} + + + + + and `verification_status` = #{verificationStatus} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml b/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml index 98a9e1e2d..16cec877f 100644 --- a/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFlashSaleMapper.xml @@ -5,13 +5,13 @@ - - + + - `id`,`tenant_id`,`activity_id`,`createtime`,`uptime`,`is_enable` + `id`,`tenant_id`,`activity_id`,`is_enable`,`create_date`,`up_date` @@ -32,18 +32,18 @@ - - and `createtime` = #{createtime} + + and `is_enable` = #{isEnable} - - and `uptime` = #{uptime} + + and `create_date` = #{createDate} - - and `is_enable` = #{isEnable} + + and `up_date` = #{upDate} diff --git a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml index 69ca95a27..98ae465aa 100644 --- a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml @@ -7,10 +7,12 @@ + + - `id`,`tenant_id`,`mall_id`,`name`,`floor_number` + `id`,`tenant_id`,`mall_id`,`name`,`floor_number`,`create_date`,`update_date` @@ -39,6 +41,16 @@ and `floor_number` = #{floorNumber} + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml index 90ecef911..ddda0a92a 100644 --- a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml @@ -7,10 +7,13 @@ + + + - `id`,`tenant_id`,`mall_id`,`building_id`,`floor_name` + `id`,`tenant_id`,`mall_id`,`building_id`,`floor_name`,`background_img`,`create_date`,`update_date` @@ -39,6 +42,21 @@ and `floor_name` like concat('%', #{floorName},'%') + + + + and `background_img` like concat('%', #{backgroundImg},'%') + + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml new file mode 100644 index 000000000..8586e5a56 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + `id`,`tenant_id`,`b_user_id`,`b_user_pwd`,`merchant_id`,`create_date`,`update_date` + + + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `b_user_id` = #{bUserId} + + + + + and `b_user_pwd` like concat('%', #{bUserPwd},'%') + + + + + and `merchant_id` = #{merchantId} + + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 22c5034a3..d69c3e923 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -9,10 +9,13 @@ + + + - `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name` + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`wxchat_account`,`create_date`,`update_date` @@ -52,7 +55,21 @@ and `bank_name` like concat('%', #{bankName},'%') - + + + and `wxchat_account` like concat('%', #{wxchatAccount},'%') + + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + + and id in diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml new file mode 100644 index 000000000..af0fb383f --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + `id`,`tenant_id`,`merchant_id`,`trade_amt`,`create_date` + + + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `merchant_id` = #{merchantId} + + + + + and `trade_amt` = #{tradeAmt} + + + + + and `create_date` = #{createDate} + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml index b57f30d1a..d8f4ddc76 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgCallbackMapper.xml @@ -2,7 +2,7 @@ - + @@ -20,16 +20,56 @@ where 1 = 1 - and `id` = #{id} - and `tenant_id` = #{tenantId} - and `batch_no` = #{batchNo} - and `phone` = #{phone} - and `begintime` = #{begintime} - and `endtime` = #{endtime} - and `status` = #{status} - and `status_msg` = #{statusMsg} - and `sign` = #{sign} - and `createtime` = #{createtime} + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `batch_no` like concat('%', #{batchNo},'%') + + + + + and `phone` like concat('%', #{phone},'%') + + + + + and `begintime` = #{begintime} + + + + + and `endtime` = #{endtime} + + + + + and `status` = #{status} + + + + + and `status_msg` like concat('%', #{statusMsg},'%') + + + + + and `sign` like concat('%', #{sign},'%') + + + + + and `createtime` = #{createtime} + + and id in diff --git a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml index 0bc497961..31cd66a3c 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml @@ -14,10 +14,11 @@ + - `id`,`tenant_id`,`secret`,`publickey`,`bid`,`recharge`,`remains`,`total`,`account`,`reminderstatus`,`reminder`,`phone` + `id`,`tenant_id`,`secret`,`publickey`,`bid`,`recharge`,`remains`,`total`,`account`,`reminderstatus`,`reminder`,`phone`,`notifyurl` @@ -81,6 +82,11 @@ and `phone` like concat('%', #{phone},'%') + + + + and `notifyurl` like concat('%', #{notifyurl},'%') + and id in diff --git a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml index 663c1ae8f..b4b8f0fc7 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml @@ -14,14 +14,13 @@ + - - - + - `id`,`tenant_id`,`model_id`,`msg`,`sendtime`,`createtime`,`expect_send_number`,`success_number`,`error_number`,`return_result`,`phones`,`signature`,`name`,`isright`,`sendstatus` + `id`,`tenant_id`,`model_id`,`msg`,`sendtime`,`createtime`,`expect_send_number`,`success_number`,`error_number`,`return_result`,`phones`,`signature`,`isright`,`name`,`sendstatus` @@ -80,22 +79,27 @@ and `phones` like concat('%', #{phones},'%') - - - and `signature`=#{signature} - - - - and `name`=#{name} - - - - and `isright`=#{isright} - - - - and `sendstatus`=#{sendstatus} - + + + + and `signature` like concat('%', #{signature},'%') + + + + + and `isright` = #{isright} + + + + + and `name` like concat('%', #{name},'%') + + + + + and `sendstatus` = #{sendstatus} + + and id in diff --git a/mallinkService/src/main/resources/mapper/WxParkMapper.xml b/mallinkService/src/main/resources/mapper/WxParkMapper.xml index 3ead6da3c..42830ebb7 100644 --- a/mallinkService/src/main/resources/mapper/WxParkMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxParkMapper.xml @@ -7,10 +7,14 @@ + + + + - `id`,`tenant_id`,`addr`,`number`,`entry_exit` + `id`,`tenant_id`,`addr`,`number`,`entry_exit`,`create_date`,`update_date`,`vendor_type`,`vendor_params` @@ -39,6 +43,26 @@ and `entry_exit` = #{entryExit} + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + + + + + and `vendor_type` = #{vendorType} + + + + + and `vendor_params` like concat('%', #{vendorParams},'%') + and id in diff --git a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml index 111638dfc..33fcb7411 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml @@ -6,10 +6,12 @@ + + - `id`,`tenant_id`,`consumption_amount`,`score_number` + `id`,`tenant_id`,`consumption_amount`,`score_number`,`create_date`,`update_date` @@ -33,6 +35,16 @@ and `score_number` = #{scoreNumber} + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml index dd0faf5c0..9045c9b15 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml @@ -5,10 +5,12 @@ + + - `id`,`tenant_id`,`year` + `id`,`tenant_id`,`year`,`create_date`,`update_date` @@ -27,6 +29,16 @@ and `year` like concat('%', #{year},'%') + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml index af778790f..b8fcbc396 100644 --- a/mallinkService/src/main/resources/mapper/WxTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTagsMapper.xml @@ -7,10 +7,12 @@ + + - `id`,`tenant_id`,`name`,`type1`,`type2` + `id`,`tenant_id`,`name`,`type1`,`type2`,`create_date`,`update_date` @@ -39,6 +41,16 @@ and `type2` like concat('%', #{type2},'%') + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + and id in