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

• d3910bb931 update readme Chopper711 2023-08-16 11:49:34 +08:00
• 7cac57bd79 update readme Chopper711 2023-08-16 11:46:42 +08:00
• 07874ca210 Merge pull request #91 misworga831 2023-08-16 10:54:21 +08:00
• 0267597b20 fix: 联合登录 chc 2023-08-14 14:30:21 +08:00
• 1cc939f457 fix : 行政地区无法删除或修改，由于缓存没有被清空导致问题处理 Chopper711 2023-08-10 16:08:23 +08:00
• b12245bb94 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-08-10 13:34:09 +08:00
• 006ec15000 fix:砍价商品活动结束后，点击跳转后报错信息优化 Chopper711 2023-08-10 13:34:07 +08:00
• 4f4593e5f7 fix: 优化微信登录异常问题 misworga831 2023-08-10 11:52:36 +08:00
• 58ff71a863 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop pikachu1995@126.com 2023-08-04 18:23:09 +08:00
• 7d8a31c55a APP端第三方登录 pikachu1995@126.com 2023-08-04 18:23:03 +08:00
• 29e6637399 !301 fix & improve Merge pull request !301 from OceansDeep/pg OceansDeep 2023-08-03 08:18:06 +00:00
• d61fc41465 fix: 优化消费者部分异常处理 misworga831 2023-08-03 16:16:55 +08:00
• 1cc692a3c9 fix: 优化消费者部分异常处理 misworga831 2023-08-03 16:13:52 +08:00
• a2a1bed3e0 !300 fix & improve Merge pull request !300 from OceansDeep/pg OceansDeep 2023-08-03 07:58:37 +00:00
• 557366a3ec fix: 优化elasticsearch 配置，解决I/O reactor问题。 misworga831 2023-08-03 15:57:57 +08:00
• 80c8b4b4d4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-08-03 12:57:08 +08:00
• 9dd6bc2d6f fix:地区修改后不生效，需要清空缓存才能得到最新的数据问题处理 Chopper711 2023-08-03 12:57:01 +08:00
• 9c1db92824 腾讯云COS 使用地域标识路径 pikachu1995@126.com 2023-07-31 15:35:15 +08:00
• e3172c28b7 Merge pull request #90 misworga831 2023-07-28 16:20:10 +08:00
• b0b3747760 !299 fix & improve Merge pull request !299 from OceansDeep/pg OceansDeep 2023-07-28 08:18:04 +00:00
• e8af34995b fix: 优化elasticsearch 配置，解决I/O reactor问题。 misworga831 2023-07-28 16:16:16 +08:00
• 9f17dcafbb 商品导入消息不够明确问题处理 Chopper711 2023-07-21 18:45:00 +08:00
• 347877cdad Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-07-21 18:30:01 +08:00
• 8f1541c338 fix:秒杀活动异常消息resultcode 修正 Chopper711 2023-07-21 18:29:58 +08:00
• 89f3e8f980 fix: sku的商品视频 chc 2023-07-20 14:23:12 +08:00
• e945f93032 !297 fix & improve Merge pull request !297 from OceansDeep/pg OceansDeep 2023-07-19 03:11:19 +00:00
• 4f9841d443 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-07-19 11:10:40 +08:00
• c73204a828 fix: 增加文件上传类型，video格式支持 misworga831 2023-07-19 11:10:19 +08:00
• b2681d443d !296 fix: 优化拼团活动流程，活动结束时间小于24小时则按照拼团结束时间延时 Merge pull request !296 from OceansDeep/pg OceansDeep 2023-07-17 09:57:15 +00:00
• 05a1d880c5 Merge pull request #89 misworga831 2023-07-17 17:56:39 +08:00
• 7b13ae13ad fix: 优化拼团活动流程，活动结束时间小于24小时则按照拼团结束时间延时 misworga831 2023-07-17 17:55:34 +08:00
• ecb330cc57 fix:删除遗留引用 pikachu1995@126.com 2023-07-13 16:04:35 +08:00
• af5e866853 不同的对象存储渠道有不同的图片压缩规则。 pikachu1995@126.com 2023-07-13 16:03:38 +08:00
• 007b145c2e !295 fix & improve Merge pull request !295 from OceansDeep/pg OceansDeep 2023-06-16 09:01:20 +00:00
• 201943994b fix: 修复添加管理员失败无信息提示 misworga831 2023-06-16 16:21:57 +08:00
• b17f3c08b7 Merge pull request #88 misworga831 2023-06-13 10:51:59 +08:00
• c46c59e4a1 !294 fix: 修复移除@Resource后的订单每日任务，执行sql错误问题 Merge pull request !294 from OceansDeep/pg OceansDeep 2023-06-13 02:49:56 +00:00
• 0bdb39797d fix: 修复移除@Resource后的订单每日任务，执行sql错误问题 misworga831 2023-06-13 10:48:03 +08:00
• 71061ad861 fix:用户足迹的处理sql已经在逻辑中处理好了数据问题，这这里的事务在特殊情况下会导致sql异常，将非必要的事务注解去除即可。 Chopper711 2023-06-09 15:42:50 +08:00
• f14875e679 fix:在redis集群中，促销库存与商品库存不在同一个槽内会导致执行异常 Chopper711 2023-06-09 15:27:56 +08:00
• e8a1f6a02f Merge pull request #87 misworga831 2023-06-07 11:08:31 +08:00
• 036035f51b !292 fix & improve Merge pull request !292 from OceansDeep/pg OceansDeep 2023-06-06 11:14:20 +00:00
• 104b6c2f5d fix: 修复权限更新后，登录用户权限没有更新问题。 misworga831 2023-06-06 19:13:52 +08:00
• 7dffd7dcb9 !291 fix & improve Merge pull request !291 from OceansDeep/pg OceansDeep 2023-06-06 10:07:14 +00:00
• 63f1f0df21 fix: 修复权限更新后，登录用户权限没有更新问题。 misworga831 2023-06-06 18:06:41 +08:00
• dda955219a !290 fix & improve Merge pull request !290 from OceansDeep/pg OceansDeep 2023-06-06 09:27:11 +00:00
• 5d6e99dc8a fix: 移除@Resource注解，修复权限更新后，登录用户权限没有更新问题。 misworga831 2023-06-06 17:26:04 +08:00
• b61a5e8f7b style: 代码扫描规范问题处理 Chopper711 2023-06-05 10:05:40 +08:00
• d9018ef317 fix:邀新赠券邀请人信息写入代码被删除问题还原 Chopper711 2023-06-01 18:51:49 +08:00
• 9993b9bbf6 fix:虚拟成团无法成功触发问题处理 Chopper711 2023-05-31 15:42:17 +08:00
• 03fd9b222a !288 拼团订单延时任务优化 Merge pull request !288 from hucker520 Chopper711 2023-05-31 07:41:12 +00:00
• 3d7cfb1c63 fix:描述问题处理，将代码枚举注释更加接近逻辑寓意 Chopper711 2023-05-31 15:03:50 +08:00
• ca6e45fb92 fix: 重复退货时，商品数量问题处理 Chopper711 2023-05-31 15:02:22 +08:00
• e9950652a6 fix:缺少java引用问题处理 Chopper711 2023-05-31 13:43:43 +08:00
• cddc6571f7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-05-30 18:15:24 +08:00
• 708ba929f0 1 Chopper711 2023-05-30 18:15:22 +08:00
• 6e820d745c 触发器参数 object 是 PintuanOrderMessage 对象，见第35行，直接转为 Pintuan 对象必为空，须要根据id重新查询 hucker520 2023-05-26 09:02:41 +00:00
• ae9e0e27ff !287 分销订单列表查询结束时间优化 from@hucker520 Merge pull request !287 from hucker520/N/A Chopper711 2023-05-26 07:23:46 +00:00
• 3485c5a5dd 分销订单列表查询结束日期，默认查询到当天0点，导致当天0点后的订单查询不出来，优化后成查询到结束日期当天23:59:59:999 hucker520 2023-05-26 03:33:55 +00:00
• 62ac16b705 Merge pull request #86 misworga831 2023-05-17 14:23:10 +08:00
• 048ca0e64a !286 fix & improve Merge pull request !286 from OceansDeep/pg OceansDeep 2023-05-17 06:17:41 +00:00
• d413de75d3 fix: 修复购物车商品促销价格特殊情况处理中优惠券金额为0的情况（购物车商品促销价格特殊情况处理只处理优惠券不足的情况） misworga831 2023-05-17 14:16:16 +08:00
• 4f8d4f7a74 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-05-11 11:21:34 +08:00
• a0619abfc4 补充参考配置文档 Chopper711 2023-05-11 11:21:27 +08:00
• 5e950b9766 !285 fix & improve Merge pull request !285 from OceansDeep/pg OceansDeep 2023-05-10 06:53:45 +00:00
• 1f02818692 fix: 优化购物车商品促销价格特殊情况处理 misworga831 2023-05-10 14:50:19 +08:00
• c0a370ad47 fix:交易投诉，交易售后，兼容设置中描述的内容：设置为0则表示不限制 Chopper711 2023-05-10 14:44:55 +08:00
• a502420c5f refactor: 去除两个无效引用 Chopper711 2023-05-10 14:07:30 +08:00
• b4aef1461c fix: 订单定时任务可能存在极端情况，影响其他业务流程，做一下兼容处理，以免部分数据导致订单定时任务无法处理 Chopper711 2023-05-10 14:03:16 +08:00
• 54b40c35f4 !284 fix & improve Merge pull request !284 from OceansDeep/pg OceansDeep 2023-05-09 06:01:31 +00:00
• a33e053bc7 fix: 特殊情况处理，如参与多个促销活动，部分商品在其他促销计算后的金额不足以满足与当前参与的促销活动的优惠金额 misworga831 2023-05-09 13:59:55 +08:00
• ae93661763 fix: 优化es搜索，增加如搜索超过10000条信息的处理 misworga831 2023-05-09 13:59:23 +08:00
• 349bee7405 !283 fix & improve Merge pull request !283 from OceansDeep/pg OceansDeep 2023-05-08 10:50:06 +00:00
• c286d05ad8 fix: 促销状态更新和满减活动范围商品判定 misworga831 2023-05-08 18:49:37 +08:00
• 49b2c2f7a3 fix: 导入商品增加填写验证 chc 2023-05-08 18:35:57 +08:00
• b469fcfee3 Merge remote-tracking branch 'origin/master' chc 2023-05-08 17:59:09 +08:00
• 5e6fde594b fix: 店铺设置是自提、楼层为空导致无法保存 chc 2023-05-08 17:59:01 +08:00
• 5d598d9034 !282 优化es生成索引sku取分可能为复数问题 Merge pull request !282 from OceansDeep/pg OceansDeep 2023-05-08 09:38:19 +00:00
• 8181f2602a fix: 优化es生成索引sku取分可能为复数问题 misworga831 2023-05-08 17:37:29 +08:00
• 3e74697215 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-05-08 16:51:01 +08:00
• fac10debd5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-05-06 16:32:48 +08:00
• 74941f7243 feat: 兼容提现失败场景，对失败消息持久化 Chopper711 2023-05-06 16:32:42 +08:00
• 621b2e322c fix: 快递鸟抛出异常 chc 2023-05-05 13:40:38 +08:00
• 948b67558a 微信小程序/公众号发送消息。 pikachu1995@126.com 2023-05-05 07:12:39 +08:00
• dcf48db2ac fix:用户后期通过小程序登录，保存用户手机号 pikachu1995@126.com 2023-04-28 08:47:09 +08:00
• 072d31e8df fix:微信小程序登录记录手机号信息 pikachu1995@126.com 2023-04-26 05:58:56 +08:00
• 25240f445d fix:阿里登录没有传source pikachu1995@126.com 2023-04-25 18:40:39 +08:00
• 279b473793 使用手机号为唯一身份进行登录 pikachu1995@126.com 2023-04-25 17:59:42 +08:00
• 959e24f51b fix:使用用户openID错误 pikachu1995@126.com 2023-04-25 14:16:36 +08:00
• c720d53389 fix:合并代码错误，解决小程序无法登录问题。 pikachu1995@126.com 2023-04-25 14:01:49 +08:00
• 335d3f7ff1 1.修改商品分类同步分类名称 2.修改店铺名称同步对应店铺名称场景 17600048398 2023-04-25 11:31:54 +08:00
• 16608d4950 fix:售后日志注解异常抛出问题 Chopper711 2023-04-19 16:16:01 +08:00
• 7b6a150bd2 fix: 用户被禁用、店铺被禁用、管理员被禁用，token未被清除问题处理。 Chopper711 2023-04-19 12:08:47 +08:00
• 1f21d80dc0 用户签到为空时 无法签到问题 17600048398 2023-04-18 10:57:41 +08:00
• 76c8a23721 Merge pull request #85 misworga831 2023-04-18 10:36:44 +08:00
• 08933ad92f fix: 优化足迹搜索 misworga831 2023-04-18 10:35:56 +08:00
• 06d0fb5b86 Merge pull request #83 misworga831 2023-04-17 16:42:37 +08:00
• 05c3c8a80c !279 fix: 优化足迹搜索 Merge pull request !279 from OceansDeep/pg OceansDeep 2023-04-17 07:38:52 +00:00
• 41796774dc fix: 优化足迹搜索 misworga831 2023-04-17 15:37:05 +08:00
• 4594752470 签到代码问题回滚 Chopper711 2023-04-14 18:29:51 +08:00