1/20

src/main/java/com/yxt/yythmall/api/appletgiftbag/GiftBagGoodss.java

@@ -25,6 +25,7 @@ public class GiftBagGoodss {
     private String count="0"; //总价值
     private String mefenPrice="0";
     private boolean showCart=false;
+    private String prefPrice;//优惠价格
 
 
 

src/main/java/com/yxt/yythmall/api/empcardgift/SaveVegetableVo.java

@@ -0,0 +1,17 @@
+package com.yxt.yythmall.api.empcardgift;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/20 16:27
+ */
+@Data
+public class SaveVegetableVo {
+    private String goodsSid;
+    private String goodsName;
+    private String goodsNumber;
+    private String barndId;
+    private String cetegoryId;
+
+}

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

@@ -14,4 +14,5 @@ public class LpkGoodsQuery implements Query {
     private String name;
     private String customerSid;
     private String affiliation;
+    private String brandId;
 }

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

@@ -12,4 +12,5 @@ import lombok.Data;
 public class OrderGoodsVo implements Vo {
     private int num;
     private String goodName;
+    private String unitName;
 }

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

@@ -26,5 +26,6 @@ public class VegeCellarReserveOrder {
     private String userPhone;
     private String userAddress;
     private String reserveCode;
+    private String storeName;
 
 }

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

@@ -15,6 +15,7 @@ public class VegeCellarReserveOrderDto implements Dto {
     private String customerSid;
     private String reserveDate;
     private String storeSid;
+    private String storeName;
     private String userName;
     private String userPhone;
     private String userAddress;

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

@@ -14,8 +14,10 @@ public class VegeCellarReserveOrderQuery implements Query {
     private String startDate; //预约开始日期
     private String endDate; // 预约结束日期
     private String userSid;
+    private String customerSid;
     private String storeSid;
     private String bankSid;
     private String bankName;
     private String serialNumber;
+    private String state;
 }

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

@@ -36,4 +36,8 @@ public class VegeCellarReserveOrderVo implements Vo {
     private String linkPhone;
     private String address;
     private String cardType;
+    private String goodss;
+    private String stateValue;
+    private String affiliationValue;
+    private String reserveCode;
 }

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

@@ -26,4 +26,5 @@ public class VegetableCellarDto implements Dto {
     private String totalNumber;
     private List<vegeVo> vos;
     private String transferSid;//转赠sid
+    private String brandId;//转赠sid
 }

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

@@ -9,5 +9,6 @@ import lombok.Data;
 @Data
 public class vegeVo {
     private String goodsSid;
+    private String brandId;
     private String goodsNumber;
 }

src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.yythmall.api.appletgiftbag.AppletGiftBag;
 import com.yxt.yythmall.api.appletgiftbag.AppletGiftBagVo;
+import com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,6 +23,6 @@ public interface AppletGiftBagMapper extends BaseMapper<AppletGiftBag> {
     IPage<AppletGiftBagVo> giftBagListPage(IPage<AppletGiftBag> page, @Param(Constants.WRAPPER) QueryWrapper<AppletGiftBag> qw);
     List<AppletGiftBagVo> giftBagList();
 
-    List<AppletGiftBagVo> giftBagGoodsList();
+    List<GiftBagGoodss> giftBagGoodsList(@Param("sid")String sid );
     int saveBags(@Param("bags") List<AppletGiftBag> bags);
 }

src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagMapper.xml

@@ -35,10 +35,22 @@
         where isGrounding=1
         order by isRecommend desc,createTime desc
     </select>
-    <select id="giftBagGoodsList" resultType="com.yxt.yythmall.api.appletgiftbag.AppletGiftBagVo">
+    <select id="giftBagGoodsList" resultType="com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss">
         select
-        a.sid as sid ,s.sid as goodsSid,s.goodsNumber as count
-        from applet_giftbag a left join applet_giftbag_goods s on s.giftbagSid=a.sid
+        s.goodsNumber as goodsNumber,
+        d.`name` ,
+        d.unitName,
+        d.price as jPrice,
+        d.price as price,
+        d.picUrl as iconUrl,
+        d.specificationUnit,
+        d.isAppletGrounding,
+        d.content as remark,
+        d.weight,
+        d.sid as goodsSid
+        from applet_giftbag a
+        left join applet_giftbag_goods s on s.giftbagSid=a.sid
+        left join lpk_goods d on d.sid=s.goodsSid
         where a.sid=#{sid}
     </select>
 </mapper>

src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagRest.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.yythmall.api.appletgiftbag.AppletGiftBagDto;
 import com.yxt.yythmall.api.appletgiftbag.AppletGiftBagQuery;
 import com.yxt.yythmall.api.appletgiftbag.AppletGiftBagVo;
+import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,4 +76,9 @@ public class AppletGiftBagRest {
     public ResultBean  recommendRecord(@PathVariable("sid") String sid) {
         return AppletGiftBagService.recommendRecord(sid);
     }
+    @ApiOperation("新人专属购买礼包")
+    @PostMapping("/newUserQuota")
+    public ResultBean  newUserQuota() {
+        return AppletGiftBagService.newUserQuota();
+    }
 }

src/main/java/com/yxt/yythmall/biz/appletgiftbag/AppletGiftBagService.java

@@ -15,6 +15,7 @@ import com.yxt.yythmall.api.appletgiftbag.*;
 import com.yxt.yythmall.api.appletgiftbaggoods.AppletGiftBagGoods;
 import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods;
 import com.yxt.yythmall.api.appletgiftbag.recommendRecord;
+import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery;
 import com.yxt.yythmall.api.lpkgoods.LpkGoods;
 import com.yxt.yythmall.biz.appletgiftbaggoods.AppletGiftBagGoodsService;
 import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService;
@@ -23,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -264,4 +266,34 @@ public class AppletGiftBagService extends MybatisBaseService<AppletGiftBagMapper
         vo.setRecordList(list);
         return rb.success().setData(vo);
     }
+    public ResultBean  newUserQuota() {
+        ResultBean rb=new ResultBean().fail();
+//        List<GiftBagGoodss> giftBagGoodss=baseMapper.getAllGoodsApplets(query);
+
+        List<GiftBagGoodss> s=baseMapper.giftBagGoodsList("e49555f2-5370-45b0-9637-aa4d54c22e31");
+        for (GiftBagGoodss giftBagGoodss : s) {
+            giftBagGoodss.setIconUrl(fileUploadComponent.getUrlPrefix() +giftBagGoodss.getIconUrl());
+            giftBagGoodss.setMefenPrice(String.valueOf((int)(Double.valueOf(giftBagGoodss.getPrice())*Double.valueOf(giftBagGoodss.getWeight()))));
+            giftBagGoodss.setPrefPrice(String.valueOf((Integer.valueOf(giftBagGoodss.getMefenPrice())*0.5)));
+            giftBagGoodss.setPrefPrice(removeZeros(giftBagGoodss.getPrefPrice()));
+        }
+        return rb.success().setData(s);
+    }
+
+    /**
+     * 去除多余.0
+     * @param num
+     * @return
+     */
+    public static String removeZeros(String num) {
+        if (num.indexOf(".") > 0) {
+            // 去掉多余的0
+            num = num.replaceAll("0+?$", "");
+            // 如果最后一位是. 则去掉
+            num = num.replaceAll("[.]$", "");
+        }
+        return num;
+    }
+
+
 }

