Commit Graph

1412 Commits

Author SHA1 Message Date
a53911aaa5 挂账退款 2026-02-05 10:57:02 +08:00
257977a000 退款 2026-02-04 16:38:29 +08:00
bb7ca6d05b 统计字段 2026-02-04 15:03:33 +08:00
ee78543ab8 统计 2026-02-04 14:57:15 +08:00
4deba098ce Merge branch 'prod' into test 2026-02-04 14:21:01 +08:00
9da67fc67f 商户版本 2026-02-03 10:17:12 +08:00
gong
ad24a91a28 财务报表 2026-02-02 14:51:21 +08:00
ec1bc6a156 Merge branch 'test' into prod
# Conflicts:
#	cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
#	cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShareBaseServiceImpl.java
2026-01-31 16:22:16 +08:00
c9a432b786 分销等级配置
优惠券获得方式
2026-01-31 15:50:59 +08:00
d9143f9b82 店铺Id类型转换问题 2026-01-31 14:46:25 +08:00
9c5b8ea53f 分销关系 2026-01-31 14:37:03 +08:00
gong
0d4b1ace60 统计数据导出 2026-01-31 14:06:23 +08:00
ccc18fc229 分销等级配置
优惠券获得方式
2026-01-31 09:56:29 +08:00
gong
f92a593ff8 单位-分类导出 2026-01-30 18:24:32 +08:00
f32212928a Merge branch 'test' into prod
# Conflicts:
#	cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
2026-01-30 16:02:25 +08:00
gong
496c931678 商品导出 2026-01-30 14:13:02 +08:00
7d640b4f9c 支付问题 2026-01-29 17:57:18 +08:00
3fd032c1d0 OPTIONS放行 2026-01-29 17:34:31 +08:00
6b0423a2ba saToken认证 2026-01-29 17:24:44 +08:00
9c69c8dcbc OPTIONS请求放行 2026-01-29 17:11:28 +08:00
gong
fcd70b24a8 Merge remote-tracking branch 'origin/test' into test 2026-01-29 09:42:59 +08:00
gong
2d15315b79 商品导出 2026-01-29 09:42:50 +08:00
abcd0fbc7b 不知道 2026-01-28 17:27:54 +08:00
abdbe89082 Merge remote-tracking branch 'origin/test' into test 2026-01-28 14:40:06 +08:00
e3887148c1 用户端获取分享的基础配置 2026-01-28 14:39:55 +08:00
gong
9e2cf024eb 用户列表导出接口 2026-01-28 13:47:33 +08:00
6cd6ac74ea 分销更名 全民股东
新增全民股东群聊配置
2026-01-28 10:54:58 +08:00
52e8a209fb 分享 领取 2026-01-27 16:22:56 +08:00
f2024d5be5 小程序 页面修改
分享配置
轮播图配置
2026-01-27 14:16:25 +08:00
4c65d3226a 异常 抛出 2026-01-26 09:29:26 +08:00
1a18449d65 邀请问题 2026-01-23 16:35:56 +08:00
10cb6aa8cc 事务结束后 响应 2026-01-22 17:35:28 +08:00
0ba52b85b2 检查登录 2026-01-21 13:36:59 +08:00
0345ab85ec 标识 2026-01-21 10:39:02 +08:00
6f64c8be81 莫名其妙的问题 2026-01-21 10:37:37 +08:00
1ce9b023ab token问题 2026-01-21 10:33:11 +08:00
a1aebd16de token问题 2026-01-21 10:26:01 +08:00
0549a077b2 会员充值/霸王餐支付 关联id问题
统一异常拦截 rootCause 值
CLIENT_LOGIC 与 USER_LOGIC 问题
2026-01-21 10:17:09 +08:00
45965fb426 异常信息尝试获取 2026-01-20 18:25:02 +08:00
034a8c4650 报错 2026-01-20 17:51:39 +08:00
4cd71ad35a 兼容 2026-01-20 17:43:36 +08:00
8242a4f905 支付类型 2026-01-17 17:32:31 +08:00
fff14043b5 触发打印位置 2026-01-17 14:36:04 +08:00
e9ef1b0fac 支付参数 2026-01-17 10:25:19 +08:00
21da0a344c Merge branch 'test' into prod
# Conflicts:
#	cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java
#	cash-api/order-server/src/main/java/com/czg/controller/DistributionPayController.java
#	cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
#	cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
2026-01-17 09:52:55 +08:00
235c442c6d 进件关联 2026-01-16 17:49:52 +08:00
592cc99db4 进件关联 2026-01-16 17:42:02 +08:00
b22b9bd4d6 进件查询问题 2026-01-16 16:15:17 +08:00
9834c59fc7 常量 2026-01-15 14:31:26 +08:00
df72bad0dc Merge remote-tracking branch 'origin/test' into test 2026-01-15 14:05:06 +08:00