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

• f34d10146a fix: 修复日志异常 lele0521 2024-01-17 17:07:20 +08:00
• b875cbdda4 !324 补充提交部分退款售后逻辑 Merge pull request !324 from Lele/dev Lele 2024-01-16 09:24:05 +00:00
• d80a3f7f48 fix: 补充提交部分退款售后逻辑 lele0521 2024-01-16 17:18:28 +08:00
• 259946e78f !323 增加操作日志、新增会员昵称默认规则、增加退款状态 Merge pull request !323 from Lele/dev Lele 2024-01-16 08:49:35 +00:00
• 9c24adf77d fix: 补充提交部分退款售后逻辑 lele0521 2024-01-16 16:45:27 +08:00
• 4c47d4aba2 fix: 区分商家、管理端OSS资源文件夹的创建 lele0521 2024-01-16 15:53:37 +08:00
• 7f9061cfc5 fix: Merging dev lele0521 2024-01-16 11:29:03 +08:00
• 085dad2107 库存预警功能回退 chc 2024-01-16 10:10:07 +08:00
• 055a7fffdb 首页暂不显示预警 chc 2024-01-11 13:33:46 +08:00
• 6cea6af59b 分包裹发货，库存预警 chc 2024-01-11 13:33:13 +08:00
• 6f0f8106e0 分包裹SQL chc 2024-01-08 19:15:07 +08:00
• c9a0ce7985 feat: 增加退款状态（部分退款、全部退款） lele0521 2024-01-05 17:29:34 +08:00
• b40533c553 feat: 增加操作日志（商品、用户、促销相关修改操作） lele0521 2024-01-04 18:10:57 +08:00
• e2fff23080 feat: 新增会员昵称默认规则 lele0521 2024-01-04 17:36:39 +08:00
• 72482ee395 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-12-18 08:40:31 +08:00
• 5366034556 fix: 禁用演示站点地区维护功能费 Chopper711 2023-12-18 08:40:24 +08:00
• 484e2a2318 !320 fix & improve Merge pull request !320 from OceansDeep/pg OceansDeep 2023-12-05 06:23:34 +00:00
• 0873fba7df fix: 优化商品参数聚合搜索 misworga831 2023-12-05 14:21:55 +08:00
• 4aa6f864f0 !319 fix & improve Merge pull request !319 from OceansDeep/pg OceansDeep 2023-12-05 06:07:08 +00:00
• 183b2ba30c fix: 优化商品参数聚合搜索 misworga831 2023-12-05 11:48:56 +08:00
• 071f15347e feat: 新增会员绑定手机号功能 lele0521 2023-12-04 16:05:17 +08:00
• 71ed58e665 !318 fix & improve Merge pull request !318 from OceansDeep/pg OceansDeep 2023-11-23 03:17:21 +00:00
• 50c7e20ba6 fix: 修复活动优惠券，没有生成商品促销信息问题 misworga831 2023-11-23 11:16:08 +08:00
• 876b801fa1 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-11-21 10:15:06 +08:00
• bd42b88b71 fix: 优化商品索引不存在，搜索商品报错 misworga831 2023-11-21 10:14:59 +08:00
• b2dfb3abe2 update README.md. Chopper711 2023-11-08 08:18:00 +00:00
• 164f726222 fix: 将订单创建消息发送节点从业务类内部调整为事务提交节点 Chopper711 2023-11-08 09:15:06 +08:00
• 24cdf5cf00 fix: 商品评价更新后，清除sku缓存不全问题。获取有图评价过滤条件缺少状态问题 misworga831 2023-11-06 17:50:24 +08:00
• 93cb9da558 !317 fix & improve Merge pull request !317 from OceansDeep/pg OceansDeep 2023-11-06 07:21:01 +00:00
• 66c6bfa0fb fix: 优化自定义分词插入（修改为插入时，遇到唯一索引错误跳过） misworga831 2023-11-06 15:19:53 +08:00
• edd93a6ad4 update README.md. Chopper711 2023-11-03 07:05:29 +00:00
• ea1626a2ef !315 fix & improve Merge pull request !315 from OceansDeep/pg OceansDeep 2023-10-24 08:30:44 +00:00
• 1f3b7f21bb fix: 优化更新商品评价为所有Sku的评价 misworga831 2023-10-24 16:29:04 +08:00
• e6fe055cd5 !314 fix & improve Merge pull request !314 from OceansDeep/pg OceansDeep 2023-10-24 06:42:40 +00:00
• 1422b6fdbc fix: 优化更新商品评价为所有Sku的评价 misworga831 2023-10-24 14:41:41 +08:00
• cfb70eff8a fix: 优化特殊情况下出现的商品数据无商品分类查询报错的问题 misworga831 2023-10-24 08:27:02 +08:00
• dfe6085432 fix: buyer端增加获取sku接口 misworga831 2023-10-23 18:13:54 +08:00
• b8e8db0e36 !313 fix & improve Merge pull request !313 from OceansDeep/pg OceansDeep 2023-10-23 06:22:27 +00:00
• fb2e41422b fix: 优化虚拟订单收货地址校验 misworga831 2023-10-23 14:21:33 +08:00
• f3db8f2e45 !312 fix & improve Merge pull request !312 from OceansDeep/pg OceansDeep 2023-10-23 03:55:33 +00:00
• 6bc2c0adf1 fix: 优化虚拟订单收货地址校验 misworga831 2023-10-23 11:54:53 +08:00
• df75e08d22 !311 fix & improve Merge pull request !311 from OceansDeep/pg OceansDeep 2023-10-23 03:46:10 +00:00
• b2ccdad483 fix: 去除虚拟订单收货地址校验 misworga831 2023-10-23 11:45:00 +08:00
• 3d6eb7b4fa fix: 去除虚拟订单收货地址校验 misworga831 2023-10-23 11:42:22 +08:00
• 96cfb8a8ce !305 fix bug: 小程序分享二维码，请求参数类型应为Object Merge pull request !305 from GeekMo/master Chopper711 2023-10-19 01:54:44 +00:00
• 4a4672c80a !310 fix & improve Merge pull request !310 from OceansDeep/pg OceansDeep 2023-10-18 02:54:03 +00:00
• a0c1cd1019 fix: 修复订单未完成，售后完成扣减积分问题 misworga831 2023-10-18 10:53:22 +08:00
• ed20d1abbb !309 fix & improve Merge pull request !309 from OceansDeep/pg OceansDeep 2023-10-17 09:13:33 +00:00
• 0ebb9c01f8 fix: 优化售后完成扣减积分问题 misworga831 2023-10-17 17:11:25 +08:00
• dd3176f841 !308 fix & improve Merge pull request !308 from OceansDeep/pg OceansDeep 2023-10-17 01:07:36 +00:00
• a910a97719 fix: 优化更新商品索引评论条件 misworga831 2023-10-17 09:05:33 +08:00
• cdf8ab3a3c !307 fix & improve Merge pull request !307 from OceansDeep/pg OceansDeep 2023-10-17 00:27:50 +00:00
• 074e4ed5b7 fix: 优化更新商品索引评论,改为实时统计spu的评论总量 misworga831 2023-10-17 08:26:34 +08:00
• 9e43d186d7 !306 fix & improve Merge pull request !306 from OceansDeep/pg OceansDeep 2023-10-16 10:36:21 +00:00
• 8b61d40ff8 fix: 优化部分优惠券初始化及搜索条件 misworga831 2023-10-16 18:34:55 +08:00
• f9b3001eb3 fix: 优化售后搜索条件 misworga831 2023-10-16 18:34:21 +08:00
• f1ec44869d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-10-16 16:40:48 +08:00
• 72341acb57 fix: 优化楼层装修代码 misworga831 2023-10-16 16:40:37 +08:00
• fa696e6c11 fix: 优化更新商品评论,改为实时统计评论总量 misworga831 2023-10-16 16:40:20 +08:00
• b30909942a fix: 优化im搜索 misworga831 2023-10-16 11:49:42 +08:00
• 7c64e1f11d fix: 优化更新商品索引，销量，评论方法 misworga831 2023-10-16 11:48:52 +08:00
• d1c6988d0f fix: 定时精准发送优惠券被立即发送问题处理。自动领取优惠券时会触发精准发券全平台会员 Chopper711 2023-10-13 15:35:47 +08:00
• efe0bd4bad Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-10-11 10:07:25 +08:00
• 7523481be0 小程序参数有其它非String类型的值需要设置 例如check_path:false Milo 2023-10-05 19:15:34 +08:00
• 23182106b9 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-09-27 18:43:15 +08:00
• 515ffbcf0a fix: 下单人数统计问题处理 Chopper711 2023-09-27 18:43:10 +08:00
• 8f52a1e2a2 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-09-27 09:20:03 +08:00
• bdd9045fc1 fix: 优化商品分类、售后及拼团相关 misworga831 2023-09-27 09:16:49 +08:00
• 518616483b Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop pikachu1995@126.com 2023-09-26 18:51:04 +08:00
• 817f662cb7 添加文件-文件夹 pikachu1995@126.com 2023-09-26 18:50:52 +08:00
• 01419cde15 refactor: 增加店铺菜单维护页面 Chopper711 2023-09-25 11:58:08 +08:00
• 118efe0833 merge master Chopper711 2023-09-25 11:05:04 +08:00
• 46911004db refactor: 虚拟订单增加取消判定，解决订单退款，待审核订单状态不变的问题。 Chopper711 2023-09-25 10:54:47 +08:00
• b87190d135 1.判断分销订单是否包含退款 2.订单货物全部退款则订单取消 pikachu1995@126.com 2023-09-22 17:25:46 +08:00
• 39e22f5561 订单退款，即刻扣减分销员冻结佣金 pikachu1995@126.com 2023-09-21 18:46:32 +08:00
• 02dd37c87f fix: 优化商品单位不能为空 misworga831 2023-09-19 17:12:28 +08:00
• 7db7afad4a fix: 优化商品单位不能为空 misworga831 2023-09-19 17:09:14 +08:00
• 25582e2958 QQ状态调整 chc 2023-09-19 15:04:14 +08:00
• 3c5609545b fix: 移除促销活动，活动起始时间小于现在时间限制 misworga831 2023-09-18 16:50:46 +08:00
• 061d924d46 fix: 优化弃用状态 misworga831 2023-09-18 10:00:44 +08:00
• 49af6777ee Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-09-14 17:04:46 +08:00
• e9d9a95cb4 improve: 优化订单投诉查询 misworga831 2023-09-14 17:04:30 +08:00
• 7e70e7d6cd 优化注释 Chopper711 2023-09-11 17:18:10 +08:00
• ebb48c7d0f fix: 商品批量设置物流模板时，没有删除缓存问题处理 Chopper711 2023-08-29 16:00:29 +08:00
• e0d464906e fix: minio缩略图需要特殊配置，这里默认不压缩处理 Chopper711 2023-08-28 13:01:51 +08:00
• 9189a6d433 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-08-25 14:06:07 +08:00
• b3f6bad6f8 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-08-25 11:48:10 +08:00
• 105162aa89 fix: 某种不知名的情况下，微信联合登陆会报错问题处理 Chopper711 2023-08-25 11:48:03 +08:00
• 51c4161f68 fix: 简单优化扫码登录，创建多个线程池导致的性能问题 misworga831 2023-08-24 18:54:10 +08:00
• 488d9352f3 !302 fix & improve Merge pull request !302 from OceansDeep/pg OceansDeep 2023-08-24 09:02:52 +00:00
• 56b800e4ff Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-08-24 15:49:20 +08:00
• 03864ca1a9 fix: 部分sql过滤会导致一些问题处理。 Chopper711 2023-08-24 15:49:14 +08:00
• 94c87f5645 fix: 优化商品搜索出现分类id问题 misworga831 2023-08-24 14:17:21 +08:00
• dadf48ac25 fix: sql名称修改 chc 2023-08-23 15:49:37 +08:00
• a47bfcc5fd 更新4.3版本 chc 2023-08-23 15:37:31 +08:00
• 1798916bf9 fix: 特殊情况下，平台会同时开启多个楼层问题处理 v4.3 Chopper711 2023-08-18 15:39:18 +08:00
• 5af1238e02 fix: minio 无法删除磁盘文件问题处理 Chopper711 2023-08-18 15:20:48 +08:00
• a62db61221 improvement：调优sql关键词过滤方法 Chopper711 2023-08-16 16:37:58 +08:00
• 8104947aec sql 排序关键字 orderby注入风险处理 Chopper711 2023-08-16 13:39:57 +08:00
• d5f9fbf99d Merge branch 'master' of github.com:lilishop/lilishop Chopper711 2023-08-16 12:41:50 +08:00