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

• 5ee07ec34d 用户提现-第三方支付提现，功能完善 pikachu1995@126.com 2023-03-01 10:59:27 +08:00
• 61104b9cd3 fixbug:提现申请充值业务问题处理 Chopper711 2023-03-01 10:37:08 +08:00
• 032ecc4a3e UpdateWrapper替换为QueryWrapper zhaoyang0415 2023-02-25 14:52:47 +00:00
• 7337cf6fa5 修改了商品参数集合判空方式 zhaoyang0415 2023-02-25 14:11:46 +00:00
• 967852f84d 去除误提交代码 pikachu1995@126.com 2023-02-24 14:55:29 +08:00
• 17734e7a3d 银联支付-云闪付 pikachu1995@126.com 2023-02-24 14:53:49 +08:00
• b8398ac1d1 微信、支付宝提现 pikachu1995@126.com 2023-02-23 17:50:56 +08:00
• 0a3696ac56 !257 优化生成索引，增加批量生成参数 Merge pull request !257 from OceansDeep/pg OceansDeep 2023-02-21 04:09:16 +00:00
• 8e0b77c232 fix: 优化生成索引，增加批量生成参数 misworga831 2023-02-21 12:08:33 +08:00
• 88efc2da38 fix: 优化生成索引，修改批量生成 misworga831 2023-02-21 12:04:56 +08:00
• 48f9398e72 fix:去除无效类 Chopper711 2023-02-17 08:09:42 +08:00
• b147bbef3d 解决编译错误问题。 pikachu1995@126.com 2023-02-17 07:31:23 +08:00
• 013e8f8f70 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop pikachu1995@126.com 2023-02-16 18:16:43 +08:00
• 98907b33aa 存储新增：腾讯云、华为云 短信新增：腾讯云、华为云 物流新增：快递100 物流查询方式新增：快递查询地图轨迹 pikachu1995@126.com 2023-02-16 18:16:37 +08:00
• 49003f4d9a refactor：当token过期，重新生成token时，authuser对象中的字段与方法参数重复，进行优化 Chopper711 2023-02-16 16:25:39 +08:00
• 46c869ca8a fix：jwt中长期有效标识字段赋值错误bug修复。 Chopper711 2023-02-16 12:01:06 +08:00
• f92756c103 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop pikachu1995@126.com 2023-02-13 16:46:04 +08:00
• 57c3fa04db update README.md. Chopper711 2023-02-10 03:37:37 +00:00
• 30d8d34976 update README.md. Chopper711 2023-02-10 03:35:55 +00:00
• c49f968d82 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop pikachu1995@126.com 2023-02-09 16:24:19 +08:00
• 894a75beb3 Merge pull request #76 misworga831 2023-02-09 16:06:45 +08:00
• cb7e1cc03e fix: 优化代码结构 misworga831 2023-02-08 00:56:08 +08:00
• 9e1837e89c fix: 优化商品根据id搜索 misworga831 2023-02-04 11:13:32 +08:00
• 475f96d00a Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop misworga831 2023-02-03 17:55:54 +08:00
• 96854ca00c fix: 优化商品根据id搜索 misworga831 2023-02-03 17:55:38 +08:00
• 0bf6aab43b fix: 增加获取购物车商品日志，修复可能出现的获取购物车空指针问题 misworga831 2023-02-03 17:54:50 +08:00
• 856aee6c18 选择自提购物车商品不取消问题 chc 2023-02-03 17:26:08 +08:00
• 0f2ed23b02 fix: 优化购物车检查数据集合操作问题 misworga831 2023-02-03 15:34:00 +08:00
• 10b4d0b16b 自提功能完善核销功能 chc 2023-02-02 17:05:35 +08:00
• 7f44b29fbc 电子面单报错信息问题修改 chc 2023-02-01 17:12:50 +08:00
• a66c6e5504 购物车商品失效问题 chc 2023-02-01 15:51:11 +08:00
• 255d5a4550 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop chc 2023-01-31 18:03:24 +08:00
• 6df2b92bc6 增加IM接口 chc 2023-01-31 18:03:14 +08:00
• 8c38c9e145 fix: 修复会员签到判断条件错误问题 misworga831 2023-01-31 16:45:23 +08:00
• 501b9777b5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-01-29 10:02:50 +08:00
• 8fc18458c2 冲突处理 Chopper711 2023-01-29 10:02:44 +08:00
• 457793b4d2 订单选择自提提示无法配送问题 chc 2023-01-19 17:27:21 +08:00
• 4bb00bc006 删除缓存修复 Chopper 2023-01-16 14:56:41 +08:00
• 1a0515361e Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 17600048398 2023-01-13 17:10:27 +08:00
• 2df8df1a0d im功能拆分 17600048398 2023-01-13 17:10:15 +08:00
• 96a9a32079 fix: 增加获取购物车商品日志，修复可能出现的获取购物车空指针问题 misworga831 2023-01-13 14:37:13 +08:00
• 5d6b475e09 fix: 增加获取购物车商品日志，修复可能出现的获取购物车空指针问题 misworga831 2023-01-13 14:22:44 +08:00
• cb3eca29d8 店铺更新店铺信息，缓存未同步问题处理 Chopper711 2023-01-13 10:07:57 +08:00
• bdb62de868 im问题部分处理 Chopper711 2023-01-12 15:44:44 +08:00
• b416e56b98 Merge pull request #75 misworga831 2023-01-11 11:38:47 +08:00
• 1728be9c36 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-01-11 11:38:12 +08:00
• ea85710c05 优惠券活动领取周期问题 Chopper711 2023-01-11 11:38:01 +08:00
• e1af67beb3 !256 resolve issue Merge pull request !256 from OceansDeep/feature/pg OceansDeep 2023-01-11 03:36:50 +00:00
• d9de601e8a 售后数量问题梳理解决 Chopper711 2023-01-11 11:34:54 +08:00
• 3c568a7d42 fix: 修复商品索引初始化时，店铺全品类优惠券和平台全品类优惠券没有区分问题 paulGao 2023-01-11 11:32:27 +08:00
• 5080cf65c7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2023-01-10 14:34:52 +08:00
• eefca656c6 fix: 优化会员优惠券搜索 paulGao 2023-01-10 14:34:48 +08:00
• 3a63f87807 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-01-10 09:25:24 +08:00
• d71628adfe 多websocket掉线问题处理 Chopper711 2023-01-10 09:25:18 +08:00
• 585fc96bca 历史足迹sql chc 2023-01-10 09:11:37 +08:00
• 28b1820bfa 历史足迹sql chc 2023-01-10 09:11:13 +08:00
• 85e74014b1 im和自提的SQL chc 2023-01-09 18:33:53 +08:00
• cc12cecc2a merge 自提、IM功能 Chopper711 2023-01-09 18:00:40 +08:00
• 197a7bcc43 '秒杀活动额外适配' Chopper711 2023-01-09 11:21:46 +08:00
• 613f397c33 '优惠券领取改良完成' Chopper711 2023-01-05 18:02:40 +08:00
• a3bd0f2c0b Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop pikachu1995@126.com 2023-01-05 15:31:22 +08:00
• bda297b90d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2023-01-05 14:39:33 +08:00
• 8ddba831f0 feat: 增加根据促销活动搜索商品索引。增加获取优惠券领取记录。增加优惠券关闭后同时作废所有会员领取的优惠券。 paulGao 2023-01-05 14:39:23 +08:00
• 5218702005 '商品索引空处理' Chopper711 2023-01-03 11:52:30 +08:00
• fbabd2f340 '快递鸟报错兼容问题' Chopper711 2023-01-03 11:52:02 +08:00
• a38bc6b534 IM功能 chc 2023-01-03 09:30:43 +08:00
• 73aa36fc69 IM消息功能 chc 2022-12-27 18:14:47 +08:00
• d627fca7d6 分销员 分销佣金添加默认值 pikachu1995@126.com 2022-12-27 16:35:07 +08:00
• 06325a7ce1 '促销详情完善' Chopper711 2022-12-26 19:00:13 +08:00
• 903b779ebe '价格记录详细处理' Chopper711 2022-12-26 10:55:37 +08:00
• 0e3d582d13 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2022-12-23 15:13:08 +08:00
• cd17f3d755 '构建促销详情模型' Chopper711 2022-12-23 15:13:05 +08:00
• 8543a228fd '优惠券功能改版' Chopper711 2022-12-23 14:51:06 +08:00
• b97c8e7fda 商品价格修改后同步到购物车 chc 2022-12-22 18:19:52 +08:00
• 1346614a30 站点图标与logo分开添加与展示 chc 2022-12-22 15:17:54 +08:00
• 0eec40673f Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-12-07 15:17:12 +08:00
• 602678e2b9 '搜索商品功能过滤关键字以及特殊字符' Chopper711 2022-12-07 15:14:25 +08:00
• d6393e39f7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2022-12-07 09:49:15 +08:00
• b3f22866b5 '店铺申请流程规范化，防止恶意攻击' Chopper711 2022-12-07 09:38:10 +08:00
• 51d2880392 '增加优惠券关闭作废优惠券' Chopper711 2022-12-07 09:37:50 +08:00
• ede7a37e37 fix: 修复修改商品库存时，促销商品库存没有同步修改问题 paulGao 2022-12-05 17:17:05 +08:00
• 8373303651 储存OrderVO的订单货物列表错误。 pikachu1995@126.com 2022-12-05 11:30:32 +08:00
• f3ccabe253 !255 fix: 优化es价格搜索，设置超出限制，则默认搜索最大值 Merge pull request !255 from OceansDeep/feature/pg OceansDeep 2022-11-29 07:04:32 +00:00
• ba6bb56e81 fix: 优化es价格搜索，设置超出限制，则默认搜索最大值 paulGao 2022-11-29 15:03:16 +08:00
• 73124f016d !254 fix: 优化批发商品，没有匹配规则时，显示异常，不在默认为第一个规则 Merge pull request !254 from OceansDeep/feature/pg OceansDeep 2022-11-28 10:30:35 +00:00
• 32ca2e4298 fix: 优化批发商品，没有匹配规则时，提示的错误信息 paulGao 2022-11-28 15:47:41 +08:00
• 1cc7486b0a fix: 优化批发商品，没有匹配规则时，显示异常，不在默认为第一个规则 paulGao 2022-11-28 10:52:34 +08:00
• 26b58442c5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-11-28 10:44:33 +08:00
• 20de17bef1 重复签到 lilili 2022-11-27 20:13:15 +08:00
• 54e04be768 im chc 2022-11-24 18:13:30 +08:00
• 49b517f1ab im chc 2022-11-23 18:44:54 +08:00
• fc71d2d1ca Merge branch 'lili_self' of https://gitee.com/beijing_hongye_huicheng/lilishop into lili_self chc 2022-11-22 17:32:20 +08:00
• 340b5b7248 im chc 2022-11-22 17:31:45 +08:00
• cfd292ef18 自提 chc 2022-11-22 17:20:17 +08:00
• f7ea17a9cf Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-11-22 15:29:27 +08:00
• 096ab34ae8 fix: 优化文件上传，删除冗余文件 paulGao 2022-11-22 15:29:22 +08:00
• e72b35c7eb update LICENSE. Chopper711 2022-11-21 03:21:52 +00:00
• 9141f21cf8 LICENSE Chopper711 2022-11-21 03:02:55 +00:00
• 65d9efef94 fix: 增加店员错误信息回 显 paulGao 2022-11-18 10:15:50 +08:00
• c5b19db662 !253 fix: 修复下载商品导入模版错误问题 Merge pull request !253 from OceansDeep/feature/pg OceansDeep 2022-11-17 10:36:42 +00:00