Commit Graph

36 Commits

Author SHA1 Message Date
韩鹏辉
1da6507162 添加新版开放平台支付 2024-05-17 16:59:25 +08:00
31d3a65c00 距离如果为m 不保留小数
如果为Km 保留一位小数
2024-05-17 09:56:14 +08:00
200b75e04d 商品列表 返回区域信息 2024-05-16 16:41:13 +08:00
314d79ac2c 测试环境redis 更换到0库
通用接口添加 根据经纬度获取位置信息接口
2024-05-16 10:52:16 +08:00
34e06b6b3f 通用文件上传
到店订单分页
2024-05-15 14:53:06 +08:00
6f6d1c3a7b 团购卷卷码表
原订单列表逻辑
店铺营业时间
团购卷订单
团购卷卷码表
资源管理 字典管理
通用门店
个人中心
支付
2024-05-13 17:51:30 +08:00
d391f136bf 验证码
个人中心-菜单页
首页接口
预约到店(店铺列表)
通用商品列表
登录 退出登录
商品详情(缺少评价部分)
订单页 列表 详情
2024-04-29 10:22:32 +08:00
wangguocheng
ea1252ecc0 会员免单时间转换 2024-04-24 17:55:55 +08:00
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
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
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
liuyingfang
46cd954abf 首页下半更改 2024-04-15 10:15:16 +08:00
19991905653
e86ec29a33 领取优惠券操作 2024-04-12 13:35:02 +08:00
7d3fe9deb7 经纬度 角点计算 2024-04-12 09:56:32 +08:00
liuyingfang
5946c78cf9 小横幅更改,更改条件查询 2024-04-11 16:31:59 +08:00
ae61959743 实体转换的bug
sql问题
2024-04-11 14:51:44 +08:00
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
19991905653
342d0d82e1 新建分支 2024-04-09 09:29:59 +08:00
d2550475b4 全局跨域处理
字典isChild 回显
字典标签回显
2024-04-08 17:51:10 +08:00
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
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
韩鹏辉
2340b1b7c7 Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service 2024-04-03 17:33:50 +08:00
韩鹏辉
acfe518420 添加飞蛾打印机 2024-04-03 17:32:50 +08:00
106288497e 高德行政区接入 2024-04-03 15:28:50 +08:00
976f63d09c app 用户登录 用户注册 退出
redis 5库 token的key为ONLINE_APP_USER:用户id
app端 登录校验 code -4 账号过期
app端 版本是否更新校验
 redis 5库 版本是否更新的key为LDBL_APP_VERSION:android/ios:版本号
全局跨域放行处理
经纬度计算距离工作类
2024-04-03 10:51:46 +08:00
liuyingfang
4a25f8f5a3 阿里云验证码 2024-03-27 17:02:25 +08:00
韩鹏辉
b77eacdccb 提交 2024-03-21 10:22:29 +08:00