src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.yythmall.api.empcard.*;
 import com.yxt.yythmall.api.lpkgiftcard.*;
+import com.yxt.yythmall.api.vegetablecellar.vegeVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -56,4 +57,5 @@ public interface EmpCardMapper extends BaseMapper<EmpCard> {
 
 
     IPage<LpkGiftCardWordVo> selGiftCard(IPage<LpkGiftCard> page, @Param(Constants.WRAPPER) QueryWrapper<LpkGiftCard> qw);
+    List<vegeVo> getGoodsList(@Param("sid") String sid);
 }

src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml

@@ -231,5 +231,17 @@
             ${ew.sqlSegment}
         </where>
     </select>
-
+    <select id="getGoodsList" resultType="com.yxt.yythmall.api.vegetablecellar.vegeVo">
+        SELECT
+            e.sid as goodsSid,
+            e.name as goodsName,
+            d.goodsNumber as goodsNumber,
+            e.brandId as e.brandId,
+                e.cetegoryId as cetegoryId
+        FROM
+            emp_card_gift gi
+                left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid
+                left join lpk_goods e on e.sid =d.goodsSid
+        where gi.sid=#{sid}
+    </select>
 </mapper>

src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java

@@ -29,6 +29,8 @@ import com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderCardVo;
 import com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderVo;
 import com.yxt.yythmall.api.lpkreserveordergoods.LpkReserveOrderGoods;
 import com.yxt.yythmall.api.lpkstore.LpkStoreDetailsVo;
