diff --git a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java index 06b9f80..76c9b08 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java @@ -19,7 +19,8 @@ import java.util.UUID; public class LpkGoodsVo implements Vo { private String sid; - private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; private String remarks; private String code; private String barcode; diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.java index 2d39c98..a2a5d3c 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.java @@ -23,4 +23,5 @@ public interface LpkGoodsMapper extends BaseMapper { IPage goodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List getGoods(); + LpkGoodsVo getGoodsDetails(@Param("sid")String sid); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml index 29c2889..da5ac93 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml @@ -32,4 +32,18 @@ picUrl from lpk_goods + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java index 898b02e..338a749 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java @@ -56,4 +56,10 @@ public class LpkGoodsRest { public ResultBean> getGoods() { return lpkGoodsService.getGoods(); } + + @ApiOperation("商品详情") + @GetMapping("/goodsDetails/{sid}") + public ResultBean goodsDetails(@PathVariable("sid") String sid) { + return lpkGoodsService.goodsDetails(sid); + } } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java index b043d7f..2be9826 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java @@ -93,6 +93,20 @@ public class LpkGoodsService extends MybatisBaseService goodsDetails(String sid) { + ResultBean rb = ResultBean.fireFail(); + LpkGoodsDetailsVo vo = new LpkGoodsDetailsVo(); + LpkGoodsVo lpkGoods = baseMapper.getGoodsDetails(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (null != lpkGoods) { + BeanUtil.copyProperties(lpkGoods, vo); + if (StringUtils.isNotBlank(lpkGoods.getPicUrl())) { + vo.setPicUrl(fileUploadComponent.getUrlPrefix() + lpkGoods.getPicUrl()); + } + vo.setCreateTime(sdf.format(lpkGoods.getCreateTime())); + } + return rb.success().setData(vo); + } public ResultBean deleteGoods(String sid) { ResultBean rb = ResultBean.fireFail();