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

• d818b396c4 fix: 腾讯云COS问题处理 chc 2023-04-14 11:20:54 +08:00
• cf7b333662 !278 fix & improve Merge pull request !278 from OceansDeep/pg OceansDeep 2023-04-13 07:45:50 +00:00
• 7cc0a90acf fix: 修复签到条件判定错误问题 misworga831 2023-04-13 15:44:40 +08:00
• f9eed2f2ab Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-04-13 15:38:02 +08:00
• f8ff163aee fix: 审核商铺后删除缓存 chc 2023-04-13 15:04:32 +08:00
• 38ad5bb394 fix: 优化更新促销状态流程，增加促销检查 misworga831 2023-04-12 16:13:29 +08:00
• b2fb415ab5 fix: 优化足迹搜索 misworga831 2023-04-12 16:12:53 +08:00
• 4c03676a3e !269 存在问题 Merge pull request !269 from zhaoyang0415/N/A 最菜的蔡 2023-04-11 09:03:38 +00:00
• efce977bd6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-04-10 18:26:43 +08:00
• 071974c74b fix:足迹保留100条 Chopper711 2023-04-10 18:26:39 +08:00
• 7f202506b5 !277 fix & improve Merge pull request !277 from OceansDeep/pg OceansDeep 2023-04-10 10:13:06 +00:00
• a9c9886210 fix: 优化购物车对于更新商品的检查验证 misworga831 2023-04-10 14:43:47 +08:00
• e18b62da6e fix: 优化促销相关流程，修复部分促销相关bug。 misworga831 2023-04-10 14:43:04 +08:00
• 59c6dedd35 merge master Chopper711 2023-04-10 10:06:34 +08:00
• a673db222e refactor:微信小程序登录兼容没有手机号的情况 Chopper711 2023-04-10 10:04:41 +08:00
• 1cb72a5bdd Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-04-10 09:58:38 +08:00
• c1e45242a7 fix: 优化编辑商品，没有清除商品缓存问题 misworga831 2023-04-07 16:47:32 +08:00
• efe9a1a6e4 fix: 修复管理员修改会员收货地址无效问题 misworga831 2023-04-07 16:45:50 +08:00
• e91f0e7ee4 !276 fix & improve Merge pull request !276 from OceansDeep/pg OceansDeep 2023-04-06 02:30:29 +00:00
• 3716691366 merge code misworga831 2023-04-06 10:29:47 +08:00
• 675830045d fix: 修复更新es商品索引促销信息时，批量更新分页起始页错误问题 misworga831 2023-04-06 10:28:54 +08:00
• 9294f77163 微信小程序登录错误 pikachu1995@126.com 2023-04-06 08:16:23 +08:00
• 864701adfb wrapper 错误 pikachu1995@126.com 2023-04-05 10:28:19 +08:00
• 81f47a7fb6 fix: 优惠券时间查询问题 chc 2023-04-04 17:55:47 +08:00
• a56ceca3c5 !275 fix: 优化生成es索引，只生成库存大于0的商品 Merge pull request !275 from OceansDeep/pg OceansDeep 2023-03-31 10:42:29 +00:00
• bc670d263d fix: 优化生成es索引，只生成库存大于0的商品 misworga831 2023-03-31 18:23:30 +08:00
• 36068d7197 !274 fix & improve Merge pull request !274 from OceansDeep/pg OceansDeep 2023-03-31 09:15:41 +00:00
• 4ebe0d4f43 fix: 优化生成es索引，只生成库存大于0的商品 misworga831 2023-03-31 16:58:34 +08:00
• 9f01078fe0 feat: 升级druid依赖，解决mysql一直打印日志问题 misworga831 2023-03-31 16:50:53 +08:00
• b07fc790e5 fix: 优化es商品搜索返回结果。减少重复返回结果 misworga831 2023-03-31 16:49:42 +08:00
• ab2bb11eee fix: 增加mac m芯片启动支持 misworga831 2023-03-31 16:48:43 +08:00
• 919367162b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-03-31 15:22:55 +08:00
• ec4d91b37f 修改资源目录 Chopper711 2023-03-31 15:22:48 +08:00
• 799aa8f90c Merge pull request #82 misworga831 2023-03-30 16:06:22 +08:00
• cfbd1d68ee !273 fix: 优化es日志createTime类型 Merge pull request !273 from OceansDeep/pg OceansDeep 2023-03-30 08:05:22 +00:00
• 4cf8c4e81f Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-03-30 16:02:52 +08:00
• 87bde2c53f fix: 优化es日志createTime类型 misworga831 2023-03-30 16:02:41 +08:00
• 2aaf677605 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-03-29 16:05:04 +08:00
• fad7c4a39d fix: 商家修改商品价格后，购物车的商品价格不变动不提示问题。购物车sku集合引用地址修改无效导致。 Chopper711 2023-03-29 16:04:53 +08:00
• fc464c0564 !271 fix Merge pull request !271 from OceansDeep/pg OceansDeep 2023-03-27 07:24:56 +00:00
• 53c28359bb fix: 优化es搜索相关品牌、分类及属性为分页查询。修改全部查询可能会导致es默认返回集不能大于100m问题 misworga831 2023-03-27 15:24:18 +08:00
• 4737cc5ae8 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop pikachu1995@126.com 2023-03-27 11:01:21 +08:00
• 97845bbaf5 修改订单金额不能小于等于0 pikachu1995@126.com 2023-03-27 11:00:50 +08:00
• 8f516f7be7 fix: 修改商品后清除商品缓存，修改Store、StoreServiceImpl的注释 chc 2023-03-24 18:30:55 +08:00
• 5c164f89cc fix: config/application.yml 地址更改127 chc 2023-03-24 17:39:43 +08:00
• da28859398 fix: 关闭物流公司无效问题 chc 2023-03-24 16:27:20 +08:00
• 25f8b103bf fix:代码中两次对店铺进行保存问题处理，以及店铺写入属性的无效代码去除 Chopper711 2023-03-23 16:54:28 +08:00
• 8b0513aece Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-03-23 16:45:21 +08:00
• b95712aef3 fix: 店铺被拒绝后无法再次申请店铺问题修正。修改为店铺状态在申请中、开启、关闭状态时无法申请 Chopper711 2023-03-23 16:45:14 +08:00
• 917d9437b6 分销订单佣金结算 17600048398 2023-03-23 11:31:30 +08:00
• 123388d059 查询店铺详情实现中管理端操作是从缓存取得，状态更新后未及时清空缓存，导致详情信息不是最新的 zhaoyang0415 2023-03-23 02:33:19 +00:00
• 226d66c22e !268 优化、修复和升级 Merge pull request !268 from OceansDeep/pg OceansDeep 2023-03-23 02:01:47 +00:00
• d8f09b6039 Merge pull request #81 misworga831 2023-03-23 10:00:18 +08:00
• fae4dcaae2 fix: 优化会员优惠券退还后，可能无法再次使用问题。优化删除商品索引，可能失败问题 misworga831 2023-03-23 09:59:35 +08:00
• b957df648b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-03-23 09:56:25 +08:00
• a21f4800ab > feat: 新功能（feature）热词过滤sql注入关键字问题， Chopper711 2023-03-22 17:34:57 +08:00
• 4abf2205c1 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-03-21 14:39:57 +08:00
• 0c652eac63 fix: hutool 依赖更新,依赖优化，获取商品详情优化 misworga831 2023-03-21 14:39:53 +08:00
• 3fef330707 update README.md. Chopper711 2023-03-21 06:26:02 +00:00
• c2abc4e2e4 fix: 修复IM新用户与自己对话问题 chc 2023-03-20 12:03:34 +08:00
• d48e5a05a6 修改华为云obs引入版本 微信jsapi支付修改使用openID pikachu1995@126.com 2023-03-20 08:43:13 +08:00
• 72471168d7 更新read me 交流群 5 chc 2023-03-17 19:34:24 +08:00
• 08a2f7dfcd refactor:演示站点微信消息相关限制，由于出现部分微信消息被删问题 Chopper711 2023-03-17 08:57:01 +08:00
• ceb61318f0 refactor:代码逻辑可能出现问题，重构代码执行顺序 Chopper711 2023-03-17 08:55:25 +08:00
• 11778a632a Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-03-17 08:29:18 +08:00
• f3e11fd368 fix:店员可编辑店长问题处理 Chopper711 2023-03-17 08:29:15 +08:00
• 69fdd4b756 !260 修改 Merge pull request !260 from zhaoyang0415/N/A Chopper711 2023-03-16 11:09:06 +00:00
• 507a6e6525 !262 修改 Merge pull request !262 from zhaoyang0415/N/A Merge pull request !262 from zhaoyang0415/N/A Chopper711 2023-03-16 11:01:29 +00:00
• 82a9c6dbf7 分销金额显示错误 17600048398 2023-03-15 16:28:48 +08:00
• 21d66f719d 分销佣金为空时计算错误 17600048398 2023-03-15 16:22:03 +08:00
• c793c47d45 fix: 优化日志搜索，关闭商品删除索引 misworga831 2023-03-14 19:37:22 +08:00
• a81faf4ba4 fix : 批量商品选择状态问题 尝试处理 Chopper711 2023-03-13 16:09:51 +08:00
• e60d47163e Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-03-13 10:33:08 +08:00
• e7215cec9e improvement: 优化日志级别问题，减少无效日志输出 Chopper711 2023-03-13 10:33:01 +08:00
• f7e6789e23 会员收藏功能拆分 17600048398 2023-03-10 17:42:48 +08:00
• 4af58aea4a 商品结算时无快递费用 17600048398 2023-03-10 16:36:33 +08:00
• 4d379d6006 fix: 聊天无法获取问题 chc 2023-03-10 14:49:27 +08:00
• 519ccb7ddd fix: 足迹模块sql优化，增加事务控制 Chopper711 2023-03-10 10:38:46 +08:00
• 79ccab6869 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-03-10 09:37:34 +08:00
• ccac5226d5 fix: httpclient 在请求后会在final中进行关闭，导致无法再次请求 Chopper711 2023-03-10 09:37:11 +08:00
• 674e585eff 去除错误打印内容 pikachu1995@126.com 2023-03-10 07:45:56 +08:00
• 7e1b7f2725 微信小程序，添加来源 pikachu1995@126.com 2023-03-10 07:32:30 +08:00
• 256f2ba480 微信-公众号登录，还原内容 pikachu1995@126.com 2023-03-10 07:25:06 +08:00
• 72f63e7e31 修复：第三方登录(微信）重复赋值 pikachu1995@126.com 2023-03-10 07:14:23 +08:00
• 606f9d2ccf 添加第三方登录，判断是否为当前用户信息 pikachu1995@126.com 2023-03-10 06:46:21 +08:00
• 0261b7e9ab 小程序赋值unionId pikachu1995@126.com 2023-03-10 06:20:14 +08:00
• 71abf32d82 Merge branch 'master' into Bulbsaur pikachu1995@126.com 2023-03-09 17:57:52 +08:00
• f6030cc918 fix: 微信消息格式化问题处理，最新版本无法正常发送公众号消息问题处理。以及订单状态判定修复，之前存在消息发送状态判定错误问题 Chopper711 2023-03-09 16:54:47 +08:00
• f7ba021799 Merge pull request #80 misworga831 2023-03-09 16:45:27 +08:00
• f506fa86cc APP第三方信任登录通过unionid进行登录 pikachu1995@126.com 2023-03-09 15:39:50 +08:00
• 1a0130dd1a fix:微信消息发送字符串格式化问题导致无法正确发送消息，尝试解决 Chopper711 2023-03-09 11:55:45 +08:00
• 6f746e3aff 微信登录业务进行调整 pikachu1995@126.com 2023-03-08 19:44:06 +08:00
• 36a3a0a0e1 Merge branch 'master' into Bulbsaur pikachu1995@126.com 2023-03-08 18:27:39 +08:00
• 323e1cd6eb fix: ShunfengPlugin无法创建问题 chc 2023-03-08 18:07:14 +08:00
• 06fb54c65c feat: 集成顺丰开放平台功能,增加商家忘记密码,手机号登录功能 chc 2023-03-08 10:32:47 +08:00
• 07d4a2cda9 fix: 去除无用的ImUserController，调整IM代码 chc 2023-03-02 15:10:51 +08:00
• 53e753c3ef 解决问题：短信发送，未调用实际发送短信方法 pikachu1995@126.com 2023-03-02 11:00:05 +08:00
• 8d8cffca71 第三方登录集成unionID pikachu1995@126.com 2023-03-02 10:45:43 +08:00
• 352a19b91c 修改物流模板,清除商品缓存 chc 2023-03-01 17:09:20 +08:00
• 74972eaa37 合并master,解决冲突 pikachu1995@126.com 2023-03-01 11:50:54 +08:00