Commit Graph

383 Commits (fb3196dcca8ccf00e8fc310317c0c34d623349d8)

Author SHA1 Message Date
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