diff --git a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java index e485139..30a20a4 100644 --- a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java @@ -20,4 +20,5 @@ public class LpkCardBuildRecordVo implements Vo { private String countNumber; //总数 private String startNumber; //起始号 private String endNumber; //结束号 + private String bagName; } diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java index 9a5f442..26f4ce5 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java @@ -13,4 +13,6 @@ public class LpkGiftCardListQuery implements Query { private String state; private String noStart; //序列号开始 private String noEnd; //序列号结束 + private String sid; + private String serialNumber; } diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java index d196a4f..67f6670 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java @@ -25,4 +25,5 @@ public class LpkGiftCardListVo implements Vo { private String grantDate; private String customerMobile; private String customerSid; + private String bagName; } diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml index 709cca6..43b8f0f 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml @@ -7,12 +7,14 @@ + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java index b007134..742486f 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java @@ -67,4 +67,10 @@ public class LpkGiftCardRest { return lpkGiftCardService.cardList(pq); } + @ApiOperation("查看记录详情列表") + @PostMapping("/recordDetails") + public ResultBean> recordDetails(@RequestBody PagerQuery pq) { + return lpkGiftCardService.recordDetails(pq); + } + } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java index 966b649..182df32 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -14,6 +14,8 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordQuery; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo; import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo; import com.yxt.yyth.api.lpkgiftcard.*; import com.yxt.yyth.api.lpkgoods.LpkGoods; @@ -257,4 +259,25 @@ public class LpkGiftCardService extends MybatisBaseService selAllByRecordSid(String sid) { return baseMapper.selAllByRecordSid(sid); } + + public ResultBean> recordDetails(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + LpkGiftCardListQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("1", "1"); + if (StringUtils.isNotBlank(query.getState())) { + qw.eq("state", query.getState()); + } + if (StringUtils.isNotBlank(query.getSerialNumber())) { + qw.like("serialNumber", query.getSerialNumber()); + } + if (StringUtils.isNotBlank(query.getSid())) { + qw.like("recordSid", query.getSid()); + } + qw.orderByDesc("createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.recordDetails(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } }