2875 Commits

Author SHA1 Message Date
5be47b6a30 调整店铺内云商品查询 2023-05-25 11:04:01 +08:00
dbf8ab42f5 调整加入购物车参数 2023-05-25 10:38:03 +08:00
c4e1ee67d3 商户类型添加字段 2023-05-25 09:49:39 +08:00
mkm
1cc04fb1ca Merge remote-tracking branch 'shop/dev' into dev 2023-05-25 09:48:51 +08:00
mkm
182409e47e 修复问题 2023-05-25 09:48:32 +08:00
6f5ccbc6b5 Merge branch 'profit_sharing' into dev 2023-05-24 17:17:58 +08:00
70b1a91b16 调整店铺云商品下单 2023-05-24 17:17:21 +08:00
fb50a7accd 云仓商品添加关键字检索 2023-05-24 16:40:09 +08:00
caee99f429 店铺云商品下单记录入口店铺信息 2023-05-24 16:26:43 +08:00
0129bdb573 调整店铺云商品列表查询 2023-05-24 14:10:59 +08:00
f530fe181f Merge branch 'profit_sharing' into dev 2023-05-24 13:47:06 +08:00
9bdc500954 云仓商品按区域+分类检索 2023-05-24 11:58:07 +08:00
0f0883c1a5 调整云仓商品查询 2023-05-23 17:50:45 +08:00
5c84d96276 调整云仓商品列表 2023-05-23 17:18:28 +08:00
0caae6110d 商户添加保证金字段 2023-05-23 15:58:50 +08:00
b5b24dece8 商户添加保证金字段 2023-05-23 15:52:14 +08:00
6b54927d33 调整商品上架事件 2023-05-23 15:51:30 +08:00
ea733f9fb8 调整云仓商品关联 2023-05-23 15:09:52 +08:00
913291f95f 调整云仓商品关联 2023-05-23 14:59:47 +08:00
342a5b74f7 调整押金自动扣除 2023-05-22 13:52:15 +08:00
mkm
9ff9e05d92 Merge pull request '修复问题' (#11) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/11
2023-05-22 11:54:40 +08:00
mkm
bbcf370a2d 修复问题 2023-05-22 11:54:21 +08:00
mkm
d1743743e0 Merge pull request '批量上架redis' (#10) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/10
2023-05-22 11:42:21 +08:00
mkm
c242e5d721 批量上架redis 2023-05-22 11:41:48 +08:00
mkm
b0e7b1644e Merge pull request 'dev' (#9) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/9
2023-05-22 11:32:10 +08:00
mkm
8e1532f17d 修复随机错误 2023-05-22 10:10:03 +08:00
mkm
bbf53a6a1f 修改redis数据 2023-05-22 09:54:06 +08:00
mkm
5be0c7ce07 导入商品的详情 2023-05-20 18:22:04 +08:00
mkm
f4b8f07160 导入商品的详情 2023-05-20 16:29:11 +08:00
be53659118 资金流水添加保证金类型 2023-05-20 14:57:21 +08:00
705c1ac418 暂时注释订单支付成功事件 2023-05-20 14:46:19 +08:00
b25a86d056 添加自动扣除保证金 2023-05-20 14:26:26 +08:00
mkm
52690a7a82 修复错误 2023-05-19 21:35:30 +08:00
mkm
a5ec83b8f6 商品导入 2023-05-19 21:12:34 +08:00
mkm
d76b3fa9d6 Merge pull request 'dev' (#8) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/8
2023-05-19 18:40:03 +08:00
3e1d4ace81 Merge branch 'dev' of http://git.excellentkk.cn/mkm/shop-php into dev 2023-05-19 18:23:07 +08:00
63bee8d493 添加绑定小程序账号 2023-05-19 18:22:32 +08:00
mkm
a54235695b 导入商品的详情 2023-05-19 17:29:35 +08:00
b3a4245781 处理云仓商品查询的错误 2023-05-19 14:45:49 +08:00
mkm
6bcf53cf25 Merge pull request 'dev' (#7) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/7
2023-05-19 12:50:16 +08:00
c83ccd331b 商户列表添加街道查询 2023-05-19 09:43:32 +08:00
e455df9617 Merge branch 'dev' of http://git.excellentkk.cn/mkm/shop-php into dev 2023-05-19 09:41:43 +08:00
beb9d7eb77 商户列表添加街道查询 2023-05-19 09:41:36 +08:00
mkm
7c9e089b70 更新 2023-05-18 23:09:03 +08:00
mkm
b0c7b6bd2f Merge pull request 'dev' (#6) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/6
2023-05-18 16:49:32 +08:00
mkm
64ec4950ae Merge remote-tracking branch 'shop/dev' into dev 2023-05-18 16:48:22 +08:00
mkm
72a258ce5b 带上category_id
修改spec_type==0 更新bar_code
2023-05-18 16:48:06 +08:00
mkm
a2974e477d Merge pull request 'dev' (#5) from dev into master
Reviewed-on: http://git.excellentkk.cn/mkm/shop-php/pulls/5
2023-05-18 14:26:49 +08:00
c17fbca1b3 Merge branch 'dev' of http://git.excellentkk.cn/mkm/shop-php into dev 2023-05-18 14:24:40 +08:00
4116d48afb 修改商品创建的错误 2023-05-18 14:22:10 +08:00