diff --git a/docs/xuqiu/完善功能(20231130).md b/docs/xuqiu/完善功能(20231130).md index 21567e2..6bf330e 100644 --- a/docs/xuqiu/完善功能(20231130).md +++ b/docs/xuqiu/完善功能(20231130).md @@ -1,7 +1,7 @@ # 预约提货系统 > # 小程序端 ## 1. 预约时选择提货点 -- 提货点要在新页面中以列表显示 +- 提货点要在新页面中以列表显示 - 提货点列表显示提货点名称、位置、联系电话、营业时间 - 提货点列表可以排序 - 提货点列表可搜索查询 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 d9a4250..e01cf5a 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -1,7 +1,6 @@ package com.yxt.yyth.biz.lpkgiftcard; import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.img.ImgUtil; import cn.hutool.extra.qrcode.QrCodeUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -15,19 +14,12 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord; -import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordQuery; -import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo; import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordDto; import com.yxt.yyth.api.lpkgiftbag.LpkGiftBag; -import com.yxt.yyth.api.lpkgiftbag.LpkGiftBagVo; import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo; import com.yxt.yyth.api.lpkgiftcard.*; -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.lpkreserveorder.LpkReserveOrderVo; import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods; -import com.yxt.yyth.api.lpkstore.LpkStoreQuery; import com.yxt.yyth.api.lpkstore.StoreSelect; import com.yxt.yyth.biz.lpkcardbuildrecord.LpkCardBuildRecordService; import com.yxt.yyth.biz.lpkcardgrantrecord.LpkCardGrantRecordService; @@ -36,7 +28,6 @@ import com.yxt.yyth.biz.lpkgiftcard.generateRule.UniqueIdGenerator; import com.yxt.yyth.biz.lpkreserveorder.LpkReserveOrderService; import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsService; import com.yxt.yyth.biz.lpkstore.LpkStoreService; -import org.bouncycastle.math.Primes; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -47,8 +38,6 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.*; @@ -181,7 +170,8 @@ public class LpkGiftCardService extends MybatisBaseService list = LpkGiftBagGoodsService.getGoodsByBagSid(vo.getGiftbagSid()); // List l = lpkStoreService.getAllStore().getData(); - LpkStoreQuery query=new LpkStoreQuery(); + List l = lpkStoreService.getSelectStore().getData(); +// LpkStoreQuery query=new LpkStoreQuery(); // List l = lpkStoreService.getAllStoreByQuery(query).getData(); List goodsVos = new ArrayList<>(); @@ -208,7 +198,7 @@ public class LpkGiftCardService extends MybatisBaseService { @Select("select sid as value,name as text from lpk_store") List getAllStore(); List getAllStoreByQuery(@Param(Constants.WRAPPER) QueryWrapper qw); + @Select("select sid as value,name as text from lpk_store where isEnable=1") + List getSelectStore(); } 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 bc59a3e..67735dd 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java @@ -2,7 +2,6 @@ package com.yxt.yyth.biz.lpkstore; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; -import cn.hutool.core.date.DateUnit; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; @@ -11,16 +10,10 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -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; import java.util.List; /** @@ -109,4 +102,9 @@ public class LpkStoreService extends MybatisBaseService> getSelectStore() { + ResultBean rb=new ResultBean(); + List vos= baseMapper.getSelectStore(); + return rb.success().setData(vos); + } }