Commit Graph

Select branches

Hide Pull Requests

b2c

dev

master

pg

#1

#1

#10

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#12

#12

#120

#120

#121

#121

#122

#122

#123

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#129

#129

#13

#13

#130

#130

#131

#131

#132

#132

#133

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#138

#139

#139

#14

#14

#140

#140

#141

#141

#142

#142

#143

#143

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#149

#15

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#158

#158

#159

#159

#16

#16

#160

#160

#161

#161

#162

#162

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#168

#168

#169

#169

#17

#17

#170

#170

#171

#171

#172

#172

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#18

#18

#180

#180

#181

#181

#182

#182

#183

#183

#184

#184

#185

#185

#186

#186

#187

#187

#188

#188

#189

#189

#19

#19

#190

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#2

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#204

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#21

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#214

#215

#215

#216

#216

#217

#217

#218

#218

#219

#219

#22

#22

#220

#221

#221

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#227

#227

#228

#228

#229

#229

#23

#23

#230

#230

#231

#231

#232

#232

#233

#233

#234

#234

#235

#235

#236

#236

#237

#237

#238

#238

#239

#239

#24

#24

#240

#240

#241

#241

#242

#242

#243

#243

#244

#244

#245

#245

#246

#246

#247

#247

#248

#248

#249

#249

#25

#25

#250

#250

#251

#251

#252

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#258

#259

#259

#26

#26

#260

#260

#261

#261

#262

#262

#263

#263

#264

#264

#265

#265

#266

#266

#267

#267

#268

#268

#269

#269

#27

#27

#270

#270

#271

#271

#272

#272

#273

#273

#274

#274

#275

#275

#276

#276

#277

#277

#278

#278

#279

#279

#28

#28

#280

#280

#281

#281

#282

#282

#283

#283

#284

#284

#285

#285

#286

#286

#287

#287

#288

#288

#289

#289

#29

#29

#290

#290

#291

#291

#292

#292

#293

#293

#294

#294

#295

#295

#296

#296

#297

#297

#298

#298

#299

#299

#3

#3

#30

#30

#300

#300

#301

#301

#302

#302

#303

#304

#304

#305

#305

#306

#306

#307

#307

#308

#308

#309

#309

#31

#31

#310

#310

#311

#311

#312

#312

#313

#313

#314

#314

#315

#315

#316

#316

#317

#317

#318

#318

#319

#319

#32

#320

#320

#321

#322

#322

#323

#323

#324

#324

#325

#325

#326

#326

#327

#327

#328

#328

#329

#329

#33

#33

#330

#330

#331

#331

#332

#332

#333

#333

#334

#334

#335

#335

#336

#336

#337

#337

#338

#338

#339

#339

#34

#34

#340

#340

#341

#341

#342

#342

#343

#343

#344

#344

#345

#345

#346

#346

#347

#347

#348

#348

#349

#349

#35

#35

#350

#350

#351

#351

#352

#352

#353

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#359

#359

#36

#36

#360

#360

#361

#361

#362

#362

#363

#363

#364

#364

#365

#365

#366

#366

#367

#367

#368

#368

#37

#37

#38

#38

#39

#39

#4

#4

#40

#40

#41

#41

#42

#42

#43

#43

#44

#44

#45

#45

#46

#46

#47

#47

#48

#48

#49

#49

#5

#5

#50

#50

#51

#51

#52

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#75

#75

#76

#76

#77

#77

#78

#78

#79

#79

#8

#8

#80

#80

#81

#81

#82

#82

#83

#83

#84

#84

#85

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#98

#99

#99

v4.1

v4.2

v4.2.0

v4.2.1

v4.2.2

v4.2.3

v4.2.4

v4.2.5

v4.3

v4.4

Mono Color

