Commit Graph

135 Commits

Author SHA1 Message Date
sxu a3cd3c7836 sync_pay_state 2025-02-21 16:43:34 +08:00
tqzhang 9a62d10b01 驿站:理疗预约支付、退款、洗衣服务、专家讲座等内容 2025-02-21 14:26:44 +08:00
liux 545ec852c3 新增收货地址、删除收货地址接口 2025-02-21 13:53:44 +08:00
gaowdong db6d4a5362 购物车修改 2025-02-21 10:40:52 +08:00
gaowdong 55c21ea4fc 购物车修改 2025-02-21 10:32:49 +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
skjia 7fa5b3d685 jsk getReserveMealCanteenList 修正 2025-02-20 15:14:34 +08:00
sxu ac0a15597c 去掉多余属性 2025-02-20 14:17:17 +08:00
sxu 244755f7ce 配置文件 2025-02-20 13:10:58 +08:00
sxu b3acf5f7c0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap-smart_canteen_local.yml
2025-02-20 13:05:14 +08:00
sxu 4cdef0b751 配置文件 2025-02-20 13:04:36 +08:00
liux 7e8f5f94a5 Merge remote-tracking branch 'origin/master' 2025-02-20 13:02:39 +08:00
liux c842763898 问题修改 2025-02-20 13:02:10 +08:00
gaowdong 009ca9e264 与订餐 提交 2025-02-20 11:22:21 +08:00
sxu d7466b96a3 Merge branch 'master' into coupon 2025-02-20 09:39:04 +08:00
tqzhang 22af9f8815 驿站:保存头像 2025-02-20 09:31:39 +08:00
tqzhang 901bac13f1 驿站:工具分享、多文件整理命名等 2025-02-20 09:07:01 +08:00
sxu 87ecfc0a02 账户相关 2025-02-19 20:41:29 +08:00
sxu c1a51266a3 获取订单评价数量 2025-02-19 18:54:42 +08:00
sxu 8c29099148 获取订单评价数量 2025-02-19 18:39:36 +08:00
tqzhang 3d74f5a8b9 驿站:物业服务、洗衣服务 2025-02-18 15:26:53 +08:00
tqzhang 645348d7c9 分页修改 2025-02-18 11:19:05 +08:00
tqzhang 91e25c8df9 分页修改 2025-02-18 11:06:56 +08:00
tqzhang be53cf08c6 驿站:汽车服务(车辆) 2025-02-17 17:11:17 +08:00
tqzhang f70cf9a4c3 驿站:理疗预约 2025-02-17 16:04:39 +08:00
sxu 1daa21bd5f change package path 2025-02-17 10:15:40 +08:00
sxu 294ce9f416 rebind mobile 2025-02-16 19:44:12 +08:00
sxu 7128d05a28 source type and rebind mobile 2025-02-16 16:38:44 +08:00
sxu 9a1700fb00 source type and rebind mobile 2025-02-16 16:22:26 +08:00
gaowdong e873191063 Merge remote-tracking branch 'origin/master' 2025-02-14 18:19:50 +08:00
gaowdong c24942e9fa 移除rabbit mq消费消息 2025-02-14 18:19:44 +08:00
tqzhang 0b05e78a1a 驿站:基本急救,就医协助接口 2025-02-14 18:01:46 +08:00
sxu 35f8f2db07 Merge remote-tracking branch 'origin/master' 2025-02-14 17:28:41 +08:00
sxu e4aa18b85d add openid 2025-02-14 17:28:33 +08:00
tqzhang 7a2eccc5de 删除controller的try-catch 2025-02-14 17:24:05 +08:00
liux f6282bfeab 基本信息(保存) 2025-02-14 15:50:57 +08:00
sxu 2c514a177d add openid 2025-02-14 15:44:52 +08:00
gaowdong cabf317f74 Merge remote-tracking branch 'origin/master' 2025-02-14 14:58:54 +08:00
gaowdong b5224726ce 移除rabbit mq消费消息 2025-02-14 14:58:47 +08:00
sxu 251b75b44a 去掉重复sql 2025-02-14 13:04:24 +08:00
gaowdong c8a7c14cf7 Merge remote-tracking branch 'origin/master' 2025-02-14 09:24:01 +08:00
gaowdong 93d35c4fb7 删除 cust-auth 2025-02-14 09:23:54 +08:00
tqzhang b928929990 upby修改 删除多余的AccSendMq.java 2025-02-14 09:21:56 +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