From 059483aefe2d36b7136e01f333ffed735f04e318 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 8 Jan 2024 11:50:36 +0800
Subject: [PATCH] 1/8

---
 .../java/com/yxt/yyth/api/lpkgoods/LpkGoods.java     |  1 +
 .../com/yxt/yyth/api/lpkgoods/LpkGoodsDetailsVo.java |  2 ++
 .../java/com/yxt/yyth/api/lpkgoods/LpkGoodsDto.java  |  1 +
 .../yyth/biz/appletgiftbag/AppletGiftBagService.java |  4 ++--
 .../com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml     |  3 ++-
 .../java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java |  5 +++++
 .../com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java   | 12 ++++++++++++
 7 files changed, 25 insertions(+), 3 deletions(-)

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 f962e4e..b01e1c0 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoods.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoods.java
@@ -34,5 +34,6 @@ public class LpkGoods {
     private String number;
     private String isAppletGrounding;
     private String content;
+    private String weight;
     private String useTo;
 }
diff --git a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDetailsVo.java b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDetailsVo.java
index a0a9da8..eee489c 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDetailsVo.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDetailsVo.java
@@ -28,4 +28,6 @@ public class LpkGoodsDetailsVo implements Vo {
     private String appContent;
     private String specificationUnit;
     private double number;
+    private String content;
+    private String weight;
 }
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 44e739a..0526955 100644
--- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDto.java
+++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDto.java
@@ -24,5 +24,6 @@ public class LpkGoodsDto implements Dto {
     private String specificationUnit;
     private double number;
     private String content;
+    private String weight;
     private String useTo;
 }
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 f26b06b..1d84b89 100644
--- a/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java
+++ b/src/main/java/com/yxt/yyth/biz/appletgiftbag/AppletGiftBagService.java
@@ -231,9 +231,9 @@ public class AppletGiftBagService extends MybatisBaseService<AppletGiftBagMapper
         appletGiftBagVo.setName(s.getName());
         return rb.success().setData(appletGiftBagVo);
     }
-    public String aa(double a){
+    public static String aa(double a){
         BigDecimal d=new BigDecimal(a);
-        double c= d.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+        String  c= d.setScale(2,BigDecimal.ROUND_HALF_UP).toString();
         return String.valueOf(c);
     }
 
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 d6b49c5..abb34b2 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsMapper.xml
@@ -74,7 +74,8 @@
                content as remark,
                weight
         from lpk_goods
-        where isAppletGrounding=1
+        where isAppletGrounding=1 and useTo=1
+        order by createTime desc
     </select>
 
 </mapper>
\ 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 aafafd4..7b5c042 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsRest.java
@@ -68,6 +68,11 @@ public class LpkGoodsRest {
     public ResultBean<LpkGoodsDetailsVo> appletGrounding(@PathVariable("sid") String sid,@PathVariable("state") String state) {
         return lpkGoodsService.appletGrounding(sid,state);
     }
+    @ApiOperation("小程序商品是否自选")
+    @GetMapping("/appletUseTo/{sid}/{state}")
+    public ResultBean<LpkGoodsDetailsVo> appletUseTo(@PathVariable("sid") String sid,@PathVariable("state") String state) {
+        return lpkGoodsService.appletUseTo(sid,state);
+    }
     @ApiOperation("商品信息")
     @GetMapping("/getAllGiftBag")
     public ResultBean getAllGiftBag() {
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 15468c0..8da540b 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java
@@ -152,6 +152,18 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
         }
         return rb.success();
     }
+    public ResultBean appletUseTo(String sid,String state) {
+        ResultBean rb = ResultBean.fireFail();
+        LpkGoods lpkGoods = fetchBySid(sid);
+        if (null != lpkGoods) {
+            lpkGoods.setUseTo(state);
+            baseMapper.updateById(lpkGoods);
+        }else{
+            return rb;
+        }
+        return rb.success();
+    }
+
     public ResultBean<List<GiftBagGoods>> getAllGoodsApplet() {
         ResultBean rb = ResultBean.fireFail();
         List<GiftBagGoods> list=baseMapper.getAllGoodsApplet();