+import com.yxt.yythmall.api.vegetablecellar.VegetableCellarDto;
+import com.yxt.yythmall.api.vegetablecellar.vegeVo;
 import com.yxt.yythmall.biz.empcardbuildrecord.EmpCardBuildRecordService;
 import com.yxt.yythmall.biz.empcardgift.EmpCardGiftService;
 import com.yxt.yythmall.biz.empcardgiftgoods.EmpCardGiftGoodsService;
@@ -40,6 +42,7 @@ import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService;
 import com.yxt.yythmall.biz.lpkreserveorder.LpkReserveOrderService;
 import com.yxt.yythmall.biz.lpkreserveordergoods.LpkReserveOrderGoodsService;
 import com.yxt.yythmall.biz.lpkstore.LpkStoreService;
+import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService;
 import com.yxt.yythmall.utils.StyleUtils;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -88,6 +91,8 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
     @Autowired
     private LpkReserveOrderGoodsService lpkReserveOrderGoodsService;
     @Autowired
+    private VegetableCellarService vegetableCellarService;
+    @Autowired
     private HttpServletResponse response;
     @Value("${image.url.prefix:http://127.0.0.1:8080/upload/}")
     private String urlPrefix;
@@ -134,6 +139,11 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
         lpkGiftCard.setState("2");
         lpkGiftCard.setBindDate(new Date());
         baseMapper.updateById(lpkGiftCard);
+        List<vegeVo> k=baseMapper.getGoodsList(lpkGiftCard.getSid());
+        VegetableCellarDto dto=new VegetableCellarDto();
+        dto.setCustomerSid(dto.getCustomerSid());
+        dto.setVos(k);
+        vegetableCellarService.save1Goods(dto);
         return rb.success().setMsg("绑定成功");
     }
 

src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.yythmall.api.empcardgift.*;
+import com.yxt.yythmall.api.vegetablecellar.vegeVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -49,6 +50,7 @@ public interface EmpCardGiftMapper extends BaseMapper<EmpCardGift> {
     List<EmpCardGiftVo> recordList(@Param("empCardSid")String empCardSid);
 
     List<EmpCardGiftVo> getEmpCardGiftByGiftbagSid(@Param("endDate")String endDate,@Param("state") String state);
+    List<vegeVo> getGoodsList(@Param("sid") String sid);
 
     IPage<EmpCardGiftStatisticsVo> empCardGiftStatisticsList(IPage<EmpCardGiftStatisticsQuery> page, @Param(Constants.WRAPPER)QueryWrapper<EmpCardGift> qw);
 }

src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml

@@ -239,4 +239,17 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="getGoodsList" resultType="com.yxt.yythmall.api.vegetablecellar.vegeVo">
+        SELECT
+            e.sid as goodsSid,
+            e.name as goodsName,
+            d.goodsNumber as goodsNumber,
+            e.brandId as e.brandId,
+            e.cetegoryId as cetegoryId
+        FROM
+        emp_card gi
+        left join lpk_giftbag_goods d on d.giftbagSid=gi.giftbagSid
+        left join lpk_goods e on e.sid =d.goodsSid
+        where gi.sid=#{sid}
+    </select>
 </mapper>

src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java

@@ -32,6 +32,8 @@ import com.yxt.yythmall.api.lpkreserveordergoods.LpkReserveOrderGoods;
 import com.yxt.yythmall.api.lpkstore.LpkStoreDetailsVo;
 import com.yxt.yythmall.api.ordorder.OrdOrder;
 import com.yxt.yythmall.api.ordorderdetails.OrdOrderDetail;
+import com.yxt.yythmall.api.vegetablecellar.VegetableCellarDto;
+import com.yxt.yythmall.api.vegetablecellar.vegeVo;
 import com.yxt.yythmall.biz.empcard.EmpCardService;
 import com.yxt.yythmall.biz.empcardgiftgoods.EmpCardGiftGoodsService;
 import com.yxt.yythmall.biz.empcardgrantlog.EmpCardGrantLogService;
@@ -45,6 +47,7 @@ import com.yxt.yythmall.biz.lpkreserveordergoods.LpkReserveOrderGoodsService;
 import com.yxt.yythmall.biz.lpkstore.LpkStoreService;
 import com.yxt.yythmall.biz.ordorder.OrdOrderService;
 import com.yxt.yythmall.biz.ordorderdetails.OrdOrderDetailService;
+import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -96,6 +99,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
     OrdOrderService ordOrderService;
     @Autowired
     OrdOrderDetailService ordOrderDetailsService;
