Commit Graph

35 Commits

Author SHA1 Message Date
sxu a3cd3c7836 sync_pay_state 2025-02-21 16:43:34 +08:00
gaowdong 9871846e56 与订餐-退单 2025-02-20 17:13:18 +08:00
gaowdong 009ca9e264 与订餐 提交 2025-02-20 11:22:21 +08:00
sxu 87ecfc0a02 账户相关 2025-02-19 20:41:29 +08:00
sxu 294ce9f416 rebind mobile 2025-02-16 19:44:12 +08:00
gaowdong c24942e9fa 移除rabbit mq消费消息 2025-02-14 18:19:44 +08:00
sxu e4aa18b85d add openid 2025-02-14 17:28:33 +08:00
sxu 2c514a177d add openid 2025-02-14 15:44:52 +08:00
gaowdong b5224726ce 移除rabbit mq消费消息 2025-02-14 14:58:47 +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 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
tqzhang e174b0ece0 customer-data-change-delay 消息推送 2025-02-13 13:36:45 +08:00
gaowdong bca90e0c44 MQ提交 2025-02-13 10:09:36 +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
liux b7bf685daf 基本信息(保存) 2025-02-12 16:49:09 +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
sxu a6b61982a2 菜谱详情 2025-02-12 12:48:10 +08:00
tqzhang 9803cafd9b 充值接口--暂时可启动 2025-02-11 19:44:14 +08:00
gaowdong 1c30938d6f 评价投诉建议 2025-02-11 15:59:01 +08:00
gaowdong aca5728e02 订单-评价 2025-02-10 18:29:28 +08:00
liux 3d254fa734 我的信息模块代码 2025-02-08 11:11:12 +08:00
gaowdong 03cde7f590 修改 Id.next() 以及springcontextholer 2025-02-08 09:06:15 +08:00
tqzhang fca5072fac 获取指定餐品的评价列表 api/v1/applet/menuevaluaorder/page/meal 2025-02-07 16:56:21 +08:00
gaowdong 8285176027 订单-订单详情/支付方式 2025-02-06 18:14:43 +08:00
sxu ddb701920a Merge branch 'master' into weekmenu 2025-02-05 19:05:01 +08:00
sxu 517f628838 一周菜谱 2025-02-05 18:59:43 +08:00
tqzhang bc0f0ec174 /api/v2/acc/metadata/query 余额查询-查询配置 2025-02-05 16:59:54 +08:00
sxu b6e2d65329 合并客户登录 2025-02-03 21:00:07 +08:00
sxu 18b184bdac 合并代码 2025-01-24 15:03:03 +08:00
sxu abca1acabd 合并代码 2025-01-24 14:55:03 +08:00
sxu 0dca65d6ff 合并代码 2025-01-24 13:30:47 +08:00
sxu f36b2976a6 合并代码 2025-01-24 13:23:16 +08:00
sxu c0dba961bc first commit 2025-01-23 16:18:40 +08:00