From 9367723124032bf73609bbf66d2416624e692872 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 27 Aug 2018 01:10:30 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E6=B7=BB=E5=8A=A0]:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?,=E6=8F=90=E4=BE=9B=E4=B8=B0=E5=AF=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 36 ++-------- .../WxDateAmountRecordController.java | 9 +-- .../simple/mapper/WxCouponOrderMapper.java | 2 + .../simple/service/WxCouponOrderService.java | 12 ++++ .../impl/WxCouponOrderServiceImpl.java | 8 +++ .../resources/mapper/WxCouponOrderMapper.xml | 68 +++++++++++++++++++ 6 files changed, 99 insertions(+), 36 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java index 2b3656de5..bd546f0ea 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxCouponOrder; +import com.simple.domain.vo.WxCouponOrderBVo; import com.simple.service.WxCouponOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -29,39 +30,10 @@ public class WxCouponOrderController extends BaseController @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { - if (null == wxCouponOrder) wxCouponOrder = new WxCouponOrder(); - final PageInfo page = wxCouponOrderService.listAsPage(wxCouponOrder, pageNum, pageSize); - return new ResultData(page); + if (wxCouponOrder == null) wxCouponOrder= new WxCouponOrder(); + wxCouponOrder.setTenantId(getTenantId()); + return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); } - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCouponOrder wxCouponOrder) { - //Assert.notNull(wxCouponOrder.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxCouponOrderService.saveOrUpdate(wxCouponOrder); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCouponOrder wxCouponOrder) { - wxCouponOrderService.saveOrUpdate(wxCouponOrder); - return new ResultData(); - } - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCouponOrderService.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,"查询成功",wxCouponOrderService.getById(id)); - } } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java index 9ef9ba6cd..bb87f0fdf 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java @@ -34,15 +34,15 @@ public class WxDateAmountRecordController extends BaseController private WxDateAmountRecordService wxDateAmountRecordService; private Logger logger = Logger.getLogger(WxDateAmountRecordController.class); - - - @ApiOperation("首页查询交易金额记录接口") + + + @ApiOperation("首页查询交易金额记录接口") @GetMapping("listOrder") public ResultData listOrder() { return list(0); } - @ApiOperation("首页查询交易金额记录接口") + @ApiOperation("首页查询核销金额记录接口") @GetMapping("listVerified") public ResultData listVerified() { return list(1); @@ -57,6 +57,7 @@ public class WxDateAmountRecordController extends BaseController temp.setTenantId(u.getTenantId()); temp.setMerchantId(u.getMerchantId()); temp.setType(verified); + temp.setSortColumns(WxDateAmountRecord.Field.UpdateDate_ASC); SimpleDateFormat fmt = new SimpleDateFormat("MM/dd"); diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java index 27a936815..b4cde9e0e 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java @@ -19,4 +19,6 @@ public interface WxCouponOrderMapper extends CommonMapper { List findListOfCUser(Map paramMap); WxCouponOrderCVo selectDetailOfCUser(Map paramMap); + + List findListOfAdmin(WxCouponOrder wxCouponOrder); } diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java index 10f184b42..6e49becda 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java @@ -95,4 +95,16 @@ public interface WxCouponOrderService { * @param bUserId B端用户 */ ResultData detailBUserVo(Long bUserId, String couponOrderId); + + + /** + * A端查询分页列表 + * + * @param wxCouponOrder + * @param pageIndex + * @param pageSize + * @return + */ + ResultData listAdminAsPage(WxCouponOrder wxCouponOrder, Integer pageIndex, Integer pageSize); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index b96a18597..258231995 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -7,6 +7,7 @@ import com.simple.common.IdWorker; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.*; +import com.simple.domain.vo.WxCouponOrderBVo; import com.simple.domain.vo.WxCouponOrderCVo; import com.simple.enums.EnumCouponOrderStatus; import com.simple.enums.EnumCouponStatus; @@ -47,6 +48,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findList(record)); } + + @Override public WxCouponOrder getById(Long id) { return wxCouponOrderMapper.selectByPrimaryKey(id); @@ -209,6 +212,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(wxCouponOrderCVo); } + @Override + public ResultData listAdminAsPage(WxCouponOrder wxCouponOrder, Integer pageIndex, Integer pageSize) { + + return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrder))); + } @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 35a7b1e9d..ce756bd11 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -169,6 +169,74 @@ order by co.update_date desc +