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

• 644de06172 订单平台佣金bug修复，价格计算相关优化 Chopper 2021-08-02 18:44:05 +08:00
• 083b90a04a 积分商品价格计算在后续已经渲染，所以这个地方代码可以去掉 Chopper 2021-07-30 18:10:23 +08:00
• 3a4d08980f 代码非空处理，这块需要优化，将积分相关逻辑脱离购物车通用逻辑 Chopper 2021-07-30 18:04:17 +08:00
• 26c67c72fa 文章分类默认值问题处理 Chopper 2021-07-30 16:17:44 +08:00
• 829472c6a3 Merge remote-tracking branch 'origin/qiuqiu' 合并砍价/积分相关 Chopper 2021-07-30 15:50:36 +08:00
• 8deaef09d7 热词排序count下标从0开始，所以计算时候进行-1处理 Chopper 2021-07-30 14:59:00 +08:00
• 2018457c28 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-30 14:28:11 +08:00
• 0760c72ef8 热词获取改为根据数量，传递count获取系统热搜词语 Chopper 2021-07-30 14:27:41 +08:00
• 0c87c6f080 update update-sql/version4.2to4.3.sql. sql格式化问题存在错误，重新导入 chopper711 2021-07-30 03:23:23 +00:00
• 6e611d3464 推送github脚本更新 Chopper 2021-07-30 09:04:07 +08:00
• f71facf72a 补充注释规范。补充异常消息打印 Chopper 2021-07-29 18:06:54 +08:00
• b804fa68cf 鉴权写入前对权限的非空校验 Chopper 2021-07-29 17:52:42 +08:00
• 363e7f40bf 去除sout Chopper 2021-07-29 17:39:33 +08:00
• 02327402a8 代码接口，异常规范问题处理。 Chopper 2021-07-29 17:00:15 +08:00
• f8ae17b360 去除无效代码 Chopper 2021-07-29 15:26:48 +08:00
• 8e30ae435f Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-28 11:19:38 +08:00
• f00386c81d 继续优化代码，调整依赖关系，缩减无效代码 Chopper 2021-07-28 11:19:33 +08:00
• f798dbf3ec !18 合并 Merge pull request !18 from pikachu/pipi pikachu 2021-07-27 11:48:19 +00:00
• 0dd8488e19 Merge branch 'master' into pipi pikachu 2021-07-27 19:44:36 +08:00
• a7f26ff19e 站内信消息完善 pikachu 2021-07-27 19:43:16 +08:00
• 0cad52cfa6 同步master lifenlong 2021-07-27 17:26:12 +08:00
• cd1b67ba84 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-07-27 17:17:19 +08:00
• 4ac7c038f2 评价列表展示店铺的评分 lifenlong 2021-07-27 17:17:11 +08:00
• ceea01ccf8 评价列表展示店铺的评分 lifenlong 2021-07-27 17:15:52 +08:00
• b8634e9d59 最新菜单结构 Chopper 2021-07-27 17:08:30 +08:00
• 5999b5f217 权限改版完成 Chopper 2021-07-27 17:03:31 +08:00
• 1b60079481 取消订单，恢复积分 lifenlong 2021-07-27 16:58:38 +08:00
• 02f3bde2b4 积分订单、用户下单积分数值判断 lifenlong 2021-07-27 15:33:11 +08:00
• 5a7440c5bf 同步master，解决冲突 lifenlong 2021-07-27 10:00:34 +08:00
• a407d3a539 修改sql中的菜单名称 Chopper 2021-07-26 17:21:02 +08:00
• ad2640dac9 热词菜单处理sql提交 Chopper 2021-07-26 16:12:59 +08:00
• 8b861e8fe7 热词自定义分数线功能完善 Chopper 2021-07-26 16:02:03 +08:00
• fe8523ca3f Merge branch 'backup' Chopper 2021-07-25 17:51:05 +08:00
• 0514bec994 管理端权限模块校验完善 Chopper 2021-07-25 17:46:24 +08:00
• e99aeeede5 热词功能处理，提供redis自定义增加权重值的方法 Chopper 2021-07-25 17:45:46 +08:00
• 2e2ba961d9 去掉订单中存入砍价、积分商品的促销商品ID lifenlong 2021-07-24 17:56:43 +08:00
• f9d7e9324a !17 提现审核功能 Merge pull request !17 from pikachu/pipi pikachu 2021-07-24 09:49:56 +00:00
• 094212e6a2 提现审核 pikachu 2021-07-24 17:39:49 +08:00
• 7c48413d6b 结算单添加积分、砍价商品结算价 lifenlong 2021-07-24 17:06:24 +08:00
• 3acdb7733e 添加商品新增视频字段 pikachu 2021-07-24 11:47:15 +08:00
• 1ee60c02d3 添加引用 lifenlong 2021-07-23 19:58:32 +08:00
• abdc74c773 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-07-23 19:45:21 +08:00
• 2c8ac59628 优化商品显示逻辑 售后价格判断 lifenlong 2021-07-23 19:44:46 +08:00
• 280c5dec39 注解包调整 Chopper 2021-07-22 17:33:57 +08:00
• 58d41775cf 店铺请求不记录PV统计 Chopper 2021-07-22 17:26:10 +08:00
• d6b59c23af Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-22 12:17:15 +08:00
• fdb55bc426 Merge branch 'backup' Chopper 2021-07-22 12:07:22 +08:00
• 66e9a4f4cc 解决店铺-商品列表页面库存与Sku库存不对应问题 lifenlong 2021-07-22 10:47:42 +08:00
• 1c0a420515 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-07-22 09:17:08 +08:00
• 0f02a398f6 线下退款判断错误 lifenlong 2021-07-22 09:17:00 +08:00
• 41835aaece 站内信消息优化 pikachu 2021-07-21 19:38:59 +08:00
• 9f3a4dbf68 去掉无用代码以及对站内信模版等进行了优化 pikachu 2021-07-21 19:36:04 +08:00
• 0ccdc94644 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-21 17:46:58 +08:00
• bd3aceaeac 完善方法注释 Chopper 2021-07-21 17:46:46 +08:00
• 79da543d57 修改会员评价店铺图片字段类型 lifenlong 2021-07-21 15:54:59 +08:00
• c459a9086a 退款金额单价计算错误 lifenlong 2021-07-21 15:43:49 +08:00
• bc6abdbf1a 初步调整结构完成 Chopper 2021-07-21 15:23:47 +08:00
• dd491e38e5 进行中的满减活动可以关闭 lifenlong 2021-07-21 15:13:50 +08:00
• b851de488b 解决店铺导出待发货订单重复问题。 lifenlong 2021-07-21 13:38:42 +08:00
• 9ff2f50b8f 解决问题：关闭优惠券后，商品页面还是展示优惠券 lifenlong 2021-07-21 12:51:35 +08:00
• 6f1aa6e3d5 使用hutool做String非空判断 lifenlong 2021-07-21 12:00:03 +08:00
• e9663434a2 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-07-21 11:56:49 +08:00
• 6bbd2f8bb8 !16 sql 中 添加分词管理菜单 Merge pull request !16 from OceansDeep/feature/pg OceansDeep 2021-07-21 00:04:55 +00:00
• 13ecd5815b sql 中 添加分词管理菜单 paulGao 2021-07-21 08:04:19 +08:00
• 3576c968cf !15 修复商品搜索为分词搜索 Merge pull request !15 from OceansDeep/feature/pg OceansDeep 2021-07-21 00:02:43 +00:00
• bdbf4589ea 修复商品搜索为分词搜索 paulGao 2021-07-21 07:59:58 +08:00
• 44fb0601a6 解决商品购买但是商品页面的库存显示不正确的问题 lifenlong 2021-07-20 20:25:57 +08:00
• 37348335b2 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 修正优惠券提示语 Chopper 2021-07-20 19:41:40 +08:00
• 8f351fdb8b 对消息增加默认状态码 Chopper 2021-07-20 19:38:21 +08:00
• f35ae5b1ee Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-07-20 19:27:48 +08:00
• 6a13351bc3 满折优惠活动+满折优惠券价格计算不正确。 lifenlong 2021-07-20 19:27:37 +08:00
• ecfe856fa7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-20 17:59:10 +08:00
• 0c1d3236e8 商品读取缓存 Chopper 2021-07-20 17:57:49 +08:00
• d6d0afa23a String 类型转换使用hutool lifenlong 2021-07-20 17:29:08 +08:00
• 6607506929 砍价订单实现 lifenlong 2021-07-20 16:18:54 +08:00
• fe021f8a11 暂时备份一下代码，准备切换master Chopper 2021-07-20 15:44:09 +08:00
• 4b7ab94ba4 批量调整目录结构 Chopper 2021-07-19 16:07:02 +08:00
• 15ab6bfda4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-19 15:01:55 +08:00
• 06212c073d 调整目录结构 Chopper 2021-07-19 15:01:51 +08:00
• eef270ff9c 砍价商品添加原价 lifenlong 2021-07-19 11:15:00 +08:00
• 3c27cd09ff Merge branch 'master' into qiuqiu lifenlong 2021-07-18 18:32:35 +08:00
• eda1e841bb Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop v4.2.1 lifenlong 2021-07-18 18:32:22 +08:00
• dd213e7e33 砍价、积分商品订单价格计算 lifenlong 2021-07-18 18:30:37 +08:00
• 9de55088ea 新增站内消息通知模版 pikachu 2021-07-18 17:12:27 +08:00
• 451d683c4f Merge branch 'master' into qiuqiu lifenlong 2021-07-18 13:43:45 +08:00
• d4642d85dd Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-07-18 13:43:34 +08:00
• 5d211c241d 砍价活动商品购买 lifenlong 2021-07-17 14:02:34 +08:00
• a9c79eedd4 代码结构优化，缩减。一个多次判定问题处理 Chopper 2021-07-16 10:40:44 +08:00
• ac5d04ddc2 调整代码结构 Chopper 2021-07-16 09:55:38 +08:00
• caacb9e201 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-15 14:17:58 +08:00
• 844bff971f 无效代码去除 Chopper 2021-07-15 14:17:53 +08:00
• 0f8a5aba05 1.完善砍价商品加入购物车。 2.完善砍价帮砍 3.完善砍价价格计算。 lifenlong 2021-07-14 08:47:13 +08:00
• 9ee5b4515a 修改积分参数命名规范 pikachu 2021-07-13 19:55:42 +08:00
• 2246b498d9 解决如果是扣减积分 积分变化错误 pikachu 2021-07-13 19:43:49 +08:00
• 93e4998b87 修改积分类型字段类型 pikachu 2021-07-13 18:48:22 +08:00
• 4718ce292d 修改砍价活动 lifenlong 2021-07-13 16:17:53 +08:00
• a360fd2eda maven规范补充 Chopper 2021-07-13 10:39:27 +08:00
• e0ca366431 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-07-13 10:28:48 +08:00
• 3d3be0b283 查看店铺经营范围 lifenlong 2021-07-13 10:28:04 +08:00
• 656e2a9307 合并 pikachu 2021-07-12 23:41:23 +08:00