+    @Autowired
+    VegetableCellarService vegetableCellarService;
 
 
     public ResultBean bindCard(BindCardDto bindCardDto) {
@@ -117,6 +122,11 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
         empCardGift.setIsShare("3");
         empCardGift.setBindDate(new Date());
         baseMapper.updateById(empCardGift);
+        List<vegeVo> k=baseMapper.getGoodsList(empCardGift.getSid());
+        VegetableCellarDto dto=new VegetableCellarDto();
+        dto.setCustomerSid(dto.getCustomerSid());
+        dto.setVos(k);
+        vegetableCellarService.save1Goods(dto);
         return rb.success().setMsg("绑定成功");
     }
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.yythmall.api.lpkgiftcard.*;
 import com.yxt.yythmall.api.lpkgiftcard.CardStatisticsExportVo;
+import com.yxt.yythmall.api.vegetablecellar.vegeVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -79,4 +80,5 @@ public interface LpkGiftCardMapper extends BaseMapper<LpkGiftCard> {
     int saveCards(@Param("cards") List<LpkGiftCard> cards);
     IPage<LpkGiftCardVo> cardStatisticsList(IPage<LpkGiftCardListQuery> page, @Param(Constants.WRAPPER) QueryWrapper<LpkGiftCardListQuery> qw);
     List<CardStatisticsExportVo> cardStatisticsListExport(@Param(Constants.WRAPPER) QueryWrapper<LpkGiftCardListQuery> qw);
+    List<vegeVo> getGoodsList(@Param("sid") String sid);
 }

src/main/java/com/yxt/yythmall/biz/lpkgiftcard/LpkGiftCardMapper.xml

@@ -324,4 +324,17 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="getGoodsList" resultType="com.yxt.yythmall.api.vegetablecellar.vegeVo">
+        SELECT
+            e.sid as goodsSid,
+            e.name as goodsName,
+            d.goodsNumber as goodsNumber,
+            e.brandId as e.brandId,
+                e.cetegoryId as cetegoryId
+        FROM
+            lpk_giftcard gi
+                left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid
+                left join lpk_goods e on e.sid =d.goodsSid
+        where gi.sid=#{sid}
+    </select>
 </mapper>

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

@@ -49,6 +49,8 @@ import com.yxt.yythmall.api.lpkstore.LpkStoreDetailsVo;
 import com.yxt.yythmall.api.lpkstore.StoreSelect;
 import com.yxt.yythmall.api.shoppingcart.ShoppingCartQuery;
 import com.yxt.yythmall.api.shoppingcart.ShoppingCartVo;
+import com.yxt.yythmall.api.vegetablecellar.VegetableCellarDto;
+import com.yxt.yythmall.api.vegetablecellar.vegeVo;
 import com.yxt.yythmall.biz.empcard.EmpCardService;
 import com.yxt.yythmall.biz.empcardgift.EmpCardGiftService;
 import com.yxt.yythmall.biz.empcardgiftgoods.EmpCardGiftGoodsService;
@@ -62,6 +64,7 @@ import com.yxt.yythmall.biz.lpkreserveorder.LpkReserveOrderService;
 import com.yxt.yythmall.biz.lpkreserveordergoods.LpkReserveOrderGoodsService;
 import com.yxt.yythmall.biz.lpkstore.LpkStoreService;
 import com.yxt.yythmall.biz.shoppingcart.ShoppingCartService;
+import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService;
 import com.yxt.yythmall.utils.StyleUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
@@ -101,6 +104,8 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
     @Autowired
     private FileUploadComponent fileUploadComponent;
     @Autowired
+    private VegetableCellarService vegetableCellarService;
+    @Autowired
     private LpkCardBuildRecordService lpkCardBuildRecordService;
     @Autowired
     private HttpServletResponse response;
@@ -190,6 +195,14 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         lpkGiftCard.setState("3");
         lpkGiftCard.setBindDate(new Date());
         baseMapper.updateById(lpkGiftCard);
+        List<vegeVo> k=baseMapper.getGoodsList(lpkGiftCard.getSid());
+        VegetableCellarDto dto=new VegetableCellarDto();
+        //生成绑卡流水
+
+        //加入菜窖
+        dto.setCustomerSid(dto.getCustomerSid());
+        dto.setVos(k);
+        vegetableCellarService.save1Goods(dto);
         return rb.success().setMsg("绑定成功");
     }
     public ResultBean getGifCardByCustomerSid(PagerQuery<LpkGiftCardQuery> pq) {

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

@@ -231,6 +231,7 @@ public class LpkGoodsService extends MybatisBaseService<LpkGoodsMapper, LpkGoods
             List<MyGoodsVo> myGoodsVos =baseMapper.getGoodsApplet(query);
             vo1.setName(brandVo.getBrandName());
             vo1.setId(brandVo.getId());
+            vo1.setSid(brandVo.getId());
             vo1.setCount(String.valueOf(myGoodsVos.size()));
             vo.add(vo1);
         }

