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

• 8fbc7b9f5c Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-06-23 09:11:37 +08:00
• 3c2e73b5f5 调整es日志级别 Chopper 2022-06-23 09:11:33 +08:00
• 1a221eefe3 优化商品索引，如数据库中无当前商品则删除商品索引 paulGao 2022-06-22 18:42:04 +08:00
• 5912428c00 !199 优化监听事务提交发送mq事件，为订单变更发送mq增加事务提交监听 Merge pull request !199 from OceansDeep/feature/pg OceansDeep 2022-06-22 09:46:45 +00:00
• f01236cc96 优化监听事务提交发送mq事件，为订单变更发送mq增加事务提交监听 paulGao 2022-06-22 17:44:40 +08:00
• ad1f5a297e 修复获取会员钱包可能发生的异常 paulGao 2022-06-22 17:32:19 +08:00
• 96697e11fd 优化监听事务提交发送mq事件，为订单变更发送mq增加事务提交监听 paulGao 2022-06-22 17:31:26 +08:00
• 25e8b9b578 !198 修复编辑有参加商品的促销活动的时间时，原参与活动的商品的时间没有更新问题 Merge pull request !198 from OceansDeep/feature/pg OceansDeep 2022-06-22 07:06:39 +00:00
• 49603e29bd 修复编辑有参加商品的促销活动的时间时，原参与活动的商品的时间没有更新问题 paulGao 2022-06-22 15:05:25 +08:00
• 6a18489c15 !197 代码结构优化。默认拼团结束时间修改为24小时 Merge pull request !197 from OceansDeep/feature/pg OceansDeep 2022-06-22 06:53:21 +00:00
• cb52fca2a4 代码结构优化。默认拼团结束时间修改为24小时 paulGao 2022-06-22 14:44:58 +08:00
• 00964e6bbf Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-06-20 15:29:10 +08:00
• ea1b91af2a 日志内容意义不明确优化，补充备注。去除一行无效的代码。 Chopper 2022-06-20 12:01:32 +08:00
• 8894e5482f minio删除文件错误bug修复 Chopper 2022-06-20 11:06:20 +08:00
• e17e3474ca 优化商品索引搜索 paulGao 2022-06-17 19:08:08 +08:00
• 6d09bd4987 优化商品索引搜索 paulGao 2022-06-17 15:40:52 +08:00
• 84f3907140 !194 修复生成索引时no such index问题 Merge pull request !194 from OceansDeep/feature/pg OceansDeep 2022-06-17 03:21:07 +00:00
• d704e2eb55 修复生成索引时no such index问题 paulGao 2022-06-17 11:20:22 +08:00
• 2e4c6f4284 !193 增加批发商品不能参加促销活动的限制 修复批发商品购买数量限制 Merge pull request !193 from OceansDeep/feature/pg OceansDeep 2022-06-16 08:47:21 +00:00
• 61c77e0047 修复批发商品购买数量限制 paulGao 2022-06-16 16:46:09 +08:00
• cf1e6fc283 增加批发商品不能参加促销活动的限制 paulGao 2022-06-16 16:40:28 +08:00
• b361e46fb7 !192 优化代码，修复bug Merge pull request !192 from OceansDeep/feature/pg OceansDeep 2022-06-16 02:22:47 +00:00
• 7bb06e7fdc 优化代码，修复bug paulGao 2022-06-16 10:21:41 +08:00
• 9f83b40be4 错误提交 caihongcheng 2022-06-15 18:21:06 +08:00
• 1edd3441bc 电子面单 caihongcheng 2022-06-15 18:09:55 +08:00
• 079a4a2cf6 !191 优化编辑店铺信息后，清除缓存 Merge pull request !191 from OceansDeep/feature/pg OceansDeep 2022-06-14 07:38:31 +00:00
• 049a759cda 优化编辑店铺信息后，清除缓存 paulGao 2022-06-14 15:36:29 +08:00
• a6ff38159f !190 优化索引生成，商品索引查询 Merge pull request !190 from OceansDeep/feature/pg OceansDeep 2022-06-13 10:51:16 +00:00
• 056f040317 优化索引生成，商品索引查询 paulGao 2022-06-13 18:50:09 +08:00
• c161206832 update README.md. chopper711 2022-06-13 06:54:12 +00:00
• e9a0c293f8 update README.md. chopper711 2022-06-13 06:53:48 +00:00
• 24de62f5f4 !189 优化代码结构 Merge pull request !189 from OceansDeep/feature/pg OceansDeep 2022-06-10 10:43:28 +00:00
• b7b278f296 优化代码结构 paulGao 2022-06-10 18:42:56 +08:00
• 712941038b !188 优化初始化商品索引，增加编辑商品时，保留原商品的销量、好评率和评价量 Merge pull request !188 from OceansDeep/feature/pg OceansDeep 2022-06-09 08:46:56 +00:00
• 4316fa8953 优化初始化商品索引，增加编辑商品时，保留原商品的销量、好评率和评价量 paulGao 2022-06-09 16:43:16 +08:00
• d14763d52c 优化代码，增加buyer启动时检测es索引存在，如不存在则自动创建 paulGao 2022-06-09 15:32:24 +08:00
• 79e1f34890 !187 优化代码，修复bug Merge pull request !187 from OceansDeep/feature/pg OceansDeep 2022-06-09 01:19:19 +00:00
• 3cb8e066b3 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-06-09 09:16:18 +08:00
• 5e6a56e193 优化代码，修改一个可能出现的获取商品分类的错误 paulGao 2022-06-09 09:15:57 +08:00
• 478ba2048a 修改商品有效性判定中，根据商品更新时间比较改为商品创建时间比较（因修改了商品更新逻辑，每次都是删除后新增，所以无商品更新时间） paulGao 2022-06-09 09:13:13 +08:00
• 8426294a0f 修复判断会员存在条件参数传递顺序错误问题 paulGao 2022-06-08 16:35:44 +08:00
• 178954c8b2 !186 适配优化的sql，将平台id改为0 Merge pull request !186 from OceansDeep/feature/pg OceansDeep 2022-06-08 08:16:05 +00:00
• 6ce2b65d89 适配优化的sql，将平台id改为0 paulGao 2022-06-08 16:15:14 +08:00
• fb45fee426 提现申请时，预存款金额为0无法审核通过错误 fengtianyangyang 2022-06-07 18:41:31 +08:00
• ffca49f469 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-06-07 18:30:24 +08:00
• f32c7a7253 运费计算模式调整 同一运费模版的商品，采用累加计算，起送费/虚件（重）费用。 Chopper 2022-06-07 18:30:21 +08:00
• a64ccdba78 !185 修复一个可能出现的获取促销信息的bug Merge pull request !185 from OceansDeep/feature/pg OceansDeep 2022-06-07 07:24:58 +00:00
• 5f6bae6fa9 修复一个可能出现的获取促销信息的bug paulGao 2022-06-07 15:18:07 +08:00
• fd503b4071 !184 过滤无效促销信息异常增加日志 Merge pull request !184 from OceansDeep/feature/pg OceansDeep 2022-06-07 07:07:54 +00:00
• 9ece357e39 过滤无效促销信息异常增加日志 paulGao 2022-06-07 15:07:14 +08:00
• d53c8362a2 !183 修复一个可能出现的获取促销信息的bug Merge pull request !183 from OceansDeep/feature/pg OceansDeep 2022-06-07 04:31:08 +00:00
• 8f3ca8c28d 修复一个可能出现的获取促销信息的bug paulGao 2022-06-07 12:30:29 +08:00
• 7f5675ae3c !182 修复一个可能出现的获取促销信息的bug Merge pull request !182 from OceansDeep/feature/pg OceansDeep 2022-06-07 04:16:37 +00:00
• 7b9f4be98c 修复一个可能出现的获取促销信息的bug paulGao 2022-06-07 12:16:08 +08:00
• ca352ca341 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-06-07 09:37:25 +08:00
• a22ccbdda5 兼容MINIO Chopper 2022-06-07 09:35:58 +08:00
• e6b50248de !181 修复券活动获取的优惠券某些情况不能使用问题 Merge pull request !181 from OceansDeep/feature/pg OceansDeep 2022-06-06 07:26:12 +00:00
• ee3f8a9261 修复券活动获取的优惠券某些情况不能使用问题 paulGao 2022-06-06 15:24:52 +08:00
• 922d7222cd !180 修复一个可能发生的获取订单信息时发生的错误 Merge pull request !180 from OceansDeep/feature/pg OceansDeep 2022-06-06 02:13:39 +00:00
• 4a8900105b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-06-06 10:12:17 +08:00
• 65a4bb7778 修复一个可能发生的获取订单信息时发生的错误 paulGao 2022-06-06 10:12:09 +08:00
• 3944551c06 !179 修复取消订单商品时库存更新问题 Merge pull request !179 from OceansDeep/feature/pg OceansDeep 2022-06-02 09:13:07 +00:00
• 66d7ffbb17 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-06-02 16:58:42 +08:00
• c4d879a0ad 修复取消订单商品时库存更新问题 paulGao 2022-06-02 16:50:26 +08:00
• b97f77c740 !176 智能商品推荐 Merge pull request !176 from viper/Intelligent_recommendation OceansDeep 2022-06-02 07:17:40 +00:00
• 27ad9b0599 !177 增加结算时当前商品促销最新状态的查询 Merge pull request !177 from OceansDeep/feature/pg OceansDeep 2022-06-02 02:32:37 +00:00
• 234b8ab31c 增加结算时当前商品促销最新状态的查询（修复手动删除或下架促销活动时，购物车商品还是促销价格问题） paulGao 2022-06-02 10:31:24 +08:00
• 519a608316 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-06-02 09:16:46 +08:00
• d4a13c8a82 店铺商品数量，店铺缓存数据2小时。优化 Chopper 2022-06-02 09:16:30 +08:00
• ccb57411a2 refactor:优化代码 xiaochangbai 2022-06-01 21:27:51 +08:00
• 486bebe6d2 feat:智能商品推荐 xiaochangbai 2022-06-01 18:03:30 +08:00
• 5b3129bf01 !174 优化商品信息变更时，删除商品缓存流程 Merge pull request !174 from OceansDeep/feature/pg OceansDeep 2022-06-01 07:24:22 +00:00
• 23c742c4c6 优化商品信息变更时，删除商品缓存流程 paulGao 2022-06-01 15:23:21 +08:00
• 90d3bbd79e !173 修复新增商品时，批发商品规则没有保存问题 Merge pull request !173 from OceansDeep/feature/pg OceansDeep 2022-05-31 09:27:36 +00:00
• 400a06d2ac 修复新增商品时，批发商品规则没有保存问题 paulGao 2022-05-31 17:23:21 +08:00
• 594d2f620c !172 修复编辑商品时默认读取缓存中的数据 Merge pull request !172 from OceansDeep/feature/pg OceansDeep 2022-05-31 09:01:34 +00:00
• 1a6ec578de 修复编辑商品时默认读取缓存中的数据 paulGao 2022-05-31 17:01:01 +08:00
• e009604595 !171 修复无法新建批发商品 Merge pull request !171 from OceansDeep/feature/pg OceansDeep 2022-05-31 08:34:24 +00:00
• 8b23c623d1 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-05-31 16:34:01 +08:00
• a3c4e72902 修复无法新建批发商品 paulGao 2022-05-31 16:33:10 +08:00
• 7e54412fc3 !167 修复直播延迟消息状态错误 Merge pull request !167 from viper/fix_broadcast-status-msg chopper711 2022-05-31 08:09:02 +00:00
• 564970a324 !170 分类编辑时,清除缓存;优化代码 Merge pull request !170 from OceansDeep/feature/pg OceansDeep 2022-05-31 06:38:52 +00:00
• 1ecd32027e 分类编辑时,清除缓存;优化代码 paulGao 2022-05-31 14:37:18 +08:00
• ceb5727337 !169 修复新增编辑商品无商品图片问题 Merge pull request !169 from OceansDeep/feature/pg OceansDeep 2022-05-30 02:42:56 +00:00
• 17c7552f7f 增加商品批发销售模式的处理。优化生成商品sku的结构。 paulGao 2022-05-30 10:39:12 +08:00
• 8fbcad8856 !168 增加商品批发销售模式的处理。优化生成商品sku的结构。 Merge pull request !168 from OceansDeep/feature/pg OceansDeep 2022-05-27 10:28:46 +00:00
• a61fd454b4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-05-27 16:32:56 +08:00
• c0337afbaa 优化代码。升级hutool和lombok依赖 paulGao 2022-05-27 16:32:39 +08:00
• acb9e78a36 增加商品批发销售模式的处理。优化生成商品sku的结构。 paulGao 2022-05-27 16:32:00 +08:00
• 431ff04644 fix: 修复直播延迟消息状态错误 xiaochangbai 2022-05-26 16:24:39 +08:00
• 201fb0a136 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-25 17:41:36 +08:00
• 90671729ea 上一周期数据问题处理 Chopper 2022-05-25 17:41:31 +08:00
• 8596175f8e !166 修复商品编辑规格时，删除规格后。es中没有删除问题。 Merge pull request !166 from OceansDeep/feature/pg OceansDeep 2022-05-25 03:25:34 +00:00
• e9fdec6bb0 修复商品编辑规格时，删除规格后。es中没有删除问题。 paulGao 2022-05-25 11:22:53 +08:00
• 026b6aca07 !165 优化更新商品sku的方式 Merge pull request !165 from OceansDeep/feature/pg OceansDeep 2022-05-19 09:41:30 +00:00
• fafe3c0c55 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-05-19 17:35:23 +08:00
• f2b327c811 添加一种更新商品sku的方式。mysql replace into(先查找，如存在则删除，新增。如不存在新增) paulGao 2022-05-19 17:34:55 +08:00
• 7fccbc2aa2 根据类型查看文章接口缺失 caihongcheng 2022-05-19 15:23:44 +08:00
• 7c40f5988b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-18 22:38:18 +08:00
• b19e4043cd 字符串长度处理 Chopper 2022-05-18 22:38:13 +08:00