diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoodsVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoodsVo.java index 590fa2f..02f1e82 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoodsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoodsVo.java @@ -16,4 +16,5 @@ public class LpkGiftBagGoodsVo implements Vo { private String goodsName; private double goodsNumber; private String picUrl; + private String goodsSid; } diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java index afb0452..6a4e415 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java @@ -1,6 +1,7 @@ package com.yxt.yyth.api.lpkgiftcard; import cn.hutool.core.date.DateUtil; +import com.yxt.yyth.api.lpkstore.StoreSelect; import lombok.Data; import java.text.SimpleDateFormat; @@ -26,6 +27,7 @@ public class AppletVo { private String name="卡号："; private String pName; private List goodsVos; + private List select; public String getName() { name=name+code; @@ -33,7 +35,7 @@ public class AppletVo { } public String getTime() { - SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat sdf =new SimpleDateFormat("yyyy.MM.dd"); time=sdf.format(DateUtil.parse(dateStart))+"~"+sdf.format(DateUtil.parse(dateEnd)); return time; } @@ -47,17 +49,18 @@ public class AppletVo { } public String getState() { - int i=DateUtil.parse(dateEnd).compareTo(DateUtil.date()); - if( String.valueOf(i).equals("1")){ + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date()))); + if( String.valueOf(i).equals("-1")){ + state="失效"; + showBtn=false; +// appletVo.setShowBtn(true); + }else{ state="正常"; if(states.equals("5")){ this.state="失效"; showBtn=false; } -// appletVo.setShowBtn(true); - }else{ - state="失效"; - showBtn=false; } return state; } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrder.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrder.java new file mode 100644 index 0000000..ba533f4 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrder.java @@ -0,0 +1,30 @@ +package com.yxt.yyth.api.lpkreserveorder; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.UUID; + +/** + * @author wangpengfei + * @date 2023/11/23 10:29 + */ +@Data +public class LpkReserveOrder{ + private String id; + private String sid= UUID.randomUUID().toString(); + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private String createTime; + private String remarks; + private String reserveType; + private String cardSid; + private String cardCode; + private String isCustomer; + private String customerSid; + private String userName; + private String userPhone; + private String userAddress; + private String storeSid; + private String reserveDate; + +} diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderDto.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderDto.java new file mode 100644 index 0000000..a017c65 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderDto.java @@ -0,0 +1,8 @@ +package com.yxt.yyth.api.lpkreserveorder; + +/** + * @author wangpengfei + * @date 2023/11/23 10:29 + */ +public class LpkReserveOrderDto { +} diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java new file mode 100644 index 0000000..dea2016 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderQuery.java @@ -0,0 +1,8 @@ +package com.yxt.yyth.api.lpkreserveorder; + +/** + * @author wangpengfei + * @date 2023/11/23 10:30 + */ +public class LpkReserveOrderQuery { +} diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoods.java b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoods.java new file mode 100644 index 0000000..8d2535a --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoods.java @@ -0,0 +1,23 @@ +package com.yxt.yyth.api.lpkreserveordergoods; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.UUID; + +/** + * @author wangpengfei + * @date 2023/11/23 10:29 + */ +@Data +public class LpkReserveOrderGoods { + private String id; + private String sid= UUID.randomUUID().toString(); + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private String createTime; + private String remarks; + private String cardSid; + private String goodsSid; + private double goodsNumber; + +} diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoodsDto.java b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoodsDto.java new file mode 100644 index 0000000..5a30d0c --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoodsDto.java @@ -0,0 +1,8 @@ +package com.yxt.yyth.api.lpkreserveordergoods; + +/** + * @author wangpengfei + * @date 2023/11/23 10:29 + */ +public class LpkReserveOrderGoodsDto { +} diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoodsQuery.java b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoodsQuery.java new file mode 100644 index 0000000..f179163 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkreserveordergoods/LpkReserveOrderGoodsQuery.java @@ -0,0 +1,8 @@ +package com.yxt.yyth.api.lpkreserveordergoods; + +/** + * @author wangpengfei + * @date 2023/11/23 10:30 + */ +public class LpkReserveOrderGoodsQuery { +} diff --git a/src/main/java/com/yxt/yyth/api/lpkstore/StoreSelect.java b/src/main/java/com/yxt/yyth/api/lpkstore/StoreSelect.java new file mode 100644 index 0000000..4415555 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkstore/StoreSelect.java @@ -0,0 +1,13 @@ +package com.yxt.yyth.api.lpkstore; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/23 11:53 + */ +@Data +public class StoreSelect { + private String value; + private String text; +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java b/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java index ff59cae..4de2ee8 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java @@ -112,6 +112,7 @@ public class LpkCustomerService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("1","1"); if (StringUtils.isNotBlank(query.getMobile())) { qw.like("mobile", query.getMobile()); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java index 7002eac..a69ad25 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java @@ -46,6 +46,7 @@ public class LpkGiftBagService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("1","1"); if (StringUtils.isNotBlank(query.getName())) { qw.like("name", query.getName()); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java index 90a9c3e..6aecfcd 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java @@ -20,9 +20,7 @@ public interface LpkGiftBagGoodsMapper extends BaseMapper { int deleteGoodsByBagSid(@Param("sid") String sid); - List getRecordsByBagSid(String sid); - - @Select("select goods.name as goodsName,bads.goodsNumber ,goods.picUrl from lpk_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") + @Select("select goods.name as goodsName,bads.goodsNumber ,bads.goodsSid,goods.picUrl from lpk_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") List getGoodsByBagSid(String sid); List getRecordsByBagSid(@Param("sid") String sid); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java index 46a5fa5..42bc67f 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java @@ -35,7 +35,12 @@ public class LpkGiftCardRest { } @GetMapping("/getGifCardBySid/{sid}") @ApiOperation(value = "获取礼包卡的详情信息") - public ResultBean wxBindMobile(@PathVariable("sid")String sid) { + public ResultBean getGifCardBySid(@PathVariable("sid")String sid) { return lpkGiftCardService.getGifCardBySid(sid); } + @GetMapping("/getReservationBySid/{sid}") + @ApiOperation(value = "查询可预约取货的详情") + public ResultBean getReservationBySid(@PathVariable("sid")String sid) { + return lpkGiftCardService.getReservationBySid(sid); + } } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java index 9f3e830..3a570b7 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -11,6 +11,10 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo; import com.yxt.yyth.api.lpkgiftcard.*; +import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods; +import com.yxt.yyth.api.lpkstore.StoreSelect; +import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsService; +import com.yxt.yyth.biz.lpkstore.LpkStoreService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -29,6 +33,10 @@ public class LpkGiftCardService extends MybatisBaseService list=LpkGiftBagGoodsService.getGoodsByBagSid(vo.getGiftbagSid()); + List l=lpkStoreService.getAllStore().getData(); + + List goodsVos=new ArrayList<>(); + list.forEach(s->{ + LpkReserveOrderGoods goods=lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(),s.getGoodsSid()).getData(); + GoodsVo goodsVo=new GoodsVo(); + goodsVo.setGoods(s.getGoodsName()); + goodsVo.setNum(s.getGoodsNumber()); + goodsVo.setPic(urlPrefix+s.getPicUrl()); + if(null!=goods){ + if(goods.getGoodsNumber()!=s.getGoodsNumber()){ + goodsVo.setLNum(s.getGoodsNumber()-goods.getGoodsNumber()); + goodsVos.add(goodsVo); + } + }else{ + goodsVo.setLNum(s.getGoodsNumber()); + goodsVos.add(goodsVo); + } + }); + vo.setGoodsVos(goodsVos); + vo.setSelect(l); + return rb.success().setData(vo); + } } 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 3b107e0..b043d7f 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgoods/LpkGoodsService.java @@ -34,6 +34,7 @@ public class LpkGoodsService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("1","1"); if (StringUtils.isNotBlank(query.getName())) { qw.like("name", query.getName()); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java new file mode 100644 index 0000000..ccf3323 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java @@ -0,0 +1,13 @@ +package com.yxt.yyth.biz.lpkreserveorder; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrder; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author wangpengfei + * @date 2023/11/23 10:36 + */ +@Mapper +public interface LpkReserveOrderMapper extends BaseMapper { +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml new file mode 100644 index 0000000..8c2a1a8 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderRest.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderRest.java new file mode 100644 index 0000000..1262253 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderRest.java @@ -0,0 +1,29 @@ +package com.yxt.yyth.biz.lpkreserveorder; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2023/11/23 10:35 + */ +@Api(tags = "预约订单信息") +@RestController +@RequestMapping("lpksreservoorder") +public class LpkReserveOrderRest { + @Autowired + LpkReserveOrderService lpkReserveOrderService; + + + @ApiOperation("预约提交") + @PostMapping("/submission") + public ResultBean submission(){ + return lpkReserveOrderService.submission(); + } +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java new file mode 100644 index 0000000..fe1f7ef --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java @@ -0,0 +1,18 @@ +package com.yxt.yyth.biz.lpkreserveorder; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrder; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/11/23 10:36 + */ +@Service +public class LpkReserveOrderService extends MybatisBaseService { + public ResultBean submission(){ + ResultBean rb=new ResultBean(); + return rb.success().setData("1"); + } +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java new file mode 100644 index 0000000..632ffbf --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.java @@ -0,0 +1,13 @@ +package com.yxt.yyth.biz.lpkreserveordergoods; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author wangpengfei + * @date 2023/11/23 10:36 + */ +@Mapper +public interface LpkReserveOrderGoodsMapper extends BaseMapper { +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.xml new file mode 100644 index 0000000..3ffeb6f --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsRest.java b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsRest.java new file mode 100644 index 0000000..5017147 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsRest.java @@ -0,0 +1,28 @@ +package com.yxt.yyth.biz.lpkreserveordergoods; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2023/11/23 10:35 + */ +@Api(tags = "预约订单信息") +@RestController +@RequestMapping("lpksreservoorder") +public class LpkReserveOrderGoodsRest { + @Autowired + LpkReserveOrderGoodsService lpkReserveOrderGoodsService; + + +// @ApiOperation("预约提交") +// @PostMapping("/getReserveByCardSid") +// public ResultBean getReserveByCardSid(String sid){ +// return lpkReserveOrderGoodsService.getReserveByCardSid(sid); +// } +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java new file mode 100644 index 0000000..44cce71 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java @@ -0,0 +1,22 @@ +package com.yxt.yyth.biz.lpkreserveordergoods; + +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.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/23 10:36 + */ +@Service +public class LpkReserveOrderGoodsService extends MybatisBaseService { + public ResultBean getReserveByCardSid(String carSid,String goodsSid){ + ResultBean rb=new ResultBean(); + LpkReserveOrderGoods goods= baseMapper.selectOne(new QueryWrapper().eq("cardSid",carSid).eq("goodsSid",goodsSid)); + return rb.success().setData(goods); + } +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.java b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.java index 12a19f8..d5dd741 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreMapper.java @@ -7,8 +7,12 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.yyth.api.lpkgoods.LpkGoods; import com.yxt.yyth.api.lpkstore.LpkStore; import com.yxt.yyth.api.lpkstore.LpkStoreVo; +import com.yxt.yyth.api.lpkstore.StoreSelect; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author wangpengfei @@ -19,4 +23,6 @@ public interface LpkStoreMapper extends BaseMapper { IPage storeListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + @Select("select sid as value,name as text from lpk_store") + List getAllStore(); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreRest.java b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreRest.java index c575559..68cd8be 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreRest.java @@ -52,6 +52,9 @@ public class LpkStoreRest { public ResultBean deleteStore(@PathVariable("sid") String sid) { return lpkStoreService.deleteStore(sid); } - - + @ApiOperation("获取全部取货点") + @DeleteMapping("/getAllStore") + public ResultBean getAllStore(){ + return lpkStoreService.getAllStore(); + } } diff --git a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java index 32f94b9..df84d05 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java @@ -15,7 +15,9 @@ import com.yxt.yyth.api.lpkgoods.LpkGoods; import com.yxt.yyth.api.lpkgoods.LpkGoodsQuery; import com.yxt.yyth.api.lpkgoods.LpkGoodsVo; import com.yxt.yyth.api.lpkstore.*; +import io.swagger.annotations.ApiOperation; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.DeleteMapping; import java.text.SimpleDateFormat; import java.util.Collections; @@ -32,6 +34,7 @@ public class LpkStoreService extends MybatisBaseService qw = new QueryWrapper<>(); + qw.eq("1","1"); if (StringUtils.isNotBlank(query.getName())) { qw.like("name", query.getName()); } @@ -77,4 +80,14 @@ public class LpkStoreService extends MybatisBaseService> getAllStore(){ + ResultBean rb=new ResultBean(); + List vos= baseMapper.getAllStore(); + return rb.success().setData(vos); + } }