src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java

@@ -9,18 +9,23 @@ import com.yxt.yythmall.api.appletgiftbaggoods.AppletGiftBagGoods;
 import com.yxt.yythmall.api.empcardgiftgoods.EmpCardGiftGoodsVo;
 import com.yxt.yythmall.api.lpkgiftcard.AppletVo;
 import com.yxt.yythmall.api.lpkgiftcard.GoodsVo;
+import com.yxt.yythmall.api.lpkgoods.LpkGoods;
 import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecord;
 import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecordDto;
 import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecordVo;
+import com.yxt.yythmall.api.vegetablecellar.VegetableCellarDto;
+import com.yxt.yythmall.api.vegetablecellar.vegeVo;
 import com.yxt.yythmall.biz.appletgiftbag.AppletGiftBagService;
 import com.yxt.yythmall.biz.appletgiftbaggoods.AppletGiftBagGoodsService;
 import com.yxt.yythmall.biz.empcardgiftgoods.EmpCardGiftGoodsService;
 import com.yxt.yythmall.biz.lpkcustomer.LpkCustomerService;
 import com.yxt.yythmall.biz.lpkgiftcard.LpkGiftCardService;
+import com.yxt.yythmall.biz.lpkgoods.LpkGoodsService;
 import com.yxt.yythmall.biz.vegetablecellar.VegetableCellarService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -38,6 +43,8 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
     LpkCustomerService lpkCustomerService;
     @Autowired
     VegetableCellarService vegetableCellarService;
+    @Autowired
+    LpkGoodsService lpkGoodsService;
     public ResultBean<NewcomerRecoRecord> getReserveByCardSid(String carSid, String goodsSid) {
         ResultBean rb = new ResultBean();
         NewcomerRecoRecord goods = baseMapper.getReserveByCardSid(carSid, goodsSid);
@@ -60,7 +67,19 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
         newcomerRecoRecord.setAssistanceDate(new Date());
         baseMapper.updateById(newcomerRecoRecord);
         List<AppletGiftBagGoods>list=appletGiftBagGoodsService.list(new QueryWrapper<AppletGiftBagGoods>().eq("giftbagSid",dto.getGiftBagSid()));
-//        vegetableCellarService.receiveTransferGoods()
+        VegetableCellarDto dto1=new VegetableCellarDto();
+        dto1.setCustomerSid(dto.getRecommendSid());
+        List<vegeVo> vos=new ArrayList<>();
+        for (AppletGiftBagGoods appletGiftBagGoods : list) {
+            LpkGoods a=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",appletGiftBagGoods.getGoodsSid()));
+            vegeVo vo=new vegeVo();
+            vo.setGoodsSid(appletGiftBagGoods.getGoodsSid());
+            vo.setGoodsNumber(appletGiftBagGoods.getGoodsNumber());
+            vo.setBrandId(String.valueOf(a.getBrandId()));
+            vos.add(vo);
+        }
+        dto1.setVos(vos);
+        vegetableCellarService.save1Goods(dto1);
         return rb.success().setData("助力成功");
     }
     public ResultBean recordList(String customerSid) {

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

@@ -23,6 +23,6 @@ public interface VegeCellarReserveDetailsMapper extends BaseMapper<VegeCellarRes
     List<VegeCellarReserveDetails> selByOrderSid(String orderSid);
 
     List<VegeCellarReserveDetails> selInOrderSid(@Param("orderSids") List<String> orderSids);
-    @Select("select *,goodsNumber as num from lpk_reserve_order_goods where orderSid=#{orderSid}")
+    @Select("select *,goodsNumber as num from vege_cellar_reserve_details where orderSid=#{orderSid}")
     List<VegeCellarReserveDetails> selByOrderSids(String orderSid);
 }

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

@@ -100,15 +100,9 @@ public class VegeCellarReserveDetailsService extends MybatisBaseService<VegeCell
 
         return rb.success().setData("预约成功");
     }
-    public VegeCellarReserveDetails selByOrderSidAndGoodSid(String orderSid, String goodsSid) {
-        return baseMapper.selByOrderSidAndGoodSid(orderSid,goodsSid);
-    }
-    public List<VegeCellarReserveDetails> selByOrderSid(String orderSid) {
-        return baseMapper.selByOrderSid(orderSid);
-    }
-    public List<VegeCellarReserveDetails> selInOrderSid(List<String> orderSids) {
-        return baseMapper.selInOrderSid(orderSids);
-    }
+
+
+
     public List<VegeCellarReserveDetails> selByOrderSids(String orderSid) {
         return baseMapper.selByOrderSids(orderSid);
     }

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 
 import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrder;
