diff --git a/docs/databases/table_create.sql b/docs/databases/table_create.sql index 7d3f94a..d2fa871 100644 --- a/docs/databases/table_create.sql +++ b/docs/databases/table_create.sql @@ -33,6 +33,8 @@ CREATE TABLE `lpk_goods` ( `price` double(12,2) NULL DEFAULT NULL COMMENT '商品价格', `picUrl` VARCHAR(1024) NULL DEFAULT NULL COMMENT '商品图片URL', + + `appContent` text NULL DEFAULT NULL COMMENT '商品介绍', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB COMMENT='商品信息'; @@ -130,6 +132,7 @@ CREATE TABLE `lpk_store` ( `address` VARCHAR(100) NULL DEFAULT NULL COMMENT '地址', `phone` VARCHAR(100) NULL DEFAULT NULL COMMENT '电话', `businessHours` VARCHAR(100) NULL DEFAULT NULL COMMENT '营业时间，提货时间（早X点到晚X点）', + `lonAndLat` VARCHAR(100) NULL DEFAULT NULL COMMENT '经度,纬度', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB COMMENT='取货点(门店)信息'; diff --git a/docs/databases/重置预约订单数据.sql b/docs/databases/重置预约订单数据.sql new file mode 100644 index 0000000..f2fb8d5 --- /dev/null +++ b/docs/databases/重置预约订单数据.sql @@ -0,0 +1,7 @@ + +-- 重置预约-订单数据 +delete from lpk_customer; +delete from lpk_reserve_order; +delete from lpk_reserve_order_goods; +update lpk_giftcard set state='2',customerSid='',customerMobile=''; + diff --git a/docs/tester/金利通卡二维码.jpg b/docs/tester/金利通卡二维码.jpg new file mode 100644 index 0000000..1fe6aeb Binary files /dev/null and b/docs/tester/金利通卡二维码.jpg differ diff --git a/docs/xiugai/修改项20231202.docx b/docs/xiugai/修改项20231202.docx new file mode 100644 index 0000000..1558942 --- /dev/null +++ b/docs/xiugai/修改项20231202.docx @@ -0,0 +1,14 @@ +1. 把历史数据清一下。 +2. 提货卡状态，如果提货卡未提货且未过期，则卡为红色，状态为待提货；如果提货卡已过期，则卡为灰色，状态为已过期；如提货卡已预约且未超过预约时间，则提货卡为红色，状态为已预约；如提货卡已全部提货且超过预约时间，则提货卡为灰色，状态为已完成；如提货卡预约后超过预约时间，但卡中还有待提货商品，则提货卡为灰色，状态为待提货。注：提货卡排序，红色卡在前，灰色卡在后，新卡在前，旧卡在后。 + +3. 灰色的卡，不可再预约，点击进入后，直接显示预约记录，预约记录包含每一批的提货日，提货明细。 + + 4.默认有提货点的情况下，未点击过提货地点，测试一下是否存在bug，无法提交预约。 + + 5.去掉电话的明文显示，"电话"改为电话咨询，"确定"改为预约自提。 + + + + + 6.去掉价值和规格。 + diff --git a/docs/xuqiu/家庭菜窖自提点支行信息表.xls b/docs/xuqiu/家庭菜窖自提点支行信息表.xls new file mode 100644 index 0000000..99ce521 Binary files /dev/null and b/docs/xuqiu/家庭菜窖自提点支行信息表.xls differ 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 e19b246..ce6e8f4 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoods.java +++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoods.java @@ -29,5 +29,6 @@ public class LpkGoods { private String typeCode; private String price; private String picUrl; + private String appContent; } 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 8a523ac..47de031 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDetailsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDetailsVo.java @@ -25,4 +25,5 @@ public class LpkGoodsDetailsVo implements Vo { private String typeCode;//类别编码 private String price;//商品价格 private String picUrl;//图片 + private String appContent; } 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 ca236d4..1f706cf 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDto.java +++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsDto.java @@ -20,4 +20,5 @@ public class LpkGoodsDto implements Dto { private String typeCode; private String price; private String picUrl; + private String appContent; } diff --git a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java index 76c9b08..50201ce 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgoods/LpkGoodsVo.java @@ -29,5 +29,6 @@ public class LpkGoodsVo implements Vo { private String typeCode; private String price; private String picUrl; + private String appContent; } diff --git a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStore.java b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStore.java index c7a411d..e95b004 100644 --- a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStore.java +++ b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStore.java @@ -30,4 +30,5 @@ public class LpkStore { private int sort; private String linker; private String picUrl; + private String lonAndLat; } diff --git a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreDetailsVo.java b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreDetailsVo.java index 9f4f638..c9dd87d 100644 --- a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreDetailsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreDetailsVo.java @@ -20,4 +20,5 @@ public class LpkStoreDetailsVo { private int sort; private String linker; private String picUrl; + private String lonAndLat; } diff --git a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreDto.java b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreDto.java index 172a4d3..8476b22 100644 --- a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreDto.java +++ b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreDto.java @@ -22,4 +22,8 @@ public class LpkStoreDto implements Dto { private String address; private String phone; private String businessHours; + private int sort; + private String linker; + private String picUrl; + private String lonAndLat; } diff --git a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreVo.java b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreVo.java index 3836963..c8103d8 100644 --- a/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkstore/LpkStoreVo.java @@ -28,4 +28,5 @@ public class LpkStoreVo implements Vo { private String linker;//联系人 private String sort;//排序 private String isEnable;//排序 + private String lonAndLat; }