Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/yythmall/api/lpkgoods/GoodsTypeVo.java

@@ -0,0 +1,14 @@
+package com.yxt.yythmall.api.lpkgoods;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/15 15:06
+ */
+@Data
+public class GoodsTypeVo {
+    private String name;
+    private String sid;
+    private String count;
+}

src/main/java/com/yxt/yythmall/api/vegecallerreserveorder/VegeCellarReserveOrderDto.java

@@ -18,6 +18,7 @@ public class VegeCellarReserveOrderDto implements Dto {
     private String userName;
     private String userPhone;
     private String userAddress;
+    private String affiliation;
     private List<GoodsVo> goodsVos;
     private String orderSid;
     private String addressName;

src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellarDto.java

@@ -1,8 +1,12 @@
 package com.yxt.yythmall.api.vegetablecellar;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
 import lombok.Data;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author wangpengfei
  * @date 2023/12/8 9:11
@@ -11,20 +15,14 @@ import lombok.Data;
 public class VegetableCellarDto implements Dto {
     private String id;
     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 isEnable;
-    private String recordId;
-    private String recordSid;
-    private String giftbagSid;
-    private String serialNumber;
-    private String code;
-    private String codeKey;
-    private String state;
-    private String grantName;
-    private String grantDate;
+    //    private String isEnable;
+    private String goodsSid;
     private String customerSid;
-    private String customerMobile;
-    private String Num;
-    private String cardArea;
+    private String affiliation;
+    private String goodsNumber;
+    private String totalNumber;
+    private List<vegeVo> vos;
 }

src/main/java/com/yxt/yythmall/api/vegetablecellar/vegeVo.java

@@ -0,0 +1,13 @@
+package com.yxt.yythmall.api.vegetablecellar;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/19 9:10
+ */
+@Data
+public class vegeVo {
+    private String goodsSid;
+    private String goodsNumber;
+}

src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardService.java

@@ -1773,7 +1773,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
     }
     public ResultBean  getGoodsByTypeSid(LpkGiftCardQuery query) {
         ResultBean rb=new ResultBean().fail();
-        List<GiftBagGoodss> giftBagGoodss=lpkGoodsService.getAllGoodsApplets().getData();
+        List<GiftBagGoodss> giftBagGoodss=lpkGoodsService.getAllGoodsApplets(query).getData();
         ShoppingCartQuery query1=new ShoppingCartQuery();
         query1.setAffiliation(query.getAffiliation());query1.setCustomerSid(query.getCustomerSid());
          List<ShoppingCartVo> l=shoppingCartService.shoppingCartList(query1).getData();

src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java

@@ -8,6 +8,7 @@ import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods;
 import com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss;
 import com.yxt.yythmall.api.appletgiftbag.MyGoodsVo;
 import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery;
+import com.yxt.yythmall.api.lpkgoods.GoodsTypeVo;
 import com.yxt.yythmall.api.lpkgoods.LpkGoods;
 import com.yxt.yythmall.api.lpkgoods.LpkGoodsQuery;
 import com.yxt.yythmall.api.lpkgoods.LpkGoodsVo;
@@ -32,5 +33,6 @@ public interface LpkGoodsMapper extends BaseMapper<LpkGoods> {
     LpkGoods getGoodsByName(@Param("goodName") String goodName);
     List<GiftBagGoods> getAllGoodsApplet();
     List<MyGoodsVo> getGoodsApplet( @Param("query") LpkGoodsQuery query);
-    List<GiftBagGoodss> getAllGoodsApplets();
+    List<GiftBagGoodss> getAllGoodsApplets(@Param("query") LpkGiftCardQuery query);
+    List<GoodsTypeVo> getType();
 }

src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml

@@ -113,6 +113,12 @@
                weight
         from lpk_goods
         where isAppletGrounding=1 and useTo=1
+        <if test="query.name!=null and query.name!=''">
+            name like #{query.name}
+        </if>
         order by createTime desc
     </select>
+    <select id="getType" resultType="com.yxt.yythmall.api.lpkgoods.GoodsTypeVo">
+        select name , id as sid  from pms_product_category where parent_id=0
+    </select>
 </mapper>

src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsRest.java

@@ -86,4 +86,14 @@ public class LpkGoodsRest {
     public ResultBean  vegeCellarTypeList(@RequestBody LpkGoodsQuery query) {
         return lpkGoodsService.vegeCellarTypeList(query);
     }
+    @ApiOperation("获取所有的商品类型")
+    @GetMapping("/getAllGoodsType")
+    public ResultBean  getAllType() {
+        return lpkGoodsService.getAllType();
+    }
+    @ApiOperation("根据类型查询商品")
+    @PostMapping("/getGoodsByType")
+    public ResultBean  getGoodsByType(@RequestBody LpkGiftCardQuery query) {
+        return lpkGoodsService.getGoodsByTypeSid(query);
+    }
 }

src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsService.java

@@ -12,9 +12,11 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.yythmall.api.appletgiftbag.*;
-import com.yxt.yythmall.api.lpkgiftcard.GoodsTypeVo;
 import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery;
 import com.yxt.yythmall.api.lpkgoods.*;
+import com.yxt.yythmall.api.shoppingcart.ShoppingCartQuery;
+import com.yxt.yythmall.api.shoppingcart.ShoppingCartVo;
+import com.yxt.yythmall.biz.shoppingcart.ShoppingCartService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +36,8 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
 
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    ShoppingCartService shoppingCartService;
 
 
     public ResultBean<PagerVo<LpkGoodsVo>> goodsListPage(PagerQuery<LpkGoodsQuery> pq) {
@@ -177,9 +181,9 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
         });
         return rb.success().setData(list);
     }
