Commit Graph

331 Commits (91b21f344d36e3b0c1e0519f660a04236889e879)

Author SHA1 Message Date
perry 21a020f430 微信支付 2023-05-19 10:24:44 +08:00
perry 46563efd16 微信支付 2023-05-18 19:28:02 +08:00
perry 18909d4c2c 微信支付 2023-05-18 18:49:43 +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
tangqian 630e1d454e feat: 商城退款 2023-05-17 18:13:35 +08:00
tangqian dea7cb0b77 feat: 会员充值,退款,会员展示,充值列表 2023-05-17 17:51:27 +08:00
perry 68227bf677 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-17 14:18:33 +08:00
perry 9fbee20579 推广员 2023-05-17 14:17:20 +08:00
tangqian 05e0c40659 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-17 10:54:06 +08:00
tangqian 34c0db7cf1 feat: 会员充值,退款,会员展示,充值列表 2023-05-17 10:53:59 +08:00
luli 3efa1384c8 feat: 订单导出 2023-05-17 10:36:46 +08:00
小小张 201f44a588 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-16 18:47:34 +08:00
小小张 80e679a751 后台--调试物流、规格 2023-05-16 18:46:19 +08:00
tangqian adcb6d26f2 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
2023-05-16 18:19:55 +08:00
tangqian 26a8631927 feat: 会员充值,退款 2023-05-16 18:19:33 +08:00
perry 72645b9dfc 商户管理 2023-05-16 18:17:54 +08:00
小小张 a4246b55b9 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-16 09:24:02 +08:00
perry ca7f62f924 支付 2023-05-15 23:40:57 +08:00
perry 39e87b3701 充值记录 2023-05-15 18:28:49 +08:00
perry e6387b5411 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-15 14:54:21 +08:00
perry 7a6b3ab7a2 充值记录 2023-05-15 14:54:10 +08:00
js199000131 60102c7bc7 用户收件地址字段名称修改 2023-05-15 10:26:17 +08:00
小小张 481473c310 App订单、商品实体类--修改 2023-05-15 10:15:43 +08:00
js199000131 982bdcd9ad 物流、商品和支付修改 2023-05-15 10:05:36 +08:00
perry 4e350e2767 商品管理 2023-05-15 09:56:07 +08:00
perry f538a15636 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-14 17:37:04 +08:00
perry b7e1341962 商品管理 2023-05-14 17:36:50 +08:00
js199000131 d624879f22 商品和支付 2023-05-14 15:44:42 +08:00
perry 3f213a4ae6 商品管理 2023-05-14 13:33:10 +08:00
perry dece26fce7 商品管理 2023-05-12 19:04:02 +08:00
小小张 b502c67b65 App订单、商品--修改 2023-05-12 18:09:39 +08:00
小小张 7b87b5ae21 App订单、商品--拷贝 2023-05-12 18:07:55 +08:00
小小张 5254574914 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-12 10:20:18 +08:00
小小张 29e43885c5 订单管理--修改 2023-05-12 10:19:46 +08:00
perry 1622984df7 商品管理 2023-05-11 22:33:51 +08:00
小小张 693839a486 订单管理 2023-05-11 18:06:00 +08:00
js199000131 799c4604b1 物流管理修改 2023-05-11 16:21:08 +08:00
小小张 5342d330ef 物流管理 2023-05-11 10:09:11 +08:00
小小张 e68ce59af7 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/express/ShippingTemplatesRegionDO.java
2023-05-11 10:08:36 +08:00
小小张 22525c4eb0 物流管理--实体类继承修改 2023-05-11 09:58:19 +08:00
perry b175639c15 商品管理 2023-05-10 23:38:51 +08:00
perry 3e6f21dadd 商品管理 2023-05-10 22:49:41 +08:00
js199000131 53f9f8087e 物流管理修改 2023-05-10 17:52:53 +08:00