 tqzhang
|
9a62d10b01
|
驿站：理疗预约支付、退款、洗衣服务、专家讲座等内容
|
2025-02-21 14:26:44 +08:00 |
gaowdong
|
628a4d0de3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/business/OrderPlaceBusiness.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/business/impl/OrderPlaceBusinessImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/OrderInfoService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderInfoServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/custom/OrderCustomAndroidBusiness.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mq/OrderMessageSend.java
|
2025-02-21 10:28:01 +08:00 |
|
gaowdong
|
97167a7bd9
|
购物车修改
|
2025-02-21 10:17:22 +08:00 |
 sxu
|
287d5bf51c
|
同步支付状态
|
2025-02-21 10:05:16 +08:00 |
|
gaowdong
|
4a6b44d2cb
|
Merge branch 'master' of http://192.168.0.75:3000/bonus/Bonus-Cloud-Smart-Canteen
|
2025-02-21 09:36:29 +08:00 |
|
gaowdong
|
9871846e56
|
与订餐-退单
|
2025-02-20 17:13:18 +08:00 |
|
sxu
|
244755f7ce
|
配置文件
|
2025-02-20 13:10:58 +08:00 |
|
gaowdong
|
009ca9e264
|
与订餐 提交
|
2025-02-20 11:22:21 +08:00 |
|
sxu
|
8c29099148
|
获取订单评价数量
|
2025-02-19 18:39:36 +08:00 |
|
sxu
|
294ce9f416
|
rebind mobile
|
2025-02-16 19:44:12 +08:00 |
|
sxu
|
2c514a177d
|
add openid
|
2025-02-14 15:44:52 +08:00 |
|
sxu
|
251b75b44a
|
去掉重复sql
|
2025-02-14 13:04:24 +08:00 |
|
sxu
|
afb72d28db
|
配置文件
|
2025-02-13 18:39:35 +08:00 |
|
gaowdong
|
20bf3c186a
|
Merge remote-tracking branch 'origin/master'
|
2025-02-13 17:34:24 +08:00 |
|
gaowdong
|
efa1e480fd
|
新增 mq
|
2025-02-13 17:34:14 +08:00 |
 liux
