Commit Graph

405 Commits (f07e115e5d415c71bccd564d4f28f1abc37cbc67)

Author SHA1 Message Date
perry ed48e31645 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-26 15:01:56 +08:00
perry 74a33ecb85 配置文件修改 2023-05-26 15:01:46 +08:00
tangqian 43dc44f495 fix: 商城支付微信返回jsapi 2023-05-26 14:39:02 +08:00
tangqian be59002235 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-26 14:37:57 +08:00
tangqian 76c248f865 fix: 商城支付微信返回jsapi 2023-05-26 14:37:52 +08:00
js199000131 c1f6ac1c2c 商品自定义权限 2023-05-26 14:26:15 +08:00
小小张 3303efa85e 后台--运费模板:配送区域修改 2023-05-26 12:00:26 +08:00
tangqian 38b5bfde5d fix: 充值相关 2023-05-26 09:24:36 +08:00
tangqian ec433d0134 Merge branch 'master' into feature/mall_product 2023-05-26 09:24:16 +08:00
tangqian c3a72e4245 fix: 充值相关 2023-05-25 18:46:56 +08:00
小小张 872ce8baf0 后台--运费模板:配送区域修改 2023-05-25 18:21:08 +08:00
小小张 03e595c92b 后台--运费模板:配送区域修改 2023-05-25 18:17:16 +08:00
小小张 39d922eb1b Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-25 18:08:24 +08:00
小小张 dc4c7504a7 后台--运费模板:配送区域修改 2023-05-25 18:08:07 +08:00
tangqian 65a76c4efd fix: 充值相关 2023-05-25 18:05:56 +08:00
tangqian f1ac990de7 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-25 17:44:42 +08:00
tangqian 88c8c3e459 fix: 充值相关 2023-05-25 17:44:35 +08:00
小小张 51581f66a6 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-25 16:49:44 +08:00
小小张 8873be7def 后台--运费模板:配送区域修改 2023-05-25 16:49:27 +08:00
tangqian 877fe3d3aa fix: 充值相关 2023-05-25 15:55:27 +08:00
tangqian f1755820b6 fix: 充值相关 2023-05-25 15:30:21 +08:00
tangqian 270e45433e fix: 充值相关 2023-05-25 14:48:29 +08:00
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