-    public ResultBean<List<GiftBagGoodss>> getAllGoodsApplets() {
+    public ResultBean<List<GiftBagGoodss>> getAllGoodsApplets(LpkGiftCardQuery query) {
         ResultBean rb = ResultBean.fireFail();
-        List<GiftBagGoodss> list=baseMapper.getAllGoodsApplets();
+        List<GiftBagGoodss> list=baseMapper.getAllGoodsApplets(query);
         list.forEach(s->{
             double price=Double.valueOf(s.getPrice());
             double jPrice =Double.valueOf(s.getJPrice());
@@ -233,5 +237,24 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
         vo.add(vo4);
         return rb.success().setData(vo);
     }
-
+    public ResultBean<List<GoodsTypeVo>>  getAllType() {
+        ResultBean rb=new ResultBean().fail();
+        List<GoodsTypeVo> list=baseMapper.getType();
+        return rb.success().setData(list);
+    }
+    public ResultBean  getGoodsByTypeSid(LpkGiftCardQuery query) {
+        ResultBean rb=new ResultBean().fail();
+        List<GiftBagGoodss> giftBagGoodss=baseMapper.getAllGoodsApplets(query);
+        ShoppingCartQuery query1=new ShoppingCartQuery();
+        query1.setAffiliation(query.getAffiliation());query1.setCustomerSid(query.getCustomerSid());
+        List<ShoppingCartVo> l=shoppingCartService.shoppingCartList(query1).getData();
+        l.forEach(s->{
+            giftBagGoodss.forEach(d->{
+                if(s.getGoodsSid().equals(d.getGoodsSid())){
+                    d.setGoodsNumber(s.getGoodsNumber());
+                }
+            });
+        });
+        return rb.success().setData(giftBagGoodss);
+    }
 }

src/main/java/com/yxt/yythmall/biz/vegecallerreservedetail/VegeCellarReserveDetailsService.java

@@ -2,6 +2,7 @@ package com.yxt.yythmall.biz.vegecallerreservedetail;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.yythmall.api.empcardgiftgoods.EmpCardGiftGoodsVo;
@@ -9,8 +10,10 @@ import com.yxt.yythmall.api.lpkgiftcard.AppletVo;
 import com.yxt.yythmall.api.lpkgiftcard.GoodsVo;
 import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails;
 import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderDto;
+import com.yxt.yythmall.api.vegetablecellar.VegetableCellar;
 import com.yxt.yythmall.biz.empcardgiftgoods.EmpCardGiftGoodsService;
 import com.yxt.yythmall.biz.lpkgiftcard.LpkGiftCardService;
+import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,7 +28,7 @@ public class VegeCellarReserveDetailsService extends MybatisBaseService<VegeCell
     @Autowired
     LpkGiftCardService lpkGiftCardService;
     @Autowired
-    EmpCardGiftGoodsService empCardGiftGoodsService;
+    VegetableCellarService vegetableCellarService;
 
 
     public ResultBean<VegeCellarReserveDetails> getReserveByCardSid(String carSid, String goodsSid) {
@@ -46,6 +49,10 @@ public class VegeCellarReserveDetailsService extends MybatisBaseService<VegeCell
                 goods.setGoodsNumber(goods1.getSelect());
                 goods.setCreateTime(new DateTime());
                 baseMapper.insert(goods);
+                VegetableCellar vegetableCellar= vegetableCellarService.list(new QueryWrapper<VegetableCellar>().eq("customerSid",dto.getCustomerSid())
+                        .eq("goodsSid",goods1.getGoodsSid()).eq("affiliation",dto.getAffiliation())).get(0);
+                vegetableCellar.setGoodsNumber(String.valueOf((int)(Double.valueOf(vegetableCellar.getGoodsNumber())-Double.valueOf(goods1.getSelect()))));
+                vegetableCellarService.updateById(vegetableCellar);
             }
         }
 

src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarRest.java

@@ -26,4 +26,9 @@ public class VegetableCellarRest {
     public ResultBean addGoods(@RequestParam("mainSid") String mainSid) {
         return VegetableCellarService.addGoods(mainSid);
     }
+    @ApiOperation("创建记录列表")
+    @PostMapping("/saveGoods")
+    public ResultBean saveGoods(@RequestBody VegetableCellarDto dto) {
+        return VegetableCellarService.saveGoods(dto);
+    }
 }

src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java

@@ -10,13 +10,12 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.yythmall.api.ordorder.OrdOrder;
 import com.yxt.yythmall.api.ordorderdetails.OrdOrderDetail;
-import com.yxt.yythmall.api.vegetablecellar.VegetableCellar;
-import com.yxt.yythmall.api.vegetablecellar.VegetableCellarDto;
-import com.yxt.yythmall.api.vegetablecellar.VegetableCellarQuery;
-import com.yxt.yythmall.api.vegetablecellar.VegetableCellarVo;
+import com.yxt.yythmall.api.shoppingcart.ShoppingCart;
+import com.yxt.yythmall.api.vegetablecellar.*;
 import com.yxt.yythmall.biz.empcard.EmpCardService;
 import com.yxt.yythmall.biz.ordorder.OrdOrderService;
 import com.yxt.yythmall.biz.ordorderdetails.OrdOrderDetailService;
+import com.yxt.yythmall.biz.shoppingcart.ShoppingCartService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -33,6 +32,8 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
     OrdOrderService ordOrderService;
     @Autowired
     OrdOrderDetailService ordOrderDetailService;
+    @Autowired
+    ShoppingCartService shoppingCartService;
     public ResultBean addGoods(String mainSid) {
         ResultBean rb = ResultBean.fireFail();
         OrdOrder ordOrder=ordOrderService.getOne(new QueryWrapper<OrdOrder>().eq("mainSid",mainSid));
@@ -54,4 +55,28 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
         }
         return rb.success().setMsg("成功");
     }