+import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderQuery;
 import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -26,7 +27,7 @@ public interface VegeCellarReserveOrderMapper extends BaseMapper<VegeCellarReser
 ////    List<VegeCellarReserveOrderCardVo> orderByCardSid(String sid);
 //
 ////    IPage<VegeCellarReserveOrderCardVo> orderListByUserSid(IPage<VegeCellarReserveOrder> page, @Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrder> qw);
-//    IPage<VegeCellarReserveOrderCardVo> orderListByUserSid(IPage<VegeCellarReserveOrder> page, @Param("userSid")String userSid);
+    IPage<VegeCellarReserveOrderVo> orderListByUserSid(IPage<VegeCellarReserveOrder> page, @Param("query") VegeCellarReserveOrderQuery query);
 //
 //    List<ReserveOrderExport> exportExcel(@Param("qw") VegeCellarReserveOrderQuery qw);
 //    List<ReserveOrderExportByStore> exportExcelByStore(@Param(Constants.WRAPPER) QueryWrapper<VegeCellarReserveOrderQuery> qw);

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderMapper.xml

@@ -237,67 +237,28 @@
 <!--        </where>-->
 <!--        ORDER BY reserveDate DESC-->
 <!--    </select>-->
-    <select id="orderListByUserSid" resultType="com.yxt.yythmall.api.lpkreserveorder.LpkReserveOrderCardVo">
-        SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
-        c.`code`,
-        o.cardType	as type,
-        s.`name` as store,
-        case
-            when o.sid is not null then '家庭菜窖'
-        end as bagName,
-        o.cardSid as cardSid,
-        o.sid as orderSid,
-        o.userName,
-        o.userPhone,c.serialNumber as serialNumber,
-        o.sid
-        FROM lpk_reserve_order AS o
-        LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
-        LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
-        LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
-        <where>
-            o.customerSid=#{userSid} and o.cardType='1'
-        </where>
-        union
-        SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
-        c.`code`,
-        o.cardType	as type,
-        s.`name` as store,
-        case
-        when o.sid is not null then '亲情菜窖'
-        end as bagName,
-        o.cardSid as cardSid,
-        o.sid as orderSid,
-        o.userName,
-        o.userPhone,c.serialNumber as serialNumber,
-        o.sid
-        FROM lpk_reserve_order AS o
-        LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
-        LEFT JOIN emp_card_gift AS c ON o.cardSid = c.sid
-        LEFT JOIN lpk_giftbag AS b ON c.sid = b.sid
-        <where>
-            o.customerSid=#{userSid} and o.cardType='2'
-        </where>
-        union
-        SELECT date_format(o.reserveDate, '%Y-%m-%d') as reserveDate,
-        c.`code`,
-        o.cardType	as type,
-        s.`name` as store,
-        case
-        when o.sid is not null then '企业菜窖'
-        end as bagName,
-        o.cardSid as cardSid,
-        o.sid as orderSid,
+    <select id="orderListByUserSid" resultType="com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderVo">
+        SELECT
+        o.reserveCode,
+        o.sid as sid,
+        o.storeName,
+        o.reserveDate,
         o.userName,
-        o.userPhone,c.serialNumber as serialNumber,
-        o.sid
-        FROM lpk_reserve_order AS o
-        LEFT JOIN lpk_store AS s ON o.storeSid = s.sid
-        LEFT JOIN emp_card AS c ON o.cardSid = c.sid
-        LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
+        o.userPhone,
+        case o.state
+        when 0 then '未提货'
+        when 1 then '已提货'
+        end stateValue ,
+        case o.affiliation
+        when 1001000 then '百姓菜窖'
+        when 1001020 then '精品菜窖'
+        when 1001045 then '企业菜窖'
+        end affiliationValue
+        FROM
+        vege_cellar_reserve_order AS o
         <where>
-            o.customerSid=#{userSid} and o.cardType='3'
+            o.customerSid=#{query.customerSid} and state=#{query.state}
         </where>
-        ORDER BY reserveDate DESC
     </select>
     <select id="exportExcel" resultType="com.yxt.yythmall.api.lpkreserveorder.ReserveOrderExport">
         select

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderRest.java

