tangqian
|
88c8c3e459
|
fix: 充值相关
|
2023-05-25 17:44:35 +08:00 |
 小小张
|
51581f66a6
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-25 16:49:44 +08:00 |
|
小小张
|
8873be7def
|
后台--运费模板：配送区域修改
|
2023-05-25 16:49:27 +08:00 |
|
tangqian
|
877fe3d3aa
|
fix: 充值相关
|
2023-05-25 15:55:27 +08:00 |
|
tangqian
|
f1755820b6
|
fix: 充值相关
|
2023-05-25 15:30:21 +08:00 |
|
tangqian
|
270e45433e
|
fix: 充值相关
|
2023-05-25 14:48:29 +08:00 |
|
tangqian
|
01a1e11f9b
|
fix: 充值相关
|
2023-05-25 11:25:33 +08:00 |
 perry
|
65138e37a5
|
订单用户id
|
2023-05-24 20:05:05 +08:00 |
|
小小张
|
ca79db833d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 19:18:51 +08:00 |
|
小小张
|
af3ce42881
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 19:18:36 +08:00 |
|
perry
|
fee30e45bd
|
下单退款删除本地提报
|
2023-05-24 19:18:15 +08:00 |
|
小小张
|
65ed6707da
|
后台--运费模板：配送区域修改
|
2023-05-24 19:15:54 +08:00 |
|
perry
|
8aa259531a
|
下单
|
2023-05-24 19:06:11 +08:00 |
|
perry
|
5af1206445
|
下单
|
2023-05-24 18:57:56 +08:00 |
|
小小张
|
51d1392919
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 18:14:37 +08:00 |
|
小小张
|
c8b41aa45e
|
后台--运费模板：配送区域修改
|
2023-05-24 18:14:14 +08:00 |
|
perry
|
ac7a9d9c4c
|
访问地址
|
2023-05-24 18:10:09 +08:00 |
|
tangqian
|
e44f1addb5
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 16:34:37 +08:00 |
|
tangqian
|
a1de97950c
|
fix: 商城相关
|
2023-05-24 16:34:28 +08:00 |
|
perry
|
e9da423776
|
提报记录
|
2023-05-24 16:25:43 +08:00 |
|
perry
|
b87a5d35a7
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
# Conflicts:
# yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java
|
2023-05-24 16:03:33 +08:00 |
|
perry
|
749e4b7459
|
提报记录
|
2023-05-24 16:02:21 +08:00 |
|
tangqian
|
479f0c1079
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-24 15:41:05 +08:00 |
|
tangqian
|
8a595cbef0
|
fix: 商城相关
|
2023-05-24 15:41:00 +08:00 |
|
小小张
|
a9d146cba1
|
后台--运费模板：配送区域修改
|
2023-05-24 15:40:15 +08:00 |
|
小小张
|
d76f9950a1
|
后台--运费模板：配送区域修改
|
2023-05-24 15:27:08 +08:00 |
|
tangqian
|
c82b495ca5
|
fix: 修改判断用户是否被禁用
|
2023-05-24 14:12:43 +08:00 |
|
perry
|
f1fbbcf36d
|
微信支付
|
2023-05-24 14:10:41 +08:00 |
 js199000131
