Commit Graph

370 Commits (3c94af6408214317177d6241df3cf567b91409a4)

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