@@ -55,11 +55,11 @@ public class VegeCellarReserveOrderRest {
 //        return vegeCellarReserveOrderService.orderByCardSid(sid);
 //    }
 //
-//    @ApiOperation("移动端预约订单列表")
-//    @PostMapping("/orderListByUserSid")
-//    public ResultBean<PagerVo<VegeCellarReserveOrderVo>> orderListByUserSid(@RequestBody PagerQuery<VegeCellarReserveOrderQuery> pq) {
-//        return vegeCellarReserveOrderService.orderListByUserSid(pq);
-//    }
+    @ApiOperation("移动端预约订单列表")
+    @PostMapping("/orderListByUserSid")
+    public ResultBean<PagerVo<VegeCellarReserveOrderVo>> orderListByUserSid(@RequestBody PagerQuery<VegeCellarReserveOrderQuery> pq) {
+        return vegeCellarReserveOrderService.orderListByUserSid(pq);
+    }
 //
 //    @ApiOperation("预约记录详情")
 //    @GetMapping("/orderDetails/{orderSid}")

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java

@@ -21,6 +21,7 @@ import com.yxt.yythmall.api.lpkgiftcard.GoodsVo;
 import com.yxt.yythmall.api.lpkgoods.LpkGoods;
 import com.yxt.yythmall.api.lpkstore.LpkStore;
 import com.yxt.yythmall.api.lpkstore.StoreSelect;
+import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails;
 import com.yxt.yythmall.api.vegecallerreserveorder.*;
 import com.yxt.yythmall.biz.lpkgiftbaggoods.LpkGiftBagGoodsService;
 import com.yxt.yythmall.biz.lpkgiftcard.LpkGiftCardMapper;
@@ -56,12 +57,12 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 //    LpkGiftCardMapper lpkGiftCardMapper;
 //    @Autowired
 //    LpkGiftBagGoodsService lpkGiftBagGoodsService;
-//    @Autowired
-//    LpkStoreService lpkStoreService;
+    @Autowired
+    LpkStoreService lpkStoreService;
 //    @Autowired
 //    private FileUploadComponent fileUploadComponent;
-//    @Autowired
-//    private LpkGoodsService lpkGoodsService;
+    @Autowired
+    private LpkGoodsService lpkGoodsService;
 //    @Autowired
 //    private HttpServletResponse response;
 //
@@ -72,12 +73,14 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
             return rb.setMsg("周六、周日不能预约提货");
         }
         VegeCellarReserveOrder order = new VegeCellarReserveOrder();
+        LpkStore lpkStore= lpkStoreService.getOne(new QueryWrapper<LpkStore>().eq("sid",dto.getStoreSid()));
         BeanUtil.copyProperties(dto, order, "id", "sid");
         order.setStoreSid(dto.getStoreSid());
 //        order.setCardSid(dto.getSid());
         order.setCreateTime(new DateTime());
         String uuid = UniqueIdGenerator.generateUniqueID();
         order.setReserveCode(uuid);
+        order.setStoreName(lpkStore.getName());
         baseMapper.insert(order);
         dto.setOrderSid(order.getSid());
         vegeCellarReserveDetailsService.submissionDetail(dto);
@@ -315,32 +318,40 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
 //        return rb.success().setData(list);
 //    }
 //