|
13e8e64726
|
修改商品属性值响应对象
|
2023-05-24 11:34:13 +08:00 |
|
js199000131
|
bb5ef9be1c
|
修改商品规格属性添加对象
|
2023-05-24 11:09:19 +08:00 |
|
tangqian
|
9c626bcbbc
|
fix: 添加支付截至时间
|
2023-05-24 10:35:54 +08:00 |
|
tangqian
|
02a33fbf08
|
fix: 添加支付截至时间
|
2023-05-24 10:23:04 +08:00 |
|
tangqian
|
9a6e45053c
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-23 17:21:37 +08:00 |
|
tangqian
|
3863a5a1d2
|
fix: 修改app获取用户信息
|
2023-05-23 17:21:26 +08:00 |
|
小小张
|
23c3f3bb90
|
后台--运费模板：配送区域修改
|
2023-05-23 17:16:23 +08:00 |
|
小小张
|
07de47d308
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-23 17:15:28 +08:00 |
|
perry
|
b6de22d7a5
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-23 11:26:57 +08:00 |
|
perry
|
3c2eca8fba
|
微信支付
|
2023-05-23 11:26:48 +08:00 |
|
tangqian
|
a8bfcebce4
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-23 11:23:21 +08:00 |
|
tangqian
|
aa88423153
|
fix: 修改档次信息
|
2023-05-23 11:23:15 +08:00 |
|
perry
|
1098528193
|
推广员
|
2023-05-23 10:30:53 +08:00 |
|
小小张
|
97f24e988d
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-23 09:43:54 +08:00 |
|
perry
|
4ce908adce
|
正式环境
|
2023-05-22 22:14:17 +08:00 |
|
tangqian
|
2d223030d4
|
feat: 根据手机号查询档次信息
|
2023-05-22 18:05:56 +08:00 |
|
perry
|
a6eb645d54
|
订单退款
|
2023-05-22 12:55:07 +08:00 |
|
perry
|
05c49b78ce
|
微信支付
|
2023-05-19 19:30:04 +08:00 |
|
tangqian
|
9764afb6bd
|
feat: 支付宝相关支付
|
2023-05-19 19:10:18 +08:00 |
|
tangqian
|
cab967d639
|
feat: 支付宝相关支付
|
2023-05-19 19:08:59 +08:00 |
|
tangqian
|
89122e9487
|
feat: 支付宝相关支付
|
2023-05-19 18:03:33 +08:00 |
|
perry
|
04e0f33ad3
|
微信支付
|
2023-05-19 17:49:39 +08:00 |
|
tangqian
|
797dd8cb9c
|
feat: 支付宝相关支付
|
2023-05-19 17:35:32 +08:00 |
|
tangqian
|
b106db5ca0
|
feat: 支付宝相关支付
|
2023-05-19 17:29:47 +08:00 |
|
小小张
|
ee355ec413
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-19 17:14:47 +08:00 |
|
tangqian
|
3a209f056b
|
feat: 支付宝相关支付
|
2023-05-19 16:45:37 +08:00 |
|
小小张
|
163f085ea1
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-19 15:54:17 +08:00 |
|
tangqian
|
bde92cebdf
|
feat: 支付宝相关支付
|
2023-05-19 13:53:33 +08:00 |
|
perry
|
21a020f430
|
微信支付
|
2023-05-19 10:24:44 +08:00 |
|
小小张
|
0b2b0eab96
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-19 10:00:50 +08:00 |
|
perry
|
46563efd16
|
微信支付
|
2023-05-18 19:28:02 +08:00 |
|
perry
|
18909d4c2c
|
微信支付
|
2023-05-18 18:49:43 +08:00 |
|
小小张
|
1bf472edb6
|
后台--运费模板：配送区域修改
|
2023-05-18 18:03:33 +08:00 |
|
tangqian
|
cf5c4179a6
|
feat: 微信相关支付
|
2023-05-18 16:35:54 +08:00 |
|
perry
|
6fc3ce15a1
|
快递公司实体
|
2023-05-18 13:32:52 +08:00 |
|
perry
|
09659b936c
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-18 13:25:53 +08:00 |
|
perry
|
6fac2affcc
|
测试环境
|
2023-05-18 13:25:44 +08:00 |
|
js199000131
|
cbf8056b88
|
物流公司和配置信息修改
|
2023-05-18 11:01:34 +08:00 |
|
tangqian
|
c4bdbb6904
|
feat: 商城支付退款
|
2023-05-18 09:49:55 +08:00 |
|
tangqian
|
32a452e86c
|
feat: 商城支付退款
|
2023-05-18 09:48:41 +08:00 |
|
tangqian
|
d958f5d012
|
feat: 商城支付退款
|
2023-05-18 09:45:29 +08:00 |
|
tangqian
|
630e1d454e
|
feat: 商城退款
|
2023-05-17 18:13:35 +08:00 |
|
tangqian
|
dea7cb0b77
|
feat: 会员充值,退款,会员展示,充值列表
|
2023-05-17 17:51:27 +08:00 |
|
perry
|
68227bf677
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-17 14:18:33 +08:00 |
|
perry
|
9fbee20579
|
推广员
|
2023-05-17 14:17:20 +08:00 |
|
tangqian
|
05e0c40659
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-17 10:54:06 +08:00 |
|
tangqian
|
34c0db7cf1
|
feat: 会员充值,退款,会员展示,充值列表
|
2023-05-17 10:53:59 +08:00 |
 luli
