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

• f6a50cc43a fix: 修复下载商品导入模版错误问题 paulGao 2022-11-17 18:36:04 +08:00
• a13260b8c6 '楼层参数写入错误修正' Chopper711 2022-11-14 09:44:53 +08:00
• 66c0200457 '商家楼层装修权限放开' Chopper711 2022-11-14 09:31:20 +08:00
• e244883165 '两个装修类合并' Chopper711 2022-11-14 09:21:35 +08:00
• 92367c9020 '店铺保存模板配置问题处理' Chopper711 2022-11-14 09:05:43 +08:00
• e78ea60644 '限制演示站点部分功能' Chopper711 2022-11-11 15:18:48 +08:00
• 29f73eaaa1 '楼层装修演示站点被覆盖问题处理' Chopper711 2022-11-08 14:35:29 +08:00
• 22c004a892 !250 pref: 优化es生成全部商品索引，减少数据库操作 优化文件 Merge pull request !250 from OceansDeep/feature/pg OceansDeep 2022-11-02 12:02:48 +00:00
• ef0507cf1d fix: 优化文件 paulGao 2022-11-02 19:59:13 +08:00
• 9df9e33ce1 fix: 优化代码 paulGao 2022-11-02 19:54:57 +08:00
• 52a2caaa6d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-11-02 19:43:44 +08:00
• 0b6aa9e857 fix: 优化代码 paulGao 2022-11-02 19:43:38 +08:00
• 3b078cfd6b pref: 优化es生成全部商品索引，减少数据库操作 paulGao 2022-11-02 19:43:17 +08:00
• 67b746998f update README.md. Chopper711 2022-10-31 03:04:13 +00:00
• 52f62f0c1d update README.md. Chopper711 2022-10-31 03:04:01 +00:00
• ca23b5ab33 防重复提交问题å‘处理 Chopper711 2022-10-28 17:58:28 +08:00
• 5a14790ec2 平台脱敏 Chopper711 2022-10-28 17:33:06 +08:00
• 67542eebfb 用户信息脱敏 Chopper711 2022-10-28 16:58:30 +08:00
• 88c62bc238 用戶信息查看脫敏字段處理 Chopper711 2022-10-28 16:09:26 +08:00
• 0c4ed91335 update README.md. Chopper711 2022-10-27 07:31:48 +00:00
• 74dbb611ab update README.md. Chopper711 2022-10-27 07:31:19 +00:00
• 07e72c7e72 !248 更新无法更新分销员待提现总金额的bug Merge pull request !248 from 隔壁老黄/tempbranch Chopper711 2022-10-27 01:30:00 +00:00
• 2c0700c10e lilishop.sql chc 2022-10-26 17:38:51 +08:00
• 191cee25a4 !246 fix: 限流次数不对 Merge pull request !246 from @xiaochangbai/pr/optime_lock Merge pull request !246 from @xiaochangbai/pr/optime_lock Chopper711 2022-10-26 09:26:19 +00:00
• 1b4fad72ed !249 修改xxl-job合并冲突配置文件 Merge pull request !249 from 欢哥/master Merge pull request !249 from 欢哥/master Chopper711 2022-10-26 09:13:43 +00:00
• 3fce0dba48 fix 修改合并冲突文件 code huan 2022-10-26 14:58:55 +08:00
• 706346338b 获取店铺首页 chc 2022-10-25 19:13:03 +08:00
• aee846764b 更新无法更新分销员待提现总金额的bug neo0820 2022-10-19 22:04:09 +08:00
• 391b35ef1f sql错误 chc 2022-10-25 18:37:12 +08:00
• 9364841cf4 update README.md. 蔡洪呈 2022-10-24 08:39:35 +00:00
• 0d7b44fe51 !247 fix: 优化生成商品索引，取消检查库存不为0 优化es商品搜索及es商品特定查询条件的分页 Merge pull request !247 from OceansDeep/feature/pg OceansDeep 2022-10-24 06:40:33 +00:00
• 47734cfca6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-10-24 14:38:08 +08:00
• a272e53519 fix: 优化es商品搜索及es商品特定查询条件的分页 paulGao 2022-10-24 14:37:36 +08:00
• 710fe1998b fix: 限流次数不对 xiaochangbai 2022-10-21 17:36:26 +08:00
• 31c76c08b8 update pom.xml. 修改revision版本号 蔡洪呈 2022-10-21 08:48:17 +00:00
• e8e2e8e315 v4.2.5 v4.2.5 chc 2022-10-21 11:27:28 +08:00
• 5a1c6b9e7f v4.2.5 chc 2022-10-21 11:26:55 +08:00
• 1d98d8eecb 店员 chc 2022-10-20 17:28:37 +08:00
• 7d5e609f7b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-10-18 17:47:14 +08:00
• 4d2cb2d1dc fix: 优化生成商品索引，取消检查库存不为0 paulGao 2022-10-18 17:46:46 +08:00
• fa2806e3aa !245 fix: 修复商品模版/商品草稿时，增加检查sku列表和配送规则列表不为空 Merge pull request !245 from OceansDeep/feature/pg OceansDeep 2022-10-18 02:35:59 +00:00
• 761d9f45da fix: 修复商品模版/商品草稿时，增加检查sku列表和配送规则列表不为空 paulGao 2022-10-18 10:34:33 +08:00
• 07d9cfe5bc !244 fix: 修复商品模版/商品草稿，保存批发规则无效问题 Merge pull request !244 from OceansDeep/feature/pg OceansDeep 2022-10-14 07:47:57 +00:00
• b9d7e0787c fix: 修复商品模版/商品草稿，保存批发规则无效问题 paulGao 2022-10-14 10:31:47 +08:00
• 4ea6660402 fix: 修复售后订单完成后没有返还优惠券问题 paulGao 2022-10-14 10:30:27 +08:00
• 8391596e2a Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-10-13 14:32:46 +08:00
• 0f1cfc129c keys判定优化为精准判定 Chopper 2022-10-13 14:32:40 +08:00
• 3e33f9b363 !242 修复bug，优化代码 Merge pull request !242 from OceansDeep/feature/pg OceansDeep 2022-10-13 04:04:40 +00:00
• a76cc4693f fix: 修复首页获取秒杀活动时，有时会报错问题 paulGao 2022-10-13 12:03:01 +08:00
• d75bb7b7cf pref: paulGao 2022-10-13 12:02:02 +08:00
• 6c87de7a97 pref: 优化售后日志，状态显示 paulGao 2022-10-13 11:56:16 +08:00
• 0ba493d71d fix: 修复店铺商品标签排序不正确问题 paulGao 2022-10-13 11:55:25 +08:00
• bd0f1f0b23 fix: 修复退还优惠券时，不能同时退还商家和平台 paulGao 2022-10-13 11:54:36 +08:00
• d45a96a919 购物车渲染注释修正 Chopper 2022-10-13 11:06:53 +08:00
• 55e02dde5e token无法验证问题处理 Chopper 2022-10-12 10:36:38 +08:00
• cb7814cbd6 买家端专题 chc 2022-10-11 17:13:12 +08:00
• 2b1abc8aeb Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-10-10 15:22:55 +08:00
• 3376ce54cc !241 fix: 更新商品状态时，更新es索引信息 Merge pull request !241 from OceansDeep/feature/pg OceansDeep 2022-10-08 03:54:30 +00:00
• d35b4d1ad6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-10-08 11:52:00 +08:00
• 7a2c45ddb5 fix: 更新商品状态时，更新es索引信息 paulGao 2022-10-08 11:51:36 +08:00
• d3648a7e89 无关紧要的地方减少keys使用，改为精准匹配 Chopper 2022-09-29 09:26:48 +08:00
• c794bb6a26 redis keys命令可能导致阻塞问题解决以及单元测试 Chopper 2022-09-29 09:26:18 +08:00
• 3f8b2f7a30 !233 导出待发货订单bug修复 商品价格显示成订单价格 from lqc520 Merge pull request !233 from lqc520/master Chopper711 2022-09-28 07:46:31 +00:00
• 2bc6d1bc9a !240 🐛 修复在部分linux服务器上由此导致接口中中文参数乱码问题 from 聆听 Merge pull request !240 from 聆听/N/A 感谢反馈 Chopper711 2022-09-28 07:45:46 +00:00
• ee53ddd097 🐛 修复在部分linux服务器上由此导致接口中中文参数乱码问题 聆听 2022-09-23 09:29:30 +00:00
• 1705817128 !239 fix: 更新商品状态时，更新es索引信息 Merge pull request !239 from OceansDeep/feature/pg OceansDeep 2022-09-22 10:40:13 +00:00
• 0f8936e9a9 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-09-22 18:36:50 +08:00
• e3792cde12 fix: 更新商品状态时，更新es索引信息 paulGao 2022-09-22 18:36:26 +08:00
• 4792d83119 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-09-22 17:51:26 +08:00
• 27888f503a 去除无效的控制器，规范站点基础设置控制器的规范 Chopper 2022-09-22 17:51:18 +08:00
• 8b0823f504 !238 fix: 优化统一接口返回值 Merge pull request !238 from OceansDeep/feature/pg OceansDeep 2022-09-21 08:34:52 +00:00
• 12476fc173 fix: 优化统一接口返回值 paulGao 2022-09-21 16:28:46 +08:00
• 56cc0a92f6 !237 fix: 修复查询系统日志报错问题，修复添加直播商品报错问题 Merge pull request !237 from OceansDeep/feature/pg OceansDeep 2022-09-20 11:07:12 +00:00
• 88db57c64b fix: 修复查询系统日志报错问题，修复添加直播商品报错问题 paulGao 2022-09-20 19:06:21 +08:00
• cd1f465a81 !236 fix: 优化库存扣减后清除商品缓存信息 Merge pull request !236 from OceansDeep/feature/pg OceansDeep 2022-09-20 02:17:47 +00:00
• a80b5ed961 fix: 优化库存扣减后清除商品缓存信息 paulGao 2022-09-20 09:52:22 +08:00
• 7f54cb0de8 !235 fix: 优化扫描登录相关代码 Merge pull request !235 from OceansDeep/feature/pg OceansDeep 2022-09-19 01:30:54 +00:00
• 3549b216b0 fix: 优化扫描登录相关代码 paulGao 2022-09-19 09:23:56 +08:00
• 3786c53cad !219 app端扫码登录 Merge pull request !219 from @xiaochangbai/feature/code_scanning_login OceansDeep 2022-09-16 02:14:49 +00:00
• 178e0d18cd !234 修复查询满减活动和优惠券活动报错问题 Merge pull request !234 from OceansDeep/feature/pg OceansDeep 2022-09-14 09:13:56 +00:00
• cbdcb6f1ce fix: 修复查询满减活动和优惠券活动报错问题 paulGao 2022-09-14 17:11:26 +08:00
• 74cc5af5c9 被批量请求报错信息导致磁盘沾满问题处理 Chopper 2022-09-14 01:32:36 +08:00
• 392d90db57 导出待发货订单bug 商品价格显示成订单价格 lqc520 2022-09-13 17:23:24 +08:00
• c87081f673 活动商品在商品下架或者删除时数据未能同步处理的问题 Chopper 2022-09-13 15:17:53 +08:00
• f375432e7d fix: 为部分异常捕捉添加错误日志展示 paulGao 2022-09-13 11:33:39 +08:00
• 3011645c44 !232 fix: 修复编辑规格值顺序错误问题 Merge pull request !232 from OceansDeep/feature/pg OceansDeep 2022-09-09 11:41:28 +00:00
• 322256cc5a fix: 修复编辑规格值顺序错误问题 paulGao 2022-09-09 19:08:24 +08:00
• 02d017eb9e !231 fix: 修复保存草稿商品规格顺序问题 Merge pull request !231 from OceansDeep/feature/pg OceansDeep 2022-09-09 07:40:59 +00:00
• 2f13bce20d fix: 修复保存草稿商品规格顺序问题 paulGao 2022-09-09 15:32:49 +08:00
• e2bf90e340 编译问题处理 Chopper 2022-09-06 19:36:11 +08:00
• 9bc1247544 促销活动清洗，先处理砍价，其他的后续处理 Chopper 2022-09-06 19:34:43 +08:00
• 90a2ec9719 商品删除则删除相关促销商品 Chopper 2022-09-06 19:22:34 +08:00
• b61cfe8b6b 虚拟商品设置物流模版问题兼容处理 Chopper 2022-09-06 19:16:26 +08:00
• 28d57dff72 update README.md. Chopper711 2022-09-06 02:39:07 +00:00
• 55270548c7 SQL,福禄清除 chc 2022-09-05 14:43:37 +08:00
• a45f9e7843 特喵的 mybatis bug方法名重复会出现问题，唉服了 Chopper 2022-09-02 20:43:18 +08:00
• 37cfcde476 参数无法识别问题处理 Chopper 2022-09-02 20:02:39 +08:00
• 9517f0eedf 统计占位符问题处理 Chopper 2022-09-02 19:45:52 +08:00
• a9da0cdcc8 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-09-02 19:09:22 +08:00
• b3c537d034 订单统计付款人数bug处理 Chopper 2022-09-02 19:09:17 +08:00