caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,600 Commits 1 Branch 0 Tags
Commit Graph

1600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chc
eea47aea55 导出 2022-09-02 09:52:11 +08:00
chc
2648a0b57e 店员，商品导入，sql 2022-09-01 18:53:12 +08:00
chc
b873ec2095 电子面单接口完善,商家导入商品功能 2022-08-31 17:37:07 +08:00
fengtianyangyang
05f29a264e 启动报错 2022-08-09 20:26:40 +08:00
fengtianyangyang
26dd8ed13a Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into fengtianyangyang_clerk 
 Conflicts:
	DB/version4.2.3toMASTER.sql
	common-api/src/main/java/cn/lili/controller/common/SiteController.java
	common-api/src/main/java/cn/lili/controller/common/UploadController.java
	config/application.yml
	framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
	framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
	framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
 2022-08-09 18:54:19 +08:00
Chopper
72c58059bd 优惠券活动创建限制 2022-08-09 16:08:54 +08:00
Chopper
c38a8c0475 地址重复存在的问题处理 2022-08-08 09:14:15 +08:00
Chopper
98b863be6f 后台操作店铺验证存在问题处理 2022-08-05 17:14:20 +08:00
Chopper
ecd40523d4 演示站点限制修改密码 2022-08-04 11:17:14 +08:00
OceansDeep
7f6de6e64e
!218 修复商品索引生成报错问题 
Merge pull request !218 from OceansDeep/feature/pg
 2022-08-02 07:22:56 +00:00
paulGao
002163fbdc 修复商品索引生成报错问题 2022-08-02 15:21:00 +08:00
paulGao
da9ea504fb Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-08-02 15:15:43 +08:00
Chopper
bb171f6e23 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 
# Conflicts:
#	framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java
 2022-08-02 10:57:31 +08:00
Chopper
b860c2eed0 优化结构 2022-08-02 10:52:47 +08:00
Chopper
fdf81d1b39 分词问题优化 2022-08-02 10:51:10 +08:00
paulGao
40bf6d3010 优化获取秒杀活动 2022-07-27 22:13:56 +08:00
OceansDeep
2d63d36f51
!217 优化促销验证商品，检查商品是否可以参与促销 
Merge pull request !217 from OceansDeep/feature/pg
 2022-07-27 09:22:37 +00:00
paulGao
ed976e90dc 优化促销验证商品，检查商品是否可以参与促销 2022-07-27 17:21:48 +08:00
OceansDeep
6f4994b5da
!216 add transactional 
Merge pull request !216 from OceansDeep/feature/pg
 2022-07-27 04:07:29 +00:00
paulGao
a2a923809e add transactional 2022-07-27 12:06:47 +08:00
OceansDeep
8d06ccace9
!215 修复小程序注册用户没有发送会员注册信息问题 
Merge pull request !215 from OceansDeep/feature/pg
 2022-07-26 11:30:20 +00:00
paulGao
99479e722a 修复小程序注册用户没有发送会员注册信息问题 2022-07-26 19:18:01 +08:00
OceansDeep
70890cdc19
!214 修复积分商品购买时，价格问题 
Merge pull request !214 from OceansDeep/feature/pg
 2022-07-25 13:00:47 +00:00
paulGao
0eebc544a6 修复积分商品购买时，价格问题 2022-07-25 20:52:03 +08:00
OceansDeep
12280e5769
!213 优化代码，修复自动生成的es分词无效问题 
Merge pull request !213 from OceansDeep/feature/pg
 2022-07-21 03:53:36 +00:00
paulGao
4ec2c1b943 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-07-21 11:52:17 +08:00
paulGao
d6edb93403 优化代码，修复自动生成的es分词无效问题 2022-07-21 11:52:12 +08:00
Chopper
3236a05ae9 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-07-19 18:45:42 +08:00
Chopper
5576ae7305 解决 lilishop4.2.4中存在序列化购物车，促销信息会在序列化后丢失，无法反序列化。 2022-07-19 18:45:08 +08:00
Chopper
d5aadf6926 店铺入驻分批保存可能存在无法入住问题解决 2022-07-19 18:38:38 +08:00
paulGao
2eb469b228 improve code 2022-07-19 15:24:39 +08:00
Chopper
088c6faae1 店铺保存问题处理，解决可能存在多次入驻店铺无法申请失败问题 2022-07-19 15:15:59 +08:00
OceansDeep
04f7d22e3f
!212 优化商品索引的促销信息生成。优化批量生成分词 
Merge pull request !212 from OceansDeep/feature/pg
 2022-07-18 11:12:12 +00:00
paulGao
950274f6be 优化商品索引的促销信息生成。优化批量生成分词 2022-07-18 19:06:17 +08:00
OceansDeep
c6596fff1a
!211 更新部分es日志 
Merge pull request !211 from OceansDeep/feature/pg
 2022-07-18 04:11:55 +00:00
paulGao
7cbbc57514 更新部分es日志 2022-07-18 12:11:16 +08:00
fengtianyangyang
8041a4a4fc 店铺退款流水金额计算错误 2022-07-15 14:27:10 +08:00
OceansDeep
1fa247aa35
!210 优化保存楼层装修。优化管理端优惠券搜索 
Merge pull request !210 from OceansDeep/feature/pg
 2022-07-13 13:05:15 +00:00
paulGao
7de49dcfb8 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-07-13 20:03:12 +08:00
paulGao
b21e307640 优化保存楼层装修。优化管理端优惠券搜索 2022-07-13 20:03:05 +08:00
Chopper
aae7eedd49 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-07-13 19:06:06 +08:00
Chopper
bce60310c5 minio增加字段，可配置前端访问地址。endpoint可以继续走局域网ip 2022-07-13 19:05:59 +08:00
OceansDeep
d17cb4ce96
!209 修复批发商品订单下单时，订单单项价格错误问题 
Merge pull request !209 from OceansDeep/feature/pg
 2022-07-12 09:16:09 +00:00
paulGao
4b25a03b1d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-07-12 17:13:35 +08:00
paulGao
682433efe4 修复批发商品订单下单时，订单单项价格错误问题 2022-07-12 17:13:17 +08:00
Chopper
a6f28d67eb 代码格式化一下 2022-07-12 10:17:34 +08:00
Chopper
c663aa2799 minio上传失败前端无感知问题处理 2022-07-11 18:53:07 +08:00
Chopper
2c02b816b5 一个分销时间展示以及一个字段没有正确的存储值问题处理 2022-07-11 18:52:31 +08:00
Chopper711
d14b87729a
!208 解决短信发送失败 时，前端无感知问题。from zypy333/N/A 
Merge pull request !208 from zypy333/N/A
 2022-07-11 03:51:16 +00:00
fengtianyangyang
70b41ab8a8 sql修改 2022-07-08 15:17:59 +08:00