|
e52483d06b
|
我的地址
|
2025-02-13 15:36:07 +08:00 |
|
liux
|
560edb6611
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-cust-auth/src/main/java/com/bonus/auth/controller/TokenController.java
# bonus-cust-auth/src/main/java/com/bonus/auth/service/SysRecordLogService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v4/web/service/CardInfoV4Service.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mq/DelayedMessageSender.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/device/manage/dto/DeviceMqPersonalUpdateMessageDTO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/device/mq/MacMessage.java
|
2025-02-13 14:29:38 +08:00 |
|
gaowdong
|
bca90e0c44
|
MQ提交
|
2025-02-13 10:09:36 +08:00 |
|
liux
|
20c99188c6
|
Merge remote-tracking branch 'origin/master'
|
2025-02-12 17:08:23 +08:00 |
|
liux
|
035d270c73
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/mq/send/model/AccStatusChangeModel.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/AccInfoService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/account/v3/service/impl/AccInfoServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/constant/LeMqConstant.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/common/encrypt/SM4EncDecHandler.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/constants/FeaturesBuildStatusEnum.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/constants/PersonalSexEnum.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/CustInfoDTO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/dto/CustPayDTO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mapper/CustAccTempMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mapper/CustInfoMapper.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/model/CustAccTemp.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mq/CustomerMessageDTO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/mq/DelayedMessageSender.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustAccTempService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustInfoBusiness.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/CustInfoService.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustAccTempServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoBusinessImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/service/impl/CustInfoServiceImpl.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/customer/vo/CustPayVO.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/device/door/api/DcPushUserDataServiceApi.java
# bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/starter/threadpool/CleanTenantIdTaskDecorator.java
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustAccTempMapper.xml
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustCasualMapper.xml
# bonus-modules/bonus-smart-canteen/src/main/resources/mapper/customer/CustInfoMapper.xml
|
2025-02-12 17:07:42 +08:00 |
|
tqzhang
|
22cfb63c8c
|
TenantContextHolder相关配置
|
2025-02-12 17:03:26 +08:00 |
|
liux
|
b7bf685daf
|
基本信息（保存）
|
2025-02-12 16:49:09 +08:00 |
|
tqzhang
|
dfec21bbd6
|
base64图片上传
|
2025-02-12 16:48:02 +08:00 |
|
tqzhang
|
7c8e5eb3b0
|
小程序保存人脸图片--/custInfo/uploadPhotoGenCodeForApp
|
2025-02-12 15:32:28 +08:00 |
|
sxu
|
b3bde0a6fd
|
fix conflict
|
2025-02-12 12:50:01 +08:00 |
|
tqzhang
|
a24b568419
|
用户获取通知消息
获取未读消息数量
修改通知状态
|
2025-02-12 10:53:22 +08:00 |
|
tqzhang
|
f97183cfee
|
配置page分页
|
2025-02-12 09:21:02 +08:00 |
|
tqzhang
|
924c1b1c0b
|
充值超时重新查询充值结果--/recharge/overtime/query-result
|
2025-02-11 20:40:25 +08:00 |
|
tqzhang
|
9803cafd9b
|
充值接口--暂时可启动
|
2025-02-11 19:44:14 +08:00 |
skjia
|
45dc63c59e
|
jsk 预定餐
预订餐（档口列表）
预订餐（详情）
移动端-查询预订详情
移动端-获取订单详情
移动端-预订餐（加购物车
移动端-预订餐（减购物车）
|
2025-02-11 18:52:37 +08:00 |
|
sxu
|
ac6ca0ea87
|
菜谱详情
|
2025-02-11 16:47:55 +08:00 |
|
sxu
|
dd29e8c6f5
|
菜谱详情
|
2025-02-11 16:23:45 +08:00 |
|
gaowdong
|
1c30938d6f
|
评价投诉建议
|
2025-02-11 15:59:01 +08:00 |
|
gaowdong
|
aca5728e02
|
订单-评价
|
2025-02-10 18:29:28 +08:00 |
|
sxu
|
93af56cfe8
|
Revert "jsk 预订餐"
This reverts commit 0bfc6b84b5.
|
2025-02-10 09:11:20 +08:00 |
|
skjia
|
0bfc6b84b5
|
jsk 预订餐
|
2025-02-10 08:53:25 +08:00 |
|
liux
|
3d254fa734
|
我的信息模块代码
|
2025-02-08 11:11:12 +08:00 |
|
tqzhang
|
fca5072fac
|
获取指定餐品的评价列表 api/v1/applet/menuevaluaorder/page/meal
|
2025-02-07 16:56:21 +08:00 |
|
sxu
|
04041627f5
|
fix conflict
|
2025-02-07 15:12:36 +08:00 |
|
tqzhang
|
08c8f1b0a3
|
一周菜谱（详情）api/v2/applet/menurecipe/week/recipe/detail
|
2025-02-07 15:08:55 +08:00 |
|
sxu
|
d2fe380be0
|
一周菜谱
|
2025-02-07 12:52:41 +08:00 |
|
gaowdong
|
8285176027
|
订单-订单详情/支付方式
|
2025-02-06 18:14:43 +08:00 |
|
sxu
|
2a1611f689
|
一周菜谱
|
2025-02-06 17:51:30 +08:00 |
|
gaowdong
|
fe7acccf31
|
订单-订单（全部列表）
|
2025-02-06 16:16:02 +08:00 |
|
tqzhang
|
8215d52f92
|
分页查询账户充值记--/api/v3/app/accInfo/queryTradeAppPage
|
2025-02-06 11:21:50 +08:00 |
|
tqzhang
|
468591a2f1
|
api/v4/app/account/wallet/balance查询账户(仅返回钱包余额)--移动端查询账户(仅返回钱包余额)
api/v4/app/account/info查询账户(基础信息+余额)--移动端查询账户(基础信息+余额)
|
2025-02-06 10:16:03 +08:00 |
|
sxu
|
fd74445693
|
Merge branch 'weekmenu'
|
2025-02-05 19:09:35 +08:00 |
|
tqzhang
|
279d2fe5cc
|
配置文件
|
2025-02-05 19:08:41 +08:00 |
|
sxu
|
91033c7c3f
|
一周菜谱
|
2025-02-05 17:55:35 +08:00 |
|
sxu
|
b6e2d65329
|
合并客户登录
|
2025-02-03 21:00:07 +08:00 |