+    public ResultBean saveGoods(VegetableCellarDto  dto) {
+        ResultBean rb = ResultBean.fireFail();
+
+
+        for(vegeVo detail:dto.getVos()){
+            VegetableCellar vegetableCellar=baseMapper.selectOne(new QueryWrapper<VegetableCellar>().eq("customerSid",dto.getCustomerSid())
+                    .eq("goodsSid",detail.getGoodsSid()).eq("affiliation",dto.getAffiliation()));
+            if(vegetableCellar==null){
+                VegetableCellar vegetable=new VegetableCellar();
+                vegetable.setAffiliation(dto.getAffiliation());
+                vegetable.setGoodsSid(detail.getGoodsSid());
+                vegetable.setGoodsNumber(detail.getGoodsNumber());
+                vegetable.setCustomerSid(dto.getCustomerSid());
+                baseMapper.insert(vegetable);
+            }else{
+                vegetableCellar.setGoodsNumber(String.valueOf(Double.valueOf(vegetableCellar.getGoodsNumber())+Double.valueOf(detail.getGoodsNumber())));
+                baseMapper.updateById(vegetableCellar);
+            }
+            ShoppingCart shoppingCart=shoppingCartService.getOne((new QueryWrapper<ShoppingCart>().eq("customerSid",dto.getCustomerSid())
+                            .eq("goodsSid",detail.getGoodsSid()).eq("affiliation",dto.getAffiliation())));
+            shoppingCartService.delShoppingCart(shoppingCart.getSid());
+        }
+        return rb.success().setMsg("成功");
+    }
 }

src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java

@@ -61,6 +61,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/appletgiftbag/recommendRecord/**")
                 //2024-01-17
                 .excludePathPatterns("/lpkgiftcard/getAllGoodsType/**")
+                .excludePathPatterns("/lpkgoods/getAllGoodsType/**")
                 .excludePathPatterns("/lpkgiftcard/getGoodsByType/**")
                 .excludePathPatterns("/shoppingcart/addShoppingCart")
                 .excludePathPatterns("/shoppingcart/getGoodsWeight")
@@ -72,6 +73,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/customerstore/getStoreBySid/**")
                 .excludePathPatterns("/lpkgiftcard/bindAllCard")
                 .excludePathPatterns("/lpkcustomer/customerInfo/**")
+                .excludePathPatterns("/vegetablecellar/saveGoods")
                 //2024-01-18
                 .excludePathPatterns("/lpkcustomer/getCustomerInfo/**")
                 .excludePathPatterns("/lpkcustomer/modifyUserNickName")