4743 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Guoqs	fdee4a7d8c	testSettleOrderLogicV2	2025-03-26 20:32:12 +08:00
Guoqs	670a35c9a1	余额支付, 校验消费金额 - 折扣金额 + 退款金额 = 支付金额	2025-03-26 19:58:42 +08:00
Guoqs	063c4f494f	优化结算订单逻辑	2025-03-26 19:37:05 +08:00
Guoqs	5fc11ac45d	优化结算订单逻辑	2025-03-26 19:26:06 +08:00
Guoqs	03ed70e58a	优化结算订单逻辑	2025-03-26 19:12:22 +08:00
Guoqs	87a84c020a	优化结算订单逻辑	2025-03-26 17:15:54 +08:00
Lemon	1232418627	update 小程序首页查询站点列表接口	2025-03-26 16:47:20 +08:00
Guoqs	99a39bce5f	优化结算订单逻辑	2025-03-26 16:25:52 +08:00
Guoqs	738854e2a6	不使用交易记录中的时段金额	2025-03-26 16:10:50 +08:00
Guoqs	72b99da831	打印日志	2025-03-26 15:52:08 +08:00
Guoqs	94c3f33b5e	优化结算订单逻辑	2025-03-26 15:30:39 +08:00
Guoqs	e4a8602f74	优化结算订单逻辑	2025-03-26 14:42:57 +08:00
Guoqs	c5be09a3e3	打印日志	2025-03-26 14:32:28 +08:00
Guoqs	2121e540aa	打印日志	2025-03-26 14:19:34 +08:00
Guoqs	041135db04	优化结算订单逻辑	2025-03-26 14:04:57 +08:00
Guoqs	06cac74a18	优化结算订单逻辑	2025-03-26 13:49:31 +08:00
Guoqs	8c8cb42ba8	优化结算订单逻辑	2025-03-26 11:49:33 +08:00
Guoqs	c5bc4d194f	优化结算订单逻辑	2025-03-25 17:06:10 +08:00
Guoqs	0e0f6d6823	优化结算订单逻辑	2025-03-25 17:05:25 +08:00
Lemon	f136f66855	update 小程序首页查询站点列表接口	2025-03-25 17:02:48 +08:00
Guoqs	8459098231	打印日志	2025-03-25 16:43:08 +08:00
Guoqs	74c5828ed1	打印日志	2025-03-25 16:41:42 +08:00
Guoqs	070946a454	会员优惠计费模板不发布	2025-03-25 16:25:15 +08:00
Guoqs	240ea6bcd1	打印日志	2025-03-25 15:52:56 +08:00
Guoqs	9286aa0e66	打印日志	2025-03-25 15:44:30 +08:00
Guoqs	a180c1d830	查询订单折扣	2025-03-25 15:16:51 +08:00
Guoqs	8e1fcd008d	打印日志	2025-03-25 14:57:25 +08:00
Guoqs	2c43d2ea1f	设置挡板, PRE环境不执行定时任务	2025-03-25 14:50:11 +08:00
Guoqs	aa92d49d17	设置挡板, 非PRD环境不执行定时任务	2025-03-25 14:33:58 +08:00
Lemon	ac28c1abba	update	2025-03-25 13:56:34 +08:00
Lemon	784c741983	Merge branch 'dev-zza' into dev	2025-03-25 13:26:20 +08:00
Lemon	d6e4131adf	update 小程序首页查询站点列表接口新增查询条件筛选	2025-03-25 13:25:17 +08:00
Lemon	c4439a059b	update 小程序首页查询站点列表接口新增收藏标识字段	2025-03-25 13:24:04 +08:00
Guoqs	72604e8713	打印日志	2025-03-25 11:57:45 +08:00
Guoqs	b7a5870afa	Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev	2025-03-25 10:51:04 +08:00
Guoqs	6064e6a172	PRE环境保持和生产环境相同数据库	2025-03-25 10:48:52 +08:00
Lemon	6888c93d85	add 新增小程序首页查询站点列表接口	2025-03-25 10:40:13 +08:00
Lemon	9007b1db52	bugfix 查询计费模板为空	2025-03-25 10:30:22 +08:00
Guoqs	f2f46b3d45	站点日报按日期查询	2025-03-24 14:33:07 +08:00
Guoqs	51c0bc731d	Merge branch 'dev' into dev-g	2025-03-24 11:12:59 +08:00
Guoqs	b5d7c188a7	分账明细查询	2025-03-24 11:08:24 +08:00
Lemon	f9e5d0124b	Merge branch 'dev-zza' into dev	2025-03-24 09:52:23 +08:00
Lemon	584d8ee6b7	bugfix 小程序查询站点计费模板未筛选出非会员价	2025-03-24 09:48:52 +08:00
Guoqs	2c7a206e2a	Merge branch 'dev' into dev-g	2025-03-21 15:16:39 +08:00
Guoqs	df4e7191a1	update paymentIds	2025-03-21 15:16:29 +08:00
Lemon	2c8188a17a	新增 用户添加/取消收藏站点接口、用户查询收藏站点列表接口	2025-03-21 09:45:59 +08:00
YAS\29473	2cc26fc624	update	2025-03-19 15:58:15 +08:00
YAS\29473	98e654b0fc	update	2025-03-19 15:13:22 +08:00
YAS\29473	2fd62844fa	Merge remote-tracking branch 'origin/dev' ... # Conflicts: # jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java # jsowell-admin/src/main/java/com/jsowell/service/MemberService.java # jsowell-admin/src/main/java/com/jsowell/service/OrderService.java # jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java # jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java	2025-03-19 15:05:14 +08:00
YAS\29473	c910ab609a	update查询用户常去站点(最近半年)	2025-03-19 15:02:29 +08:00