From 506204f99c23880d18567d815a54d26316864f82 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 8 Jan 2024 10:36:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/yyth/api/appletgiftbag/AppletGiftBag.java | 1 + .../yxt/yyth/api/appletgiftbag/AppletGiftBagDto.java | 1 + src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoods.java | 3 ++- .../java/com/yxt/yyth/api/lpkgoods/LpkGoodsDto.java | 2 ++ .../java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java | 2 ++ .../yxt/yyth/biz/appletgiftbag/AppletGiftBagMapper.xml | 3 ++- .../yyth/biz/appletgiftbag/AppletGiftBagService.java | 10 +++++++--- .../appletgiftbaggoods/AppletGiftBagGoodsMapper.xml | 2 +- .../java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml | 3 ++- .../com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java | 2 +- 10 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBag.java b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBag.java index 1148600..b230695 100644 --- a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBag.java +++ b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBag.java @@ -31,4 +31,5 @@ public class AppletGiftBag { private String iconUrl; private String isGrounding; private String isRecommend; + private String preferentialPrice; } diff --git a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagDto.java b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagDto.java index 2d93ea9..eeeb41d 100644 --- a/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagDto.java +++ b/src/main/java/com/yxt/yyth/api/appletgiftbag/AppletGiftBagDto.java @@ -25,6 +25,7 @@ public class AppletGiftBagDto implements Dto { private String iconUrl; private String isGrounding; private String isRecommend; + private String preferentialPrice; //商品sid private List goods = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoods.java b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoods.java index 0719573..f962e4e 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoods.java +++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoods.java @@ -33,5 +33,6 @@ public class LpkGoods { private String specificationUnit; private String number; private String isAppletGrounding; - + private String content; + private String useTo; } diff --git a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDto.java b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDto.java index 9123646..44e739a 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDto.java +++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDto.java @@ -23,4 +23,6 @@ public class LpkGoodsDto implements Dto { private String appContent; private String specificationUnit; private double number; + private String content; + private String useTo; } 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 d99daf1..b0eeb70 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java @@ -33,5 +33,7 @@ public class LpkGoodsVo implements Vo { private String specificationUnit; private double number; private String isAppletGrounding; //1 上架 2 下架 + private String content; + private String useTo; } diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagMapper.xml b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagMapper.xml index 54f1ab4..0b0a357 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagMapper.xml @@ -23,7 +23,7 @@ isEnable, isGrounding, isRecommend - from lpk_giftbag + from applet_giftbag ${ew.sqlSegment} @@ -33,5 +33,6 @@ * from applet_giftbag where isGrounding=1 + order by isRecommend desc,createTime desc \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java index 093c661..a3d56e0 100644 --- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java @@ -92,7 +92,7 @@ public class AppletGiftBagService extends MybatisBaseService pagging = baseMapper.giftBagList(); return rb.success().setData(pagging); } - public ResultBean isGrounding(String sid,String state) { + public ResultBean isGrounding(String sid,String state) { ResultBean rb = new ResultBean().fail(); AppletGiftBag bag=baseMapper.selectOne(new QueryWrapper().eq("sid",sid)); bag.setIsGrounding(state); @@ -218,7 +222,7 @@ public class AppletGiftBagService extends MybatisBaseService 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 bbb8405..e0b3978 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml @@ -17,7 +17,8 @@ picUrl, specificationUnit, number, - isAppletGrounding + isAppletGrounding, + useTo from lpk_goods ${ew.sqlSegment} 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 288761d..e5eb978 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java @@ -159,7 +159,7 @@ public class LpkGoodsService extends MybatisBaseService{ s.setIconUrl(fileUploadComponent.getUrlPrefix() +s.getIconUrl()); s.setTotalValue(decimalFormat.format(0)); - s.setJPrice(String.valueOf(decimalFormat.format(Double.valueOf(s.getPrice())/Double.valueOf(s.getWeight())))); + s.setJPrice(String.valueOf(decimalFormat.format(Double.valueOf(s.getPrice())*Double.valueOf(s.getWeight())))); }); return rb.success().setData(list); }