weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2024-12-27 01:52:13 +08:00
Code Issues Projects Releases Packages Wiki Activity
1315 commits 9 branches 2 tags 93 MiB
Commit graph

215 commits

Author SHA1 Message Date
weizhiqiang
ac98cb04f0 feat: 注释修改 2024-11-15 16:42:06 +08:00
weizhiqiang
5dfb5e2da7 feat: 接口权限修改 2024-11-15 12:40:14 +08:00
weizhiqiang
68764d9a8e feat: 门店位置计算 2024-11-15 11:20:54 +08:00
weizhiqiang
aa58aabc30 feat: 新增计算两点的巨鹿 2024-11-15 11:09:24 +08:00
weizhiqiang
53419da43e feat: 门店新增logo字段 2024-11-15 09:51:31 +08:00
weizhiqiang
030217a7ff feat: 注释修改 2024-11-14 16:13:03 +08:00
weizhiqiang
f7141acf31 feat: 文件配置参数校验修改 2024-11-11 20:11:53 +08:00
weizhiqiang
5ff8070588 feat: 商城购物车新增商城商品信息查询逻辑 2024-11-11 11:52:51 +08:00
wst
888f8fa087 feat: 门店和品牌增加背景图片 2024-11-11 11:47:07 +08:00
weizhiqiang
b900ef832b feat: 会员新增来源门店信息 2024-11-10 17:21:52 +08:00
wst
21b61c8b1e feat: 补充商品订单状态枚举 2024-11-09 21:25:28 +08:00
wst
766d67f5ae feat: 优惠券修改字段及根据商品id查询是的bug 2024-11-08 21:28:41 +08:00
SUCH HAVE YOU
15660278f3 给快递公司，运费模板一些字段设置输入限制 2024-11-08 17:03:22 +08:00
SUCH HAVE YOU
3dc269cf25 feat.修复代码判断bug和判断条件 2024-11-08 16:33:25 +08:00
SUCH HAVE YOU
99a399b245 feat:更新对运费模板的name长度判断 2024-11-08 15:14:05 +08:00
weizhiqiang
dbe494fad8 feat: 解决购物车列表报错的问题 2024-11-08 14:58:22 +08:00
weizhiqiang
22837b7f34 feat: 商城购物车列表销售价格显示修改 2024-11-07 11:59:52 +08:00
SUCH HAVE YOU
4553cf59e1 feat.给配送计费方式字段 添加 一段解算，参考#DeliveryExpressType， 删除多余代码，增加对快递运费模板name长度的校验 2024-11-06 21:41:19 +08:00
wst
097380dd1d feat: 根据状态获取购物车信息接口补充注释 2024-11-06 21:06:16 +08:00
wst
757faa1014 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-11-06 21:04:23 +08:00
wst
b61cdb1a8a feat: 状态获取购物车信息接口补充注释 2024-11-06 21:04:06 +08:00
weizhiqiang
37cbe773e5 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-11-06 21:01:32 +08:00
weizhiqiang
bb6c3f7692 feat: 新增批量更新购物车商品选中/不选中的接口 2024-11-06 21:01:27 +08:00
wst
80fadef99c Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-11-06 21:01:15 +08:00
wst
9152701784 feat: 获取购物车信息增加selected状态选择 2024-11-06 21:01:12 +08:00
weizhiqiang
468ea5f13d feat: 门店查询接口更新 2024-11-06 20:36:50 +08:00
SUCH HAVE YOU
515f664c21 feat.增加根据id获取信息接口 2024-11-04 11:17:28 +08:00
wst
5c4a130fbc Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-11-03 21:45:59 +08:00
wst
6588e4aeb7 feat: 商品订单查询自己的评价和根据商品id查询接口合为一个分页查询接口 2024-11-03 21:45:55 +08:00
SUCH HAVE YOU
937524f19e feat: 修复广告位接口【获取已启用的广告位】查询出全部【包括未启用】情况 2024-11-03 20:01:33 +08:00
wst
1bde179bf2 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-11-03 19:53:43 +08:00
wst
cd4aa583ae feat: 增加商品订单评价表 2024-11-03 19:53:38 +08:00
weizhiqiang
62c1c8d711 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-11-03 19:30:12 +08:00
weizhiqiang
f7104af9c6 feat: 会员信息修改 2024-11-03 19:30:01 +08:00
SUCH HAVE YOU
20c6a6107b feat: 新增根据id查询快递运费模版信息接口 2024-11-03 19:25:44 +08:00
wst
8ade746ee4 feat: 订单管理（未完成） 2024-11-03 10:09:58 +08:00
weizhiqiang
66f2a7ba31 feat: 删除多余空行 2024-10-26 11:25:39 +08:00
weizhiqiang
61d37d3b42 feat: 优惠券删除多余代码 2024-10-26 10:50:49 +08:00
weizhiqiang
e81d7196a8 feat: 优惠券修改 2024-10-26 10:15:10 +08:00
weizhiqiang
4fb729d866 feat: 优惠券模板写入页面修改 2024-10-23 20:57:17 +08:00
weizhiqiang
4a4762d93f feat: 商城模块优惠券修改 2024-10-23 20:15:36 +08:00
weizhiqiang
41ff6f7d50 feat: 优惠券代码修改 2024-10-23 14:31:35 +08:00
weizhiqiang
4cf6790b36 feat: 新增根据商品id获取所有已启用的优惠券列表的接口 2024-10-23 11:34:43 +08:00
weizhiqiang
ec40ba33a5 feat: 优惠券查询修改 2024-10-23 11:18:52 +08:00
weizhiqiang
7bac1aba07 feat: 优惠券代码修改 2024-10-23 10:57:48 +08:00
weizhiqiang
49068bf117 feat: 会员关联会员等级信息 2024-10-23 09:38:05 +08:00
sdhkjh
e49ca74a59 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-10-22 21:50:04 +08:00
sdhkjh
23a230f174 feta: 修复优惠券bug 2024-10-22 21:49:59 +08:00
SUCH HAVE YOU
522e853f09 feat: 修改代码规范 2024-10-20 20:36:53 +08:00
sdhkjh
aae6dbb946 feat:商城优惠券修改部分成员变量相关参数 2024-10-20 11:33:21 +08:00
sdhkjh
2b3f3cf271 feat: 取消优惠券适用对象在界面上进行管理 2024-10-19 09:10:31 +08:00
sdhkjh
904bd8c1e2 feat: 修改优惠券适用对象根据优惠券id查询时的分组方式 2024-10-17 21:46:42 +08:00
sdhkjh
a0a09f46e8 feat: 新增优惠券表和优惠券领取表 2024-10-17 20:51:38 +08:00
sdhkjh
5cf3edc183 feat: 修改商城根据id查询接口名字 2024-10-16 09:20:11 +08:00
sdhkjh
3a2f6c08f3 feat: 商城收件地址增加根据id查询接口 2024-10-16 09:17:16 +08:00
sdhkjh
ce354c787f feat: 查询地址时倒序排序 2024-10-15 21:42:08 +08:00
sdhkjh
d70468665c feat: 收件地址增加收件地址标签字段及其mation 2024-10-09 17:25:51 +08:00
SUCH HAVE YOU
9e4f31d225 feat: 修改会员等级，快递运费，快递运费模板，快递公司的查询、删除代码，添加版权注释 2024-10-07 10:38:44 +08:00
weizhiqiang
3283c0551f Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-10-07 10:34:13 +08:00
weizhiqiang
5d9be4fcde feat: 新增修改会员头像和昵称的接口 2024-10-07 10:34:02 +08:00
sdhkjh
e41863e21b feat: 修改批量删除接口为使用基础包的批量删除 2024-10-07 10:26:37 +08:00
sdhkjh
cf2d7abf6d feat: 商城收件地址删除分页查询接口，购物车列表查询返回的结果增加AllShopStoreInfo 2024-10-06 22:03:16 +08:00
sdhkjh
3b35a0e7d4 feat: 增加shop_address_label包及基础接口 2024-10-06 17:21:52 +08:00
SUCH HAVE YOU
470e3e26c3 feat: 会员等级注释更改 2024-10-05 20:47:47 +08:00
SUCH HAVE YOU
38df457b38 feat.更新快递公司和快递运费无法通过门店查询 2024-10-05 14:38:21 +08:00
SUCH HAVE YOU
2111b33ed9 feat.更新快递公司和快递运费无法通过门店查询 2024-10-05 11:42:03 +08:00
SUCH HAVE YOU
3addd112a0 feat.优化会员等级接口代码 2024-10-04 21:02:24 +08:00
SUCH HAVE YOU
21befb80ba feat.优化快递运费模版，快递公司管理，广告位管理接口代码 2024-10-04 20:19:55 +08:00
sdhkjh
0d6468d86d feat: 修复门店商品分类分页查询的模糊查询 2024-10-04 17:11:56 +08:00
SUCH HAVE YOU
a82b4e2ca4 feat.优化快递运费模版，快递公司管理接口代码 2024-09-29 20:39:40 +08:00
sdhkjh
26ab574e89 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-29 20:13:50 +08:00
sdhkjh
72794bad7d feat: 门店商品分类。列表查询只查启用的，分类查询不考录状态。 2024-09-29 20:13:45 +08:00
SUCH HAVE YOU
226812acc9 feat.删除多余文件 2024-09-28 20:08:15 +08:00
SUCH HAVE YOU
1978430e53 feat.新增快递运费模版接口 2024-09-28 20:08:15 +08:00
sdhkjh
f28b26911b Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-28 10:31:01 +08:00
sdhkjh
c3b5c39127 feat: 门店商品分类增加分页查询接口 2024-09-28 10:30:57 +08:00
SUCH HAVE YOU
0d4c2b88c4 feat.广告位管理模块接口 2024-09-26 16:44:25 +08:00
sdhkjh
c405ac1524 feat: 修复查询自己的收件地址时的空指针异常 2024-09-26 10:03:03 +08:00
sdhkjh
5cbf7c47ae Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-25 21:08:59 +08:00
sdhkjh
6aa82c643f feat: 商城收件地址，查询自己的默认地址和自己的所有地址 2024-09-25 21:08:52 +08:00
SUCH HAVE YOU
08aabed0ff feat.快递公司管理模块接口 2024-09-23 20:10:19 +08:00
sdhkjh
71254b020c Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-22 14:30:48 +08:00
sdhkjh
d8ee6434f8 feat: StoreType表增加enabled字敦 2024-09-22 14:30:44 +08:00
SUCH HAVE YOU
69afee5eb5 feat.优化会员等级代码 2024-09-21 20:23:19 +08:00
sdhkjh
a15a0c46d9 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-21 17:10:18 +08:00
sdhkjh
d49e2c24f8 feat: storetype表queryStoreTypeList接口增加storeId参数 2024-09-21 17:08:05 +08:00
weizhiqiang
70e9ad01f6 feat: 新增快递配送计费方式枚举类 2024-09-21 15:22:08 +08:00
SUCH HAVE YOU
1359ebc285 feat.商城会员等级功能模块 2024-09-21 14:45:09 +08:00
sdhkjh
1b4ff1a13f feat: 新增支付渠道表及其相关接口 2024-09-20 16:01:50 +08:00
weizhiqiang
c136f91126 feat: 解决APP端用户登录获取购物车失败的问题 2024-09-19 16:37:24 +08:00
sdhkjh
61fec11025 feat: 增加门店商品分类表，及其相关接口 2024-09-19 14:37:39 +08:00
weizhiqiang
40fa58cc5b feat: 商城优惠券信息枚举类 2024-09-19 10:00:03 +08:00
weizhiqiang
44e1864689 feat: 商品列表查询修改 2024-09-18 16:01:58 +08:00
sdhkjh
8f9a3b1264 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-18 15:04:29 +08:00
sdhkjh
d1c9dff531 feat: 增加根据用户id获取收件地址列表接口 2024-09-18 15:04:25 +08:00
weizhiqiang
9d7ddb957a feat: 新增门店与商品的关系 2024-09-18 14:59:37 +08:00
weizhiqiang
d4345c983d feat: 新增会员注册接口 2024-09-18 11:10:07 +08:00
sdhkjh
9495618ca4 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-18 10:10:38 +08:00
sdhkjh
4a44cce1f1 feat: 增加收件地址功能 2024-09-18 10:10:33 +08:00
weizhiqiang
322c94ec70 feat：移动端登录修改 2024-09-18 10:09:09 +08:00
sdhkjh
dceaafef1c feat: 新增已有商品时，执行修改数量操作 2024-09-17 11:48:58 +08:00
weizhiqiang
8f4866cc46 feat: 代码更新 2024-09-17 10:23:46 +08:00
sdhkjh
ee18fcebe5 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-17 10:03:23 +08:00
sdhkjh
72483a577f feat: 购物车增加计算总价接口 2024-09-17 10:03:19 +08:00
weizhiqiang
a06ffe5669 feat: 新增管理端短信验证码登录接口，新增商城的登录管理 2024-09-16 17:09:04 +08:00
sdhkjh
1afb576ea6 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-15 17:30:29 +08:00
weizhiqiang
2eb7a5aa3b feat: 所有工程jar包升级 2024-09-15 17:09:48 +08:00
sdhkjh
39125da0b8 Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-15 15:10:00 +08:00
sdhkjh
83f0214431 feat: 购物车增加枚举功能 2024-09-15 15:09:56 +08:00
weizhiqiang
de9f41c05e feat：网关服务修改 2024-09-14 14:28:33 +08:00
sdhkjh
e3e323431f Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server 2024-09-14 11:26:31 +08:00
sdhkjh
776cdc465f feat： 购物车跨工程调用ERP的商品信息. 2024-09-14 11:26:25 +08:00
weizhiqiang
0b584d5620 feat: springboot版本升级+支付 2024-09-12 17:40:07 +08:00
sdhkjh
50e5ebb2cf feat: 简化wall的点赞代码，shop增加shop_reande_cart表 2024-09-08 20:33:07 +08:00
DESKTOP-ESU4BDD\WeiZhiQiang
50ec1db258 feat: 代码迁移 2024-08-30 11:38:45 +08:00