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

• 626e58b515 !86 修复结算时促销为空的问题 Merge pull request !86 from OceansDeep/feature/pg OceansDeep 2021-12-22 08:51:27 +00:00
• 787617f504 修复结算时促销为空的问题 paulGao 2021-12-22 16:50:50 +08:00
• 3fb4e488bb !85 修复结算时无促销报错问题 Merge pull request !85 from OceansDeep/feature/pg OceansDeep 2021-12-22 07:40:24 +00:00
• c5187a63b9 修复结算时无促销报错问题 paulGao 2021-12-22 15:34:20 +08:00
• e5f725cf16 索引初始化对商品删除与否增加判定 Chopper 2021-12-22 12:51:33 +08:00
• 3d56c9cc81 商品非空判定处理 Chopper 2021-12-22 12:42:04 +08:00
• 0ae1ae5df4 如果无法获取到消息，则不记录足迹，不再抛出异常 Chopper 2021-12-22 12:27:46 +08:00
• c0c530adad 增加对商品为空的判定 Chopper 2021-12-22 12:22:52 +08:00
• e962a594ba 商品信息获取逻辑调整 Chopper 2021-12-22 12:13:43 +08:00
• 0ac7900948 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-21 19:29:59 +08:00
• 6748b2911a 去除一个无效的类 Chopper 2021-12-21 19:29:54 +08:00
• 3e4152fd9b !84 优化促销。移除结算时促销的依赖。规范部分isxxx字段命名 Merge pull request !84 from OceansDeep/feature/pg OceansDeep 2021-12-21 10:58:54 +00:00
• 7dfffd60b8 merge master paulGao 2021-12-21 18:56:39 +08:00
• 3ba4d24041 优化促销。移除结算时促销的依赖。规范部分isxxx字段命名 paulGao 2021-12-21 18:54:11 +08:00
• e99d0f45fd 修改一个错误的非空判断 Chopper 2021-12-21 16:59:57 +08:00
• 351745d31f 促销类型错误的写入一个促销状态字段问题处理 Chopper 2021-12-21 16:08:24 +08:00
• bfa960d803 管理端商品上下架问题处理 Chopper 2021-12-21 14:47:39 +08:00
• 7572e8d56f 解决如果商品sku参数为空等异常情况导致无法发布的问题 Chopper 2021-12-21 11:33:55 +08:00
• 82e773243f 增加readme描述 Chopper 2021-12-21 10:38:02 +08:00
• 795440850b 更名 Chopper 2021-12-21 10:27:22 +08:00
• 6adcb46f29 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-21 10:25:45 +08:00
• 6cd31e630c 更新升级sql Chopper 2021-12-21 10:25:38 +08:00
• 23b3e72579 '商品es初始化索引问题' fengtianyangyang 2021-12-20 14:56:17 +08:00
• bda7a12c2a '商品es索引初始化问题' fengtianyangyang 2021-12-20 14:38:41 +08:00
• e8f44ef6f2 短信验证码缓存key未包含uuid问题处理 Chopper 2021-12-20 09:37:34 +08:00
• e4047fbd30 merge branch "master" paulGao 2021-12-16 15:02:54 +08:00
• 7dcdb43acf 优化促销相关代码，修复bug paulGao 2021-12-16 15:02:06 +08:00
• 9f75e1fae8 sql描述文字优化 Chopper 2021-12-16 09:33:37 +08:00
• 78c0de664c 优化数据库提示语 Chopper 2021-12-16 09:30:26 +08:00
• efc4b37782 'RequestMapping请求路径统一处理' fengtianyangyang 2021-12-15 18:32:59 +08:00
• 6253590326 !82 修复查询积分商品参数问题 Merge pull request !82 from OceansDeep/feature/pg OceansDeep 2021-12-15 09:59:54 +00:00
• f0b43ddd32 修复查询积分商品参数问题 paulGao 2021-12-15 17:58:55 +08:00
• 51e7b4f15d !81 修复查询积分商品sql语句错误问题 Merge pull request !81 from OceansDeep/feature/pg OceansDeep 2021-12-15 09:43:22 +00:00
• 0ef244b373 移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题 paulGao 2021-12-15 17:42:03 +08:00
• 97a1502eb2 !80 修复查询积分商品参数问题 Merge pull request !80 from OceansDeep/feature/pg OceansDeep 2021-12-15 09:32:39 +00:00
• 2536e3b9f6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-12-15 17:32:02 +08:00
• 7aed7254a0 修复查询积分商品参数问题 paulGao 2021-12-15 17:31:39 +08:00
• 44e061f321 !79 修复商品审核关闭后，修改商品不生成索引问题。升级mybatis-plus和hutool版本 Merge pull request !79 from OceansDeep/feature/pg OceansDeep 2021-12-15 03:37:52 +00:00
• a9ddcfeb95 修复商品审核关闭后，修改商品不生成索引问题。升级mybatis-plus版本至 3.4.3.4 和hutool版本至 5.7.16。适配新版本mybatis-plus paulGao 2021-12-15 11:35:41 +08:00
• 822e332aaa !78 移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题 Merge pull request !78 from OceansDeep/feature/pg OceansDeep 2021-12-13 10:18:58 +00:00
• c3fbad7dbf 移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题 paulGao 2021-12-13 18:15:37 +08:00
• 07348357d0 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-13 16:22:27 +08:00
• 947fc457f2 修改im平台id字段类型为string Chopper 2021-12-13 16:21:59 +08:00
• b719e96838 !77 修复获取拼团订单时，搜索条件默认锁定了当前会员id问题 Merge pull request !77 from OceansDeep/feature/pg OceansDeep 2021-12-13 06:50:50 +00:00
• cafeb1f20f 修复获取拼团订单时，搜索条件默认锁定了当前会员id问题 paulGao 2021-12-13 14:49:57 +08:00
• 9ae798a11a !76 修复无登录用户时，查询报错 Merge pull request !76 from OceansDeep/feature/pg OceansDeep 2021-12-13 04:28:37 +00:00
• d188068b10 修复无登录用户时，查询报错 paulGao 2021-12-13 12:27:13 +08:00
• abb4b8cb66 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-13 09:32:14 +08:00
• ef8615cfe5 支付时间为空问题处理 Chopper 2021-12-13 09:32:10 +08:00
• ee0cb6d225 !75 修复秒杀统计根据状态查询bug Merge pull request !75 from OceansDeep/feature/pg OceansDeep 2021-12-13 01:15:16 +00:00
• 0da8f7f8f6 修复秒杀统计根据状态查询bug paulGao 2021-12-13 09:13:45 +08:00
• f8b44d9f9b !73 【轻量级 PR】：避免redis缓存二次读取 Merge pull request !73 from yk_ang/master chopper711 2021-12-13 01:08:48 +00:00
• b55f5ab6ae !74 重构优化促销模块。移除促销相关的mongo Merge pull request !74 from OceansDeep/feature/pg OceansDeep 2021-12-12 17:09:36 +00:00
• 90e550934d merge branch "master" paulGao 2021-12-11 17:45:25 +08:00
• ff757d2151 避免redis缓存二次读取。 yangkang 2021-12-11 16:07:41 +08:00
• a3f838d8e6 Merge remote-tracking branch 'origin/master' yangkang 2021-12-11 15:58:36 +08:00
• d9d19f8cbd 重构优化促销模块。移除促销相关的mongo paulGao 2021-12-10 20:15:03 +08:00
• 036ad6defb 店铺udesk设置支持 Chopper 2021-12-09 19:52:40 +08:00
• 520c09b801 当用户一个权限都没有时，会导致用户无法进入管理端页面，问题修复 Chopper 2021-12-08 20:21:51 +08:00
• f850e4adaa 日志打印更完善 Chopper 2021-12-08 19:53:29 +08:00
• 450041bb02 权限非空判定问题处理 Chopper 2021-12-08 19:35:18 +08:00
• 2e99c26654 权限为空时问题处理 Chopper 2021-12-08 19:26:37 +08:00
• 2e5f383db4 店铺流水查询交互参数从querywrapper调整为DTO Chopper 2021-12-08 14:36:14 +08:00
• 357b214192 店铺流水业务模块参数解耦 Chopper 2021-12-08 11:39:09 +08:00
• c301c55905 去除无效引用 Chopper 2021-12-08 10:42:15 +08:00
• 1764e6956b 售后与子订单模块参数解耦 Chopper 2021-12-08 10:40:45 +08:00
• a7509e1125 微信服务与端链接传递参数为querywrapper调整 Chopper 2021-12-08 10:03:34 +08:00
• 9ec3322574 商品模块与店铺模块交接处以query wrapper衔接存在问题，改用普通参数 Chopper 2021-12-08 09:50:19 +08:00
• 3658f027bb Merge remote-tracking branch 'origin/master' yangkang 2021-12-07 19:45:41 +08:00
• 9a04bb2d71 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-07 18:15:25 +08:00
• 343e5e332c 店铺首页统计bug代码修复 Chopper 2021-12-07 18:15:18 +08:00
• 28a6cf1cb1 Merge remote-tracking branch 'origin/master' yangkang 2021-12-07 17:43:42 +08:00
• e2777b2f0a !72 模块继续分离，包含一个错误读取两次库存的问题修改，会员消息模块/微信模块/消息模块独立，分销模块拆离 Merge pull request !72 from chopper711/liushuai chopper711 2021-12-07 08:37:22 +00:00
• d8da258898 分销模块拆离 Chopper 2021-12-07 09:00:59 +08:00
• 8616854e00 消息模块，会员模块，微信模块独立 Chopper 2021-12-07 05:47:17 +08:00
• 7b98d1d9d0 几个代码编译问题处理 Chopper 2021-12-07 04:33:51 +08:00
• b8b14df39b message模块拆离优化 Chopper 2021-12-07 04:12:51 +08:00
• 8ddf622d0f Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-06 17:45:31 +08:00
• 00ffd246a9 业务代码模块trade统一更名为order Chopper 2021-12-06 17:45:16 +08:00
• ac86715062 Merge remote-tracking branch 'origin/master' yangkang 2021-12-06 16:58:14 +08:00
• 2c8df21671 Merge remote-tracking branch 'origin/master' yangkang 2021-12-06 16:55:48 +08:00
• d16cf44f4a 获取两次商品库存代码优化 Chopper 2021-12-06 15:59:13 +08:00
• 6d3fbd7cf0 !71 业务代码拆分优化 Merge pull request !71 from chopper711/liushuai chopper711 2021-12-06 07:40:54 +00:00
• f9f723c47a !70 修复store/promotion/pintuan这个接口中，获取拼团列表查询bug。 Merge pull request !70 from yk_ang/master chopper711 2021-12-06 07:40:19 +00:00
• 3ac28ac218 修复store/promotion/pintuan这个接口中，获取拼团列表查询bug。 yangkang 2021-12-06 15:18:03 +08:00
• ece66ba16a 修复store/promotion/pintuan这个接口中，获取拼团列表查询bug。 yangkang 2021-12-06 15:18:03 +08:00
• f24019d306 订单流水与订单业务重叠代码优化 Chopper 2021-12-06 15:07:28 +08:00
• ea80777ef6 优化代码结构 Chopper 2021-12-06 14:57:29 +08:00
• f7ab6dc6ae 统计模块继续独立，拆分业务 Chopper 2021-12-06 11:37:21 +08:00
• a8698fbd1a 迁移会员统计业务至统计模块 Chopper 2021-12-06 11:12:00 +08:00
• 62b5162c7e 去除无效引用 Chopper 2021-12-06 11:02:42 +08:00
• aa9466b8d1 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-12-03 18:31:30 +08:00
• 70b12dfd3e 统计模块隔离业务，重构统计模块 Chopper 2021-12-03 18:31:14 +08:00
• 0912872de2 !69 去除多余的对象和引用。 Merge pull request !69 from yk_ang/master chopper711 2021-12-03 06:12:41 +00:00
• 9016090c67 去掉无用的对象和引用。 yangkang 2021-12-03 12:40:37 +08:00
• 79e4386d1e !68 去除无效类，优化无效引用 Merge pull request !68 from chopper711/liushuai chopper711 2021-12-03 02:34:25 +00:00
• 5e4973fae5 去除无效的工具类 Chopper 2021-12-03 10:25:08 +08:00
• 4228ac4570 es无效引用 Chopper 2021-12-02 19:49:26 +08:00
• 152dbac29d !67 mq订阅标签规范代码 店铺流水调用售后模块直接船渡wrapper调整 去除无效的注解 Merge pull request !67 from chopper711/liushuai chopper711 2021-12-02 09:07:01 +00:00
• 2241e90798 去除无效的注解 Chopper 2021-12-02 17:05:58 +08:00