product_platform/yxt-yyth-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

卡片信息详情接口完善

Browse Source
This commit is contained in:
fanzongzhe
2023-11-24 18:07:23 +08:00
parent c8ca3a9af2
commit db70794994
10 changed files with 73 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java
View File

@@ -20,4 +20,5 @@ public class LpkCardBuildRecordVo implements Vo {
private String countNumber; //总数
private String startNumber; //起始号
private String endNumber; //结束号
private String bagName;
}

2
src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListQuery.java
View File

@@ -13,4 +13,6 @@ public class LpkGiftCardListQuery implements Query {
private String state;
private String noStart; //序列号开始
private String noEnd; //序列号结束
private String sid;
private String serialNumber;
}

1
src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java
View File

@@ -25,4 +25,5 @@ public class LpkGiftCardListVo implements Vo {
private String grantDate;
private String customerMobile;
private String customerSid;
private String bagName;
}

14
src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml
View File

@@ -7,12 +7,14 @@
<select id="recordListPage" resultType="com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo">
select
sid,
date_format(buildDate, '%Y-%m-%d') as buildDate,
countNumber,
startNumber,
endNumber
from lpk_card_build_record
r.sid,
r.date_format(buildDate, '%Y-%m-%d') as buildDate,
r.countNumber,
r.startNumber,
r.endNumber,
g.name as bagName
from lpk_card_build_record as r
left join lpk_giftbag as g on r.giftbagSid = g.sid
<where>
${ew.sqlSegment}
</where>

9
src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java
View File

@@ -6,6 +6,8 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordQuery;
import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo;
import com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListQuery;
import com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.junit.Test;
@@ -31,9 +33,6 @@ public class LpkCardBuildRecordRest {
return lpkCardBuildRecordService.recordListPage(pq);
}
@ApiOperation("创建记录列表")
@GetMapping("/recordDetails/{sid}")
public ResultBean recordDetails(@PathVariable("sid") String sid) {
return lpkCardBuildRecordService.recordDetails(sid);
}
}

19
src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java
View File

@@ -14,6 +14,7 @@ import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo;
import com.yxt.yyth.api.lpkcustomer.LpkCustomer;
import com.yxt.yyth.api.lpkcustomer.LpkCustomerQuery;
import com.yxt.yyth.api.lpkcustomer.LpkCustomerVo;
import com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListQuery;
import com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListVo;
import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,27 +40,19 @@ public class LpkCardBuildRecordService extends MybatisBaseService<LpkCardBuildRe
QueryWrapper<LpkCardBuildRecord> qw = new QueryWrapper<>();
qw.eq("1", "1");
if (StringUtils.isNotBlank(query.getCountNumber())) {
qw.eq("countNumber", query.getCountNumber());
qw.eq("r.countNumber", query.getCountNumber());
}
String startDate = query.getStartDate();
String effEndTime = query.getEndDate();
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (buildDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
apply(org.apache.commons.lang3.StringUtils.isNotEmpty(effEndTime), "date_format (buildDate,'%Y-%m-%d') <= date_format('" + effEndTime + "','%Y-%m-%d')"
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (r.buildDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
apply(org.apache.commons.lang3.StringUtils.isNotEmpty(effEndTime), "date_format (r.buildDate,'%Y-%m-%d') <= date_format('" + effEndTime + "','%Y-%m-%d')"
);
qw.orderByDesc("createTime");
qw.orderByDesc("r.createTime");
IPage<LpkCardBuildRecord> page = PagerUtil.queryToPage(pq);
IPage<LpkCardBuildRecordVo> pagging = baseMapper.recordListPage(page, qw);
PagerVo<LpkCardBuildRecordVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public ResultBean recordDetails(String sid) {
ResultBean rb = ResultBean.fireFail();
List<LpkGiftCardListVo> list = new ArrayList<>();
LpkCardBuildRecord record = fetchBySid(sid);
if (record != null) {
list = lpkGiftCardService.selAllByRecordSid(sid);
}
return rb.success().setData(list);
}
}

2
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java
View File

@@ -47,4 +47,6 @@ public interface LpkGiftCardMapper extends BaseMapper<LpkGiftCard> {
IPage<LpkGiftCardListVo> cardList(IPage<LpkGiftCard> page, @Param(Constants.WRAPPER) QueryWrapper<LpkGiftCard> qw);
List<LpkGiftCardListVo> selAllByRecordSid(@Param("sid") String sid);
IPage<LpkGiftCardListVo> recordDetails(IPage<LpkGiftCard> page, @Param(Constants.WRAPPER) QueryWrapper<LpkGiftCard> qw);
}

20
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
View File

@@ -65,6 +65,26 @@
FROM lpk_giftcard
where recordSid = #{sid}
</select>
<select id="recordDetails" resultType="com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListVo">
SELECT
sid,
date_format(createTime, '%Y-%m-%d') as createTime,
remarks,
giftbagSid,
serialNumber,
code,
codeKey,
`state`,
grantName,
date_format(grantDate, '%Y-%m-%d') as grantDate,
customerMobile,
customerSid
FROM
lpk_giftcard
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

6
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
View File

@@ -67,4 +67,10 @@ public class LpkGiftCardRest {
return lpkGiftCardService.cardList(pq);
}
@ApiOperation("查看记录详情列表")
@PostMapping("/recordDetails")
public ResultBean<PagerVo<LpkGiftCardListVo>> recordDetails(@RequestBody PagerQuery<LpkGiftCardListQuery> pq) {
return lpkGiftCardService.recordDetails(pq);
}
}

23
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
View File

@@ -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<LpkGiftCardMapper, Lp
public List<LpkGiftCardListVo> selAllByRecordSid(String sid) {
return baseMapper.selAllByRecordSid(sid);
}
public ResultBean<PagerVo<LpkGiftCardListVo>> recordDetails(PagerQuery<LpkGiftCardListQuery> pq) {
ResultBean rb = ResultBean.fireFail();
LpkGiftCardListQuery query = pq.getParams();
QueryWrapper<LpkGiftCard> 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<LpkGiftCard> page = PagerUtil.queryToPage(pq);
IPage<LpkGiftCardListVo> pagging = baseMapper.recordDetails(page, qw);
PagerVo<LpkGiftCardListVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
}