-//    public ResultBean<PagerVo<VegeCellarReserveOrderCardVo>> orderListByUserSid(PagerQuery<VegeCellarReserveOrderQuery> pq) {
-//        ResultBean rb = ResultBean.fireFail();
-//        VegeCellarReserveOrderQuery query = pq.getParams();
-//        QueryWrapper<VegeCellarReserveOrder> qw = new QueryWrapper<>();
-//        if(StringUtils.isBlank(query.getUserSid())){
-//            return rb.setMsg("参数不全");
-//        }
-//        qw.eq("o.customerSid", query.getUserSid());
-//        qw.eq("o.cardType","1");
-////        qw.orderByDesc("reserveDate");
-//        IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
-//        IPage<VegeCellarReserveOrderCardVo> pagging = baseMapper.orderListByUserSid(page, query.getUserSid());
-//        for(VegeCellarReserveOrderCardVo vo:pagging.getRecords()){
-//            List<VegeCellarReserveOrderGoods> goods =VegeCellarReserveOrderGoodsService.selByOrderSids(vo.getSid());
-//            for(VegeCellarReserveOrderGoods goods1:goods){
-//                LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",goods1.getGoodsSid()));
-//                if(StringUtils.isBlank(vo.getGoods())){
-//                    vo.setGoods(lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
-//                }else{
-//                    vo.setGoods(vo.getGoods()+"    "+lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
-//                }
-//            }
-//        }
-//        PagerVo<VegeCellarReserveOrderCardVo> p = PagerUtil.pageToVo(pagging, null);
-//        return rb.success().setData(p);
-//    }
+    public ResultBean<PagerVo<VegeCellarReserveOrderVo>> orderListByUserSid(PagerQuery<VegeCellarReserveOrderQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        VegeCellarReserveOrderQuery query = pq.getParams();
+        QueryWrapper<VegeCellarReserveOrder> qw = new QueryWrapper<>();
+        if(StringUtils.isBlank(query.getCustomerSid())){
+            return rb.setMsg("参数不全");
+        }
+        qw.eq("o.customerSid", query.getUserSid());
+        qw.eq("o.state",query.getState());
+        qw.orderByDesc("reserveDate");
+        IPage<VegeCellarReserveOrder> page = PagerUtil.queryToPage(pq);
+        IPage<VegeCellarReserveOrderVo> pagging = baseMapper.orderListByUserSid(page, query);
+         List<OrderGoodsVo> goodsVo = new ArrayList<>();
+        for(VegeCellarReserveOrderVo vo:pagging.getRecords()){
+            List<VegeCellarReserveDetails> goods =vegeCellarReserveDetailsService.selByOrderSids(vo.getSid());
+            for(VegeCellarReserveDetails goods1:goods){
+                LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",goods1.getGoodsSid()));
+//                OrderGoodsVo orderGoodsVo=new OrderGoodsVo();
+//                orderGoodsVo.setGoodName(lpkGoods.getName());
+//                orderGoodsVo.setNum(Integer.parseInt(goods1.getNum()));
+//                orderGoodsVo.setUnitName(lpkGoods.getUnitName());
+//                goodsVo.add(orderGoodsVo);
+                if(StringUtils.isBlank(vo.getGoodss())){
+                    vo.setGoodss(lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
+                }else{
+                    vo.setGoodss(vo.getGoodss()+"    "+lpkGoods.getName()+"："+goods1.getNum()+lpkGoods.getUnitName());
+                }
+            }
+            vo.setGoodsVo(goodsVo);
+        }
+
+        PagerVo<VegeCellarReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
 //
 //    public ResultBean orderDetails(String orderSid) {
 //        ResultBean rb = new ResultBean().fail();

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

@@ -65,14 +65,12 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
     }
     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()));
+                    .eq("goodsSid",detail.getGoodsSid()).eq("affiliation",dto.getBrandId()));
             if(vegetableCellar==null){
                 VegetableCellar vegetable=new VegetableCellar();
-                vegetable.setAffiliation(dto.getAffiliation());
+                vegetable.setAffiliation(dto.getBrandId());
                 vegetable.setGoodsSid(detail.getGoodsSid());
                 vegetable.setGoodsNumber(detail.getGoodsNumber());
                 vegetable.setCustomerSid(dto.getCustomerSid());
@@ -82,11 +80,30 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
                 baseMapper.updateById(vegetableCellar);
             }
             ShoppingCart shoppingCart=shoppingCartService.getOne((new QueryWrapper<ShoppingCart>().eq("customerSid",dto.getCustomerSid())
-                            .eq("goodsSid",detail.getGoodsSid()).eq("affiliation",dto.getAffiliation())));
+                            .eq("goodsSid",detail.getGoodsSid()).eq("affiliation",dto.getBrandId())));
             shoppingCartService.delShoppingCart(shoppingCart.getSid());
         }
         return rb.success().setMsg("成功");
     }
+    public ResultBean save1Goods(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()));
+            if(vegetableCellar==null){
+                VegetableCellar vegetable=new VegetableCellar();
+                vegetable.setAffiliation(detail.getBrandId());
+                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);
+            }
+        }
+        return rb.success().setMsg("成功");
+    }
     public ResultBean receiveTransferGoods(VegetableCellarDto  dto) {
         ResultBean rb = ResultBean.fireFail();
         TransferRecords transferRecords=transferRecordsService.getOne(new QueryWrapper<TransferRecords>().eq("sid",dto.getTransferSid()).eq("state","0"));

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

@@ -69,6 +69,8 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/lpkgiftcard/getGoodsByType/**")
                 .excludePathPatterns("/lpkgoods/getGoodsTypeAndBrand")
                 .excludePathPatterns("/lpkgoods/getGoodsByType")
+                .excludePathPatterns("/lpksreservoorders/orderListByUserSid")
+                .excludePathPatterns("/appletgiftbag/newUserQuota")
                 .excludePathPatterns("/shoppingcart/addShoppingCart")
                 .excludePathPatterns("/shoppingcart/getGoodsWeight")
                 .excludePathPatterns("/shoppingcart/shoppingCartList")