• db75aa1cab !159 优化修改sku时，如存在sku则不新增 Merge pull request !159 from OceansDeep/feature/pg OceansDeep 2022-05-18 14:02:16 +00:00
• f5718b4062 优化修改sku时，如存在sku则不新增 paulGao 2022-05-18 22:00:42 +08:00
• d25f17782b 规范长度限制 Chopper 2022-05-18 21:35:17 +08:00
• e3626a094d 支付参数长度进行限制 Chopper 2022-05-18 16:48:03 +08:00
• fc7b17fe40 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-18 15:15:31 +08:00
• 87e13b3677 支付问题处理 Chopper 2022-05-18 15:15:22 +08:00
• a540e42460 siteController caihongcheng 2022-05-18 14:35:34 +08:00
• c4e24fb0a3 !158 优化生成商品索引，分批生成 Merge pull request !158 from OceansDeep/feature/pg OceansDeep 2022-05-13 10:19:42 +00:00
• 31fb55635e 优化生成商品索引，分批生成 paulGao 2022-05-13 18:18:46 +08:00
• 3dcff0b682 在线人数流量展示少一个小时问题处理 Chopper 2022-05-13 17:42:36 +08:00
• 81f48d9c92 对上一周期的参数赋值做处理 Chopper 2022-05-13 11:45:30 +08:00
• 6331b0d587 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-13 11:19:11 +08:00
• 57cf3b94e0 足迹分页相关问题处理 Chopper 2022-05-13 11:19:02 +08:00
• b683eac996 !157 优化修改sku时，如存在sku则不新增 Merge pull request !157 from OceansDeep/feature/pg OceansDeep 2022-05-13 03:09:18 +00:00
• ccdcb1d0f6 优化修改sku时，如存在sku则不新增 paulGao 2022-05-13 11:03:26 +08:00
• 4f5f02f030 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-13 09:19:24 +08:00
• 0629ce51af 默认值给予0 Chopper 2022-05-13 09:19:21 +08:00
• 46f1fcc269 优化修改sku时，如存在sku则不新增 paulGao 2022-05-13 09:01:06 +08:00
• b49b0290f8 还原多合并代码 fengtianyangyang 2022-05-12 15:30:53 +08:00
• 7ca351f7cd 结算单-平台优惠券补贴金额错误修改 fengtianyangyang 2022-05-11 19:20:35 +08:00
• 850b124da3 流量统计增加对上一周期的数据填充 Chopper 2022-05-11 17:49:44 +08:00
• 49a2d3cab3 !156 更新阿里云maven地址。更新部分依赖到最新 Merge pull request !156 from OceansDeep/feature/pg OceansDeep 2022-05-10 06:47:19 +00:00
• 038eda1562 更新阿里云maven地址。更新部分依赖到最新 paulGao 2022-05-10 14:38:57 +08:00
• b91c8e34c2 电子面单 caihongcheng 2022-05-09 09:27:30 +08:00
• 0a631a7c93 requestData多了个引号 caihongcheng 2022-05-07 21:24:51 +08:00
• 4705c2595a 追踪物流信息增加手机号后四位参数 caihongcheng 2022-05-06 16:16:34 +08:00
• 0ff6809d63 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-06 15:51:19 +08:00
• a375feabfc 售后流水问题，售后代码被多个地方调用的方式优化，以后只有一个入口 Chopper 2022-05-06 15:51:13 +08:00
• 5b9fd139a3 !155 修复结算时，清空购物车问题 Merge pull request !155 from OceansDeep/feature/pg OceansDeep 2022-05-06 07:51:04 +00:00
• fd92d93289 修复结算时，清空购物车问题 paulGao 2022-05-06 15:50:20 +08:00
• 840637c0d0 优化编辑商品状态时，商品缓存的删除 paulGao 2022-05-05 17:58:13 +08:00
• f41f5386cc !154 修复防重复提交bug Merge pull request !154 from OceansDeep/feature/pg OceansDeep 2022-05-05 04:01:58 +00:00
• f4a7d8ea92 修复防重复提交bug paulGao 2022-05-05 11:57:05 +08:00
• 26c9160c75 !152 优化默认生成的es商品索引结构。解决初次启动时，搜索商品报错 Merge pull request !152 from OceansDeep/feature/pg OceansDeep 2022-04-27 10:17:58 +00:00
• 4c1955da75 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-27 18:15:30 +08:00
• 66e6272571 优化默认生成的es商品索引结构。解决初次启动时，搜索商品报错 paulGao 2022-04-27 18:15:11 +08:00
• e9d5e705ed Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-04-26 14:16:44 +08:00
• 16fdb28141 多修改的代码还原 Chopper 2022-04-26 14:16:39 +08:00
• e289cf29fe !151 优化合并 Merge pull request !151 from OceansDeep/feature/pg OceansDeep 2022-04-26 03:40:22 +00:00
• 1cd74cc26a Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-26 11:37:53 +08:00
• 27112e35b3 优化搜索关键字不能为空格。优化管理端商品上下架时没有清空goods缓存问题 paulGao 2022-04-26 11:37:48 +08:00
• b2a8578f43 增加异常重试机制。（目前作用于es批量更新删除时，有时会出现的内容版本冲突问题） paulGao 2022-04-26 11:36:28 +08:00
• 0e0a8b039d 管理员用户权限不再放在永久缓存，而是放在临时缓存（5分钟），由于访问频率较低，在加上涉及的业务太复杂，所以去除了之前对权限的永久缓存以及模糊删除用户权限缓存相关代码 Chopper 2022-04-26 09:33:54 +08:00
• cbd201c43b 还原配置 Chopper 2022-04-25 18:58:01 +08:00
• a6d734bacf Merge branch 'hotwords' 热词功能，管理端权限存在的问题处理 # Conflicts: # framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java # framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java # manager-api/src/main/java/cn/lili/controller/hotwords/HotWordsManagerController.java Chopper 2022-04-25 18:32:46 +08:00
• 8dc86e0482 热词功能完善 Chopper 2022-04-25 18:08:06 +08:00
• d0226611d7 增加初始化生成索引日志 paulGao 2022-04-25 17:34:24 +08:00
• 2b21c3cd09 !150 优化生成索引mapping日志 Merge pull request !150 from OceansDeep/feature/pg OceansDeep 2022-04-25 09:23:34 +00:00
• b1bdd9b8a5 优化生成索引mapping日志 paulGao 2022-04-25 17:22:52 +08:00
• bb50510ecb 解决管理员权限相关问题 Chopper 2022-04-25 10:31:39 +08:00
• aa185c8bd2 优化consumer生成商品索引。改为批量生成 paulGao 2022-04-25 10:26:51 +08:00
• 99e3b234c9 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop fengtianyangyang 2022-04-22 18:47:10 +08:00
• 5168d8d08d 配置文件还原 fengtianyangyang 2022-04-22 18:45:43 +08:00
• 230a8810ef 积分商品,砍价商品结算单错误问题 fengtianyangyang 2022-04-22 18:44:32 +08:00
• e8e8c1abcc !149 修复结算时，无有效商品，造成空订单问题 Merge pull request !149 from OceansDeep/feature/pg OceansDeep 2022-04-22 08:50:52 +00:00
• 0354d6dc3e 修复结算时，无有效商品，造成空订单问题 paulGao 2022-04-22 16:27:13 +08:00
• 47ad388f7d 售后申请数量错误 fengtianyangyang 2022-04-22 11:10:42 +08:00
• 2d57483805 结算单优惠券退款异常 fengtianyangyang 2022-04-22 11:02:23 +08:00
• 363dbd3a7f !148 修复项目启动时可能会造成es client must not be null的问题 Merge pull request !148 from OceansDeep/feature/pg OceansDeep 2022-04-22 01:13:07 +00:00
• 5b5863c899 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-22 09:12:11 +08:00
• 4c1ae8c3cc 修复一个项目启动时可能会造成es client must not be null的问题 paulGao 2022-04-22 09:11:51 +08:00
• 29ed211519 !147 优化 Merge pull request !147 from OceansDeep/feature/pg OceansDeep 2022-04-21 08:28:26 +00:00
• 9f965c4e56 修复主订单取消后赠品订单不会取消问题。优化热词 paulGao 2022-04-21 16:25:43 +08:00
• 0148868129 分类递归错误的参数传递问题解决 Chopper 2022-04-21 15:49:53 +08:00
• d46863b5b5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-21 15:12:27 +08:00
• 1917aa13d5 店铺结算空指针问题 fengtianyangyang 2022-04-21 10:51:12 +08:00
• 2994131048 当结算周期只有一天时，无法结算问题处理 Chopper 2022-04-21 10:11:21 +08:00
• f0d6938127 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-20 17:54:21 +08:00
• 0203630d6a 增加店铺商品索引操作 paulGao 2022-04-20 09:39:03 +08:00
• 89c5c2dd83 评价数量展示异常问题处理 Chopper 2022-04-19 10:18:25 +08:00
• ce1954e7d3 消费者一个错误处理 Chopper 2022-04-19 09:39:33 +08:00
• 947a82eac5 热词统计，热词功能改版 Chopper 2022-04-19 09:28:26 +08:00
• 9dc01f6057 店铺结算单结算问题 fengtianyangyang 2022-04-18 19:09:05 +08:00
• 37c5ce541b 优化楼层装修 paulGao 2022-04-17 21:46:34 +08:00
• 726eb06714 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-17 21:45:49 +08:00
• df505e0e17 店铺结算单金额问题 fengtianyangyang 2022-04-15 19:05:27 +08:00
• 06fffac835 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-14 09:09:25 +08:00
• 264a423444 remove invalid class paulGao 2022-04-14 09:09:22 +08:00
• 6ae9692358 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-04-13 16:58:23 +08:00
• 7270564b10 由于代码调用顺序错误，导致总是输出一段错误的日志内容。 Chopper 2022-04-13 16:58:19 +08:00
• a485a29868 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-13 14:30:40 +08:00
• ec04c3221f 移除文章类型删除 fengtianyangyang 2022-04-13 12:00:40 +08:00
• 761982474c Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-04-13 11:49:32 +08:00
• d13b0404fb 增加一下短信验证码在info级别的日志打印 Chopper 2022-04-13 11:49:23 +08:00
• 6966376f91 文章增加文章类型修改及文章类型删除 fengtianyangyang 2022-04-13 11:06:51 +08:00
• 2720f5c0bb Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-04-11 14:18:42 +08:00
• 881f039e44 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-11 14:18:39 +08:00
• 81c7a72b9c 解决优惠券在购物车中缓存会出现的一些极端bug Chopper 2022-04-11 14:18:37 +08:00
• c0391e3fc1 微信同步消息时删除模板问题 fengtianyangyang 2022-04-11 11:23:02 +08:00
• 7e542750f6 增加每次获取优惠券信息时，检查优惠券是否过期 paulGao 2022-04-08 16:59:12 +08:00
• 7cbf638822 配置文件修改 fengtianyangyang 2022-04-07 17:37:59 +08:00
• 4cdb461c22 配置文件修改及sql fengtianyangyang 2022-04-07 17:35:22 +08:00
• ba57f19ee7 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/shengxing into clerk fengtianyangyang 2022-04-07 17:13:04 +08:00
• 9ba2693698 店员错误 fengtianyangyang 2022-04-07 17:09:25 +08:00
• 3439b7aee5 !146 修复秒杀活动相同商品参与时，删除其他活动商品信息问题 Merge pull request !146 from OceansDeep/feature/pg OceansDeep 2022-04-07 08:31:23 +00:00
• 63b23fbe76 修复秒杀活动相同商品参与时，删除其他活动商品信息问题 paulGao 2022-04-07 16:06:23 +08:00
• 63fff2398e Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-07 14:32:12 +08:00
• db8796df99 update README.md. chopper711 2022-04-07 04:07:23 +00:00
• 4095481411 会员促销运算时，优惠券会被缓存，可能导致无效数据返回。 Chopper 2022-04-07 10:19:19 +08:00
• 8e30defa0e 优化es商品搜索，全分词匹配改为2分词匹配 paulGao 2022-04-06 10:39:51 +08:00