Commit Graph

115 Commits

Author SHA1 Message Date
wangw 314d79ac2c 测试环境redis 更换到0库
通用接口添加 根据经纬度获取位置信息接口
2024-05-16 10:52:16 +08:00
wangw c6257d75f2 团购卷支付 2024-05-15 17:06:37 +08:00
wangw fb86b296cb 通用文件上传
团购卷支付
2024-05-15 16:50:39 +08:00
韩鹏辉 5f88c35dc7 添加新版开放平台支付 2024-05-15 15:16:17 +08:00
wangw 264867cd11 pom版本问题 2024-05-15 14:55:10 +08:00
wangw 34e06b6b3f 通用文件上传
到店订单分页
2024-05-15 14:53:06 +08:00
wangw 0ebfa2795d 登录过滤器 2024-05-15 10:18:33 +08:00
wangguocheng 6de9614473 增加查询购物车功能 2024-05-15 09:42:35 +08:00
wangw 383bd5a6cb 1 2024-05-14 09:54:48 +08:00
wangguocheng a654cff84d 修改优惠券面额逻辑 2024-05-14 09:14:12 +08:00
wangw 6f6d1c3a7b 团购卷卷码表
原订单列表逻辑
店铺营业时间
团购卷订单
团购卷卷码表
资源管理 字典管理
通用门店
个人中心
支付
2024-05-13 17:51:30 +08:00
wangw d391f136bf 验证码
个人中心-菜单页
首页接口
预约到店(店铺列表)
通用商品列表
登录 退出登录
商品详情(缺少评价部分)
订单页 列表 详情
2024-04-29 10:22:32 +08:00
wangw d86506da76 验证码
个人中心-菜单页
首页接口
预约到店(店铺列表)
通用商品列表
登录 退出登录
商品详情(缺少评价部分)
2024-04-25 09:34:06 +08:00
wangguocheng ff26b0d4ba 领取优惠券操作 2024-04-24 17:58:25 +08:00
wangguocheng ea1252ecc0 会员免单时间转换 2024-04-24 17:55:55 +08:00
韩鹏辉 4fc29e3ad8 添加会员支付 2024-04-18 13:59:16 +08:00
wangw 83a08265c3 授权提示问题 2024-04-16 16:25:08 +08:00
wangw 8458da333f 测试环境 数据库 2024-04-15 17:32:26 +08:00
wangw 60fc45a65e Merge remote-tracking branch 'origin/lyf' into lyf
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RandomUtil.java
2024-04-15 15:24:23 +08:00
wangw ca1cdd545c 合并问题 2024-04-15 15:22:24 +08:00
19991905653 c84b9cc152 Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf
 Conflicts:
	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbSystemCoupons.java
	src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConfig.java
	src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitProducer.java
	src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
	src/main/java/com/chaozhanggui/system/cashierservice/util/RandomUtil.java
	src/main/resources/application-dev.yml
	src/main/resources/application-dev2.yml
	src/main/resources/application-prod.yml
	src/main/resources/application-prod2.yml
	src/main/resources/mapper/TbShopInfoMapper.xml
2024-04-15 15:20:17 +08:00
wangw 44d669110f Merge remote-tracking branch 'origin/yhq' into lyf
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbSystemCoupons.java
#	src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitConfig.java
#	src/main/java/com/chaozhanggui/system/cashierservice/rabbit/RabbitProducer.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
#	src/main/java/com/chaozhanggui/system/cashierservice/util/RandomUtil.java
#	src/main/resources/application-dev.yml
#	src/main/resources/application-dev2.yml
#	src/main/resources/application-prod.yml
#	src/main/resources/application-prod2.yml
#	src/main/resources/mapper/TbShopInfoMapper.xml
2024-04-15 14:51:15 +08:00
19991905653 2cd2ef8c07 领取优惠券操作 2024-04-15 14:36:46 +08:00
liuyingfang 46cd954abf 首页下半更改 2024-04-15 10:15:16 +08:00
wangw d7dfeee159 更新用户信息 头像/昵称
视频号/小程序/公众号mapper  暂未投入使用
2024-04-15 10:07:53 +08:00
19991905653 f203d7bccc 领取优惠券操作 2024-04-13 10:39:47 +08:00
19991905653 e86ec29a33 领取优惠券操作 2024-04-12 13:35:02 +08:00
wangw 7d3fe9deb7 经纬度 角点计算 2024-04-12 09:56:32 +08:00
wangw f8c53d3548 菜单 增加参数
用户默认头像
2024-04-11 16:55:40 +08:00
liuyingfang 5946c78cf9 小横幅更改,更改条件查询 2024-04-11 16:31:59 +08:00
wangw 05bf581734 首页下半部分 2024-04-11 15:59:54 +08:00
wangw ae61959743 实体转换的bug
sql问题
2024-04-11 14:51:44 +08:00
wangw f71e1af823 标签VO一堆 2024-04-11 14:26:54 +08:00
wangw 9a6f6eb5b6 首页 金刚区 标签 详情 标签VO一堆 2024-04-11 14:26:35 +08:00
19991905653 3a90299b64 优惠券+异常全局处理 2024-04-10 18:16:28 +08:00
liuyingfang 1b9d069bc6 商品详情开工,商品首页调整 2024-04-10 14:15:41 +08:00
liuyingfang dd81edb51e 更改MQ配置 2024-04-09 10:56:26 +08:00
19991905653 342d0d82e1 新建分支 2024-04-09 09:29:59 +08:00
19991905653 95405fa625 Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service 2024-04-09 09:11:12 +08:00
19991905653 e93ab9b36a 环境2 2024-04-09 09:11:01 +08:00
wangw d2550475b4 全局跨域处理
字典isChild 回显
字典标签回显
2024-04-08 17:51:10 +08:00
wangw 7bb156628b Merge branch 'master' into lyf 2024-04-08 17:50:13 +08:00
liuyingfang 22bb4c6d15 首页数据 2024-04-08 17:35:32 +08:00
韩鹏辉 dfabcd77b5 Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service 2024-04-08 17:04:16 +08:00
韩鹏辉 f73f43b529 添加飞蛾打印机 2024-04-08 17:03:52 +08:00
liuyingfang 934a116cf2 小程序首页初版,订单回显商户二维码, 2024-04-08 14:05:38 +08:00
韩鹏辉 e77a77c883 添加飞蛾打印机 2024-04-08 13:33:33 +08:00
wangw b27818d5e9 token 问题 2024-04-08 09:52:44 +08:00
19991905653 42c54ca731 Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service 2024-04-08 09:24:12 +08:00
19991905653 d584216406 环境2 2024-04-08 09:22:58 +08:00