diff --git a/src/main/java/com/yxt/yythmall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetails.java b/src/main/java/com/yxt/yythmall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetails.java index 74e69be..2ab0542 100644 --- a/src/main/java/com/yxt/yythmall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetails.java +++ b/src/main/java/com/yxt/yythmall/api/transferrecordsgoodsdetails/TransferRecordsGoodsDetails.java @@ -1,5 +1,6 @@ package com.yxt.yythmall.api.transferrecordsgoodsdetails; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -20,7 +21,9 @@ public class TransferRecordsGoodsDetails { private String orderSid; private String goodsSid; - private double goodsNumber; + private double goodsNumber;//商品份数 + @TableField(exist = false) + private String goodsName;//商品名 } diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsRest.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsRest.java index 0757234..7bde630 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsRest.java +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsRest.java @@ -28,6 +28,11 @@ public class TransferRecordsRest { public ResultBean submission(@RequestBody TransferRecordsDto dto) { return TransferRecordsService.submission(dto); } + @ApiOperation("根据转赠卡号查询") + @PostMapping("/getTransferByCode/{code}") + public ResultBean getTransferByCode(@PathVariable("code") String code) { + return TransferRecordsService.getTransferByCode(code); + } @ApiOperation("转赠记录表") @PostMapping("/transferRecordsList") public ResultBean> transferRecordsList(@RequestBody PagerQuery pq) { diff --git a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java index be3dca0..7b38315 100644 --- a/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java +++ b/src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java @@ -29,6 +29,7 @@ import com.yxt.yythmall.biz.lpkgiftcard.generateRule.UniqueIdGenerator; import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService; import com.yxt.yythmall.biz.transferrecordsgoodsdetails.TransferRecordsGoodsDetailsService; import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService; +import com.yxt.yythmall.utils.DoubleUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -67,6 +68,23 @@ public class TransferRecordsService extends MybatisBaseService().eq("transferCode",code)); + + List list=transferRecordsGoodsDetailsService.list(new QueryWrapper().eq("orderSid",transferRecords.getSid())); + for (TransferRecordsGoodsDetails transferRecordsGoodsDetails : list) { + LpkGoods k=lpkGoodsService.getOne(new QueryWrapper().eq("sid",transferRecordsGoodsDetails.getGoodsSid())); + transferRecordsGoodsDetails.setGoodsName(k.getName()); + transferRecordsGoodsDetails.setRemarks(DoubleUtils.removeZeros(String.valueOf(transferRecordsGoodsDetails.getGoodsNumber()))+"份"); + } + + return rb.success().setData(list); + } + public ResultBean transferRecordsList(PagerQuery pq) { ResultBean rb = new ResultBean().fail(); TransferRecordsQuery query = pq.getParams(); diff --git a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java index b58b81a..b1de12f 100644 --- a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java +++ b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java @@ -94,6 +94,7 @@ public class SaTokenConfigure implements WebMvcConfigurer { .excludePathPatterns("/lpkgiftcard/bindAllCard") .excludePathPatterns("/lpkcustomer/customerInfo/**") .excludePathPatterns("/vegetablecellar/saveGoods") + .excludePathPatterns("/transferrecords/getTransferByCode/**") //2024-01-18 .excludePathPatterns("/lpkcustomer/getCustomerInfo/**") .excludePathPatterns("/lpkcustomer/modifyUserNickName")