|
3efa1384c8
|
feat: 订单导出
|
2023-05-17 10:36:46 +08:00 |
|
小小张
|
201f44a588
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-16 18:47:34 +08:00 |
|
小小张
|
80e679a751
|
后台--调试物流、规格
|
2023-05-16 18:46:19 +08:00 |
|
tangqian
|
adcb6d26f2
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
|
2023-05-16 18:19:55 +08:00 |
|
tangqian
|
26a8631927
|
feat: 会员充值,退款
|
2023-05-16 18:19:33 +08:00 |
|
perry
|
72645b9dfc
|
商户管理
|
2023-05-16 18:17:54 +08:00 |
|
小小张
|
a4246b55b9
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-16 09:24:02 +08:00 |
|
perry
|
ca7f62f924
|
支付
|
2023-05-15 23:40:57 +08:00 |
|
perry
|
39e87b3701
|
充值记录
|
2023-05-15 18:28:49 +08:00 |
|
perry
|
e6387b5411
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-15 14:54:21 +08:00 |
|
perry
|
7a6b3ab7a2
|
充值记录
|
2023-05-15 14:54:10 +08:00 |
|
js199000131
|
60102c7bc7
|
用户收件地址字段名称修改
|
2023-05-15 10:26:17 +08:00 |
|
小小张
|
481473c310
|
App订单、商品实体类--修改
|
2023-05-15 10:15:43 +08:00 |
|
js199000131
|
982bdcd9ad
|
物流、商品和支付修改
|
2023-05-15 10:05:36 +08:00 |
|
perry
|
4e350e2767
|
商品管理
|
2023-05-15 09:56:07 +08:00 |
|
perry
|
f538a15636
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-14 17:37:04 +08:00 |
|
perry
|
b7e1341962
|
商品管理
|
2023-05-14 17:36:50 +08:00 |
|
js199000131
|
d624879f22
|
商品和支付
|
2023-05-14 15:44:42 +08:00 |
|
perry
|
3f213a4ae6
|
商品管理
|
2023-05-14 13:33:10 +08:00 |
|
perry
|
dece26fce7
|
商品管理
|
2023-05-12 19:04:02 +08:00 |
|
小小张
|
b502c67b65
|
App订单、商品--修改
|
2023-05-12 18:09:39 +08:00 |
|
小小张
|
7b87b5ae21
|
App订单、商品--拷贝
|
2023-05-12 18:07:55 +08:00 |
|
小小张
|
5254574914
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-12 10:20:18 +08:00 |
|
小小张
|
29e43885c5
|
订单管理--修改
|
2023-05-12 10:19:46 +08:00 |
|
perry
|
1622984df7
|
商品管理
|
2023-05-11 22:33:51 +08:00 |
|
小小张
|
693839a486
|
订单管理
|
2023-05-11 18:06:00 +08:00 |
|
js199000131
|
799c4604b1
|
物流管理修改
|
2023-05-11 16:21:08 +08:00 |
|
小小张
|
5342d330ef
|
物流管理
|
2023-05-11 10:09:11 +08:00 |
|
小小张
|
e68ce59af7
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesRegionDO.java
|
2023-05-11 10:08:36 +08:00 |
|
小小张
|
22525c4eb0
|
物流管理--实体类继承修改
|
2023-05-11 09:58:19 +08:00 |
|
perry
|
b175639c15
|
商品管理
|
2023-05-10 23:38:51 +08:00 |
|
perry
|
3e6f21dadd
|
商品管理
|
2023-05-10 22:49:41 +08:00 |
|
js199000131
|
53f9f8087e
|
物流管理修改
|
2023-05-10 17:52:53 +08:00 |
|
小小张
|
82f18fb9d1
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
|
2023-05-10 16:44:13 +08:00 |
|
小小张
|
5a86a3c3a4
|
物流管理--不包邮地区
|
2023-05-10 16:43:54 +08:00 |
|
perry
|
d084a87258
|
Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new
|
2023-05-10 15:38:42 +08:00 |
|
perry
|
1a198a5ef0
|
会员管理
|
2023-05-10 15:38:22 +08:00 |
|
小小张
|
ae226440a5
|
物流管理
|
2023-05-10 15:20:38 +08:00 |
|
perry
|
975a9a087c
|
请求方法修改
|
2023-05-10 10:06:01 +08:00 |
|
perry
|
3ab82fab34
|
请求方法修改
|
2023-05-10 10:01:05 +08:00 |
jason
|
14d02bdfb3
|
商品收藏修改
|
2023-05-06 11:58:27 +08:00 |
YunaiV
|
96e2bf020f
|
REVIEW 商品收藏的逻辑
|
2023-05-05 23:38:31 +08:00 |
|
YunaiV
|
cd86620b74
|
REVIEW 商品管理的逻辑
|
2023-05-05 23:01:23 +08:00 |
|
jason
|
7345d80b53
|
新增商品收藏功能
|
2023-05-04 15:52:42 +08:00 |
|
芋道源码
|
19ceea2c6c
|
!472 完善商品管理（第一版）
Merge pull request !472 from puhui999/dev
|
2023-05-04 00:36:18 +00:00 |
puhui999
|
810c7ed040
|
完善商品管理
|
2023-05-04 01:32:25 +08:00 |
|
puhui999
|
c233ce1a20
|
合并分支修复差异
|
2023-05-03 22:18:27 +08:00 |
|
YunaiV
|
6b05835cb3
|
购物车：增加获得商品数量 Map 接口
|
2023-05-03 09:20:17 +08:00 |
|
puhui999
|
e163ae8b70
|
完成商品保存和编辑数据回显
|
2023-05-03 02:31:50 +08:00 |
|
YunaiV
|
9980b12551
|
调整购物车接口，支持 add 商品时，适配前端可能要删除的情况
|
2023-05-03 00:30:02 +08:00 |
|
puhui999
|
70816371e5
|
初步完成商品CRUD
|
2023-05-02 02:33:14 +08:00 |
|
YunaiV
|
f7fe9ad7b0
|
1. 商城：调整购物车的失效逻辑实现，基于 SPU 是否下架
2. 商城：增加购物车失效的重选逻辑
|
2023-05-01 16:00:37 +08:00 |
|
puhui999
|
6428f0fcaf
|
添加商品枚举
|
2023-05-01 14:47:00 +08:00 |
|
YunaiV
|
da162853ec
|
商城：完善购物车的逻辑
|
2023-04-30 20:32:01 +08:00 |
|
puhui999
|
15ced47b17
|
添加多租户
|
2023-04-30 17:35:38 +08:00 |
|
puhui999
|
c10ea9d9de
|
移除ProductSku相关的status属性，修改Property
|
2023-04-30 17:35:05 +08:00 |
|
puhui999
|
24a56bb45f
|
移除ProductSku相关的status属性，修改Property
|
2023-04-30 17:34:56 +08:00 |
|
puhui999
|
f56d394830
|
修改ProductSpuBaseVO第一版
|
2023-04-29 21:28:09 +08:00 |
|
puhui999
|
668d493b7f
|
Product相关Do添加TenantBaseDO
|
2023-04-29 21:22:52 +08:00 |
|
YunaiV
|
2113e825d7
|
完善 App 商品详情逻辑的 10%
|
2023-04-27 22:43:37 +08:00 |
|
YunaiV
|
3ced6a3240
|
完善 App 商品搜索的逻辑
|
2023-04-26 20:13:12 +08:00 |
|
puhui999
|
4068548c45
|
移除ProductSpuSpecTypeEnum及相关引用
|
2023-04-26 17:38:42 +08:00 |
|
YunaiV
|
a5f018104e
|
调整商品分类的实现
|
2023-04-25 21:33:59 +08:00 |
|
puhui999
|
c3e36ba9da
|
修正相关问题让服务正常启动，改动位置都已加上TODO记录
|
2023-04-24 10:50:40 +08:00 |
|
puhui999
|
6786aa352b
|
修正DO对齐数据库表字段，VO对齐前端
|
2023-04-24 10:29:02 +08:00 |
|
YunaiV
|
502fa11f1d
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
|
2023-04-19 18:10:59 +08:00 |
|
YunaiV
|
32da5aae84
|
商城：product：完善 ProductSpuDO 表
|
2023-04-19 18:07:22 +08:00 |
|
YunaiV
|
63542b4ccb
|
商城：product：完善 ProductSkuDO 表
|
2023-04-19 16:30:57 +08:00 |
|
YunaiV
|
b30fc28021
|
商城：product：完善 ProductSpuDO 表
|
2023-04-19 10:55:43 +08:00 |
|
YunaiV
|
e5fcc7a387
|
boot3：适合 ServletUtils
|
2023-04-16 21:40:56 +08:00 |
wangzhs
|
38d7d75f7f
|
[新增][商品评价]管理后台/APP端
1. 增加头像返回字段
2. 调整商户自评userId
3. 控制评论图片数量判断
|
2023-03-23 14:06:14 +08:00 |
|
wangzhs
|
6fe5f4bc0d
|
[新增][商品评价]管理后台/APP端
|
2023-03-21 11:09:10 +08:00 |
chop
|
14e7c52e0e
|
原来的Date类型查询订单返回时间差8个小时，项目全局使用LocalDateTime时间
原来的Date类型查询订单返回时间差8个小时，项目全局使用LocalDateTime时间
Signed-off-by: chop <935048000@qq.com>
|
2023-03-21 02:35:42 +00:00 |
|
wangzhs
|
cbf5ef5953
|
[新增][商品评价]管理后台
1. 显示 / 隐藏评论
2. 商家回复
|
2023-03-19 22:07:07 +08:00 |
|
wangzhs
|
da53a041da
|
[新增][商品评价]管理后台分页查询
|
2023-03-19 18:59:51 +08:00 |