Commit Graph

285 Commits

Author SHA1 Message Date
wuchunlei
d8acf99237 删除优惠卷
新版优惠卷
2024-09-25 16:00:51 +08:00
wuchunlei
c542f06f4a 用户开课管理 2024-09-20 16:20:56 +08:00
wuchunlei
66fcf9a34d 花生币换成天医币 2024-08-30 13:08:41 +08:00
wuchunlei
8ac3fc29f4 Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc 2024-08-26 13:55:10 +08:00
wangjinlei
3e6cbb2a35 vod普通加密 2024-08-05 09:31:20 +08:00
wuchunlei
01d4b80b56 验证码改为6位数 2024-07-24 09:53:05 +08:00
wangjinlei
4f02f747fe bug 2024-06-24 15:21:10 +08:00
wangjinlei
d080631a7c bug 2024-06-24 15:06:35 +08:00
wangjinlei
7e6274b9da bug 2024-06-24 14:24:47 +08:00
wangjinlei
2a115db799 微信支付 2024-06-19 15:27:16 +08:00
wangjinlei
b6bf65ec76 bug 2024-06-13 13:21:13 +08:00
wangjinlei
02f4c63062 bug 2024-05-31 13:37:11 +08:00
wangjinlei
bda5846153 bug 2024-05-28 17:46:39 +08:00
wangjinlei
6e3cc44319 bug 2024-05-24 15:12:08 +08:00
wangjinlei
1d09fbb0b3 bug 2024-05-24 13:16:33 +08:00
wangjinlei
3992f13fdf bug 2024-05-23 16:52:25 +08:00
wangjinlei
689d241310 bug 2024-05-22 14:10:28 +08:00
wangjinlei
8cfb645798 bug 2024-05-21 16:54:36 +08:00
wangjinlei
46f3c49197 bug 2024-05-21 14:56:30 +08:00
wangjinlei
009f0ea12c bug 2024-05-21 10:34:39 +08:00
wuchunlei
e616be7687 获取标签下得商品书列表 2024-05-16 13:21:37 +08:00
wangjinlei
81e2df077d jf
消费
2024-05-13 14:41:50 +08:00
wangjinlei
6bdc4ebd5a jf
消费
2024-05-13 14:22:29 +08:00
wangjinlei
328f90926f jf
消费
2024-05-13 13:24:11 +08:00
wuchunlei
8282c37f53 不同app用不同的appid支付 2024-05-11 13:09:27 +08:00
wangjinlei
871fc79cca bug 2024-04-30 09:17:58 +08:00
wangjinlei
97e9aecd68 买课的订单状态归转 2024-04-28 17:55:46 +08:00
wangjinlei
57c2633990 bug 2024-04-28 11:20:56 +08:00
wangjinlei
dbe836f884 bug 2024-04-28 10:25:31 +08:00
wangjinlei
ba2fa6baf3 修复一下bug 2024-04-23 16:36:04 +08:00
wangjinlei
3cbd29de4b 修复一下bug 2024-04-22 16:10:17 +08:00
wangjinlei
d6123a8132 修复一下bug 2024-04-22 14:33:39 +08:00
wuchunlei
b507ff6683 绑定邮箱-添加已绑定判断 2024-04-11 16:32:37 +08:00
wuchunlei
b705aec11d 主页-我的课程 2024-04-11 09:05:34 +08:00
wuchunlei
322eb45392 发货添加错误时返回原因 2024-03-29 13:10:59 +08:00
wuchunlei
5104976112 修改商品标签 2024-03-28 11:03:24 +08:00
wuchunlei
e92dfa8b13 通用模块-商品评价 2024-03-28 10:29:29 +08:00
wuchunlei
1b1cee0e90 通用模块-商品评价 2024-03-27 17:04:16 +08:00
wuchunlei
21a8309563 通用文件新项目 2024-03-25 17:46:34 +08:00
wuchunlei
92a582bee0 通用模块修改 2024-03-25 11:27:37 +08:00
wuchunlei
ed1a95aac0 添加common下用户注册登录 2024-03-25 10:54:35 +08:00
wuchunlei
80a13f95ce 图书商品标签修改 2024-03-22 16:55:08 +08:00
wuchunlei
0bb2579337 图书标签修改-加判断条件 2024-03-22 14:26:14 +08:00
wuchunlei
e53b954769 修改图书标签方法 2024-03-21 18:05:22 +08:00
wangjinlei
229fd2513b 1 2024-03-21 09:45:39 +08:00
wangjinlei
eb1a5c5f9b Merge remote-tracking branch 'origin/master' into wumedical/v1
# Conflicts:
#	src/main/java/com/peanut/modules/common/dao/ShopProductBookLabelDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductBookMarketDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductToBookLabelDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopProductToBookMarketDao.java
#	src/main/java/com/peanut/modules/common/dao/ShopStoreDao.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductBookLabel.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductBookMarket.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductToBookLabel.java
#	src/main/java/com/peanut/modules/common/entity/ShopProductToBookMarket.java
#	src/main/java/com/peanut/modules/common/entity/ShopStore.java
2024-03-21 09:25:48 +08:00
wuchunlei
b68d7201d6 图书和营销标签、小店 2024-03-21 09:22:27 +08:00
wangjinlei
66b9cb6a0b Merge remote-tracking branch 'origin/master' into wumedical/v1
# Conflicts:
#	src/main/java/com/peanut/modules/common/dao/ChineseMedicineResearchDao.java
#	src/main/java/com/peanut/modules/common/dao/GeneralArticleDao.java
#	src/main/java/com/peanut/modules/common/entity/ChineseMedicineResearch.java
#	src/main/java/com/peanut/modules/common/entity/GeneralArticle.java
2024-03-15 14:27:22 +08:00
wangjinlei
3cef570c97 1 2024-03-15 10:19:03 +08:00
wuchunlei
63fdd2759e 统一吴门医述里图文文章 2024-03-14 15:38:27 +08:00