fengb
|
115fe962f5
|
年费充值记录
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
Houpn
|
60bef096b6
|
Merge branch 'dev' into dev-new-houpn
|
3 years ago |
|
fengb
|
6de89213f1
|
销售单明细表加字段
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
Houpn
|
e407686cb7
|
Merge branch 'dev' into dev-new-houpn
|
3 years ago |
|
fengb
|
ff28425eec
|
修改bigint为字符串类型
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
Houpn
|
b8a151c6bd
|
Merge branch 'dev' into dev-new-houpn
|
3 years ago |
|
fengb
|
195f2b3d70
|
添加tableName注解
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
Houpn
|
f89f7a13c4
|
Merge remote-tracking branch 'origin/dev' into dev-new-houpn
# Conflicts:
# hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/PurchaseController.java
# hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/StockController.java
# hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/PurchaseDetailMapper.java
# hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/Purchase.java
# hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetail.java
# hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/PurchaseDetailExample.java
# hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/StockService.java
# hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/StockServiceImpl.java
# hiver-modules/hiver-mall/src/main/resources/mapper/PurchaseDetailMapper.xml
|
3 years ago |
|
fengb
|
24ecaf2a95
|
销售单表添加付款状态字段
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
fengb
|
2bd722a183
|
销售单代码
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
fengb
|
fa631b696e
|
添加商品模块功能
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
fengb
|
78a9346bc7
|
添加商品模块功能
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
Houpn
|
f0ad79c471
|
修改订单模块至mall
|
3 years ago |
|
Houpn
|
c5680cbab1
|
Merge remote-tracking branch 'origin/dev-new-houpn' into dev
|
3 years ago |
|
Houpn
|
e93168612e
|
修正状态类字段
|
3 years ago |
|
fengb
|
badd1301d8
|
支付宝转账交易
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
Houpn
|
60b7d0f877
|
Merge branch 'dev-new-houpn' into dev
|
3 years ago |
|
Houpn
|
92e89f6d05
|
删除缓存类
|
3 years ago |
|
Houpn
|
0642d54bb1
|
提交订单管理/物流/快递人员/公司维护等功能
|
3 years ago |
|
fengb
|
4d9a51556d
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# hiver-admin/src/main/resources/application.yml
|
3 years ago |
delicacylee
|
5c7af797f7
|
用户增加clientId字段
|
3 years ago |
|
delicacylee
|
e4384886db
|
设置3为取消订单，与OrderXD状态一致。
|
3 years ago |
|
delicacylee
|
d2cac6538c
|
修正购物车逻辑BUG。
|
3 years ago |
|
delicacylee
|
8ba33da863
|
Merge branch 'dev' of 154.8.162.157:xixihaha/reddoor into dev
|
3 years ago |
|
delicacylee
|
47ab7756d7
|
小程序基础接口已完成，还有一些BUG需要处理。
|
3 years ago |
|
fengb
|
17b9f58d0f
|
支付宝转账交易
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
fengb
|
74582de8ab
|
redis密码
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
fengb
|
7d9d4b748b
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
Houpn
|
b3a108c2fc
|
Merge remote-tracking branch 'origin/dev-new-houpn' into dev
|
3 years ago |
|
Houpn
|
4208409386
|
提交充值记录信息
|
3 years ago |
|
delicacylee
|
65b208eec0
|
增加用户创建的店员信息。
|
3 years ago |
|
Houpn
|
031f3061e0
|
提交本地修改至本地repository，但不进行推送
|
3 years ago |
|
delicacylee
|
4525b2879b
|
用户表t_user增加邀请人ID字段。
|
3 years ago |
|
delicacylee
|
728f610017
|
正在支持小程序上传图片的接口。
|
3 years ago |
|
fengb
|
edc7cdd301
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
delicacylee
|
a6333ce869
|
商铺增加是否默认字段，增加t_shop_user关系对照表用于小程序，增加了业务逻辑。
|
3 years ago |
|
fengb
|
7a5ea05265
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
Houpn
|
b8c7530895
|
修订ordercontroller
|
3 years ago |
|
fengb
|
645c0ecf42
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
Houpn
|
9541ec9d81
|
合并dev-houpn开发代码到dev
|
3 years ago |
|
Houpn
|
34ccf555c3
|
合并dev-houpn开发代码到dev
|
3 years ago |
|
fengb
|
7960e4fb1f
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
chencheng
|
7b553af047
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
liyazhi
|
a43d14e3f7
|
Merge branch 'dev-liyazhi' into 'dev'
Dev liyazhi
See merge request xixihaha/reddoor!1
|
3 years ago |
|
Houpn
|
d9cfc3979f
|
提交本地修改内容
|
3 years ago |
|
delicacylee
|
9bad25475b
|
增加商品、商品规格/属性、库存、购物车等接口。
|
3 years ago |
|
fengb
|
9fc39e29fd
|
设置token过期时间为60分钟
Signed-off-by: fengb <fengbin1989@aliyun.com>
|
3 years ago |
|
delicacylee
|
dd28f0845d
|
调整库存、商品属性和规格的逻辑。
|
3 years ago |
|
delicacylee
|
73aff9031f
|
更新品牌和分类的逻辑。
|
3 years ago |
chenc
|
831ebfca18
|
店铺管理 init
|
3 years ago |
