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

• 159fe37120 支持店铺通过excel批量更新商品库存功能 pikachu1995@126.com 2024-06-27 17:09:25 +08:00
• 6f9486f065 优化订单导出功能。 pikachu1995@126.com 2024-06-26 11:50:45 +08:00
• 94da71336a Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2024-06-18 09:55:21 +08:00
• 8c5ce396b2 fix: 2024-03-25被错误的修改一个问题，导致分销订单无法结算，当前 commit 修复问题并优化问题，解决可能出现的事务问题，采用一条 sql 执行 Chopper711 2024-06-18 09:55:15 +08:00
• 0063820fdf !351 fix & improve Merge pull request !351 from OceansDeep/pg OceansDeep 2024-06-17 10:41:51 +00:00
• fe80edebbd fix: 修复 精确发券 类型的优惠券活动重复领取问题 misworga831 2024-06-17 18:41:02 +08:00
• 6b59c1e643 !350 fix & improve Merge pull request !350 from OceansDeep/pg OceansDeep 2024-06-17 09:10:44 +00:00
• 1b52381c71 fix: 修复可能出现的手机号登录重复问题 misworga831 2024-06-17 17:09:33 +08:00
• 763519876e !349 fix & improve Merge pull request !349 from OceansDeep/pg OceansDeep 2024-06-17 07:14:46 +00:00
• cede181bc0 fix: 生成索引时，店铺商品分类优惠券判断条件补全 misworga831 2024-06-17 15:13:07 +08:00
• cb776eb4c0 merge Chopper711 2024-06-17 08:31:49 +08:00
• 8ed4f6eb3c fix: 极端情况下，结算单可能存在未能被同级的订单流水 Chopper711 2024-06-17 08:31:28 +08:00
• 9cf97f3203 !348 fix & improve Merge pull request !348 from OceansDeep/pg OceansDeep 2024-06-14 03:31:36 +00:00
• 2a984b8c56 fix: 优化店铺优惠券商品分类生成 misworga831 2024-06-14 11:27:54 +08:00
• 22ecf48168 !347 fix & improve Merge pull request !347 from OceansDeep/pg OceansDeep 2024-06-14 01:55:33 +00:00
• 89422b2736 fix: 自动领取优惠券判定同时，将精准发券功能同时判定 misworga831 2024-06-14 09:54:26 +08:00
• bcd4bf4ff1 fix: 用户领取优惠券时，无法领取精准赠送的优惠券 Chopper711 2024-06-12 18:07:53 +08:00
• a263bc6301 !346 fix & improve Merge pull request !346 from OceansDeep/pg OceansDeep 2024-06-04 06:44:23 +00:00
• 27ae773e20 fix & improvement misworga831 2024-06-04 14:43:37 +08:00
• 085b61c2ab fix: 单个文件夹删除报错问题处理，pom.xml 配置编译运行环境指定，开发测试环境 jdk22 导致无法编译 1.8版本 jdk 问题。 Chopper711 2024-05-27 14:45:42 +08:00
• c7682680ee fix:文件目录为空时无法删除文件报错 Chopper711 2024-05-27 10:12:50 +08:00
• a301432a87 fix: 修复判断订单是否可以售后接口异常 lele0521 2024-05-27 08:53:43 +08:00
• 526de18a42 !343 上传图片时，选择的目录为空时，生成的图片访问不了 Merge pull request !343 from imalasong/pr/1 OceansDeep 2024-05-24 03:15:48 +00:00
• c940bf6cb2 !342 多了一个结束符号进行移除 Merge pull request !342 from 铉清/N/A OceansDeep 2024-05-24 03:15:02 +00:00
• a7643a6b93 !345 fix & improve Merge pull request !345 from OceansDeep/pg OceansDeep 2024-05-23 07:40:45 +00:00
• 24f6b9e80f fix: 修复拼单订单失败时，未付款订单没有取消问题。 misworga831 2024-05-23 15:39:26 +08:00
• d349616957 fix: 过滤订单售后状态（砍价、积分、赠品订单不可进行售后） lele0521 2024-05-20 11:16:36 +08:00
• f7c9ba820d Merge remote-tracking branch 'origin/pr/1' into pr/1 imalasong 2024-05-16 21:16:28 +08:00
• f99f59963a fix: 上传图片时，选择的目录为空时，生成的图片访问不了 imalasong 2024-05-16 21:14:41 +08:00
• caaf9c74f3 fix: 上次图片时，选择的目录为空时，生成的图片访问不了 imalasong 2024-05-16 21:14:41 +08:00
• 076f47f5c4 fix: 回滚用户注销逻辑 lele0521 2024-05-16 09:36:52 +08:00
• f0e4e4c2bc fix: 修改注销账号的实现方式 lele0521 2024-05-16 08:56:25 +08:00
• c87fe45dfa fix: 修改注销账号的实现方式 lele0521 2024-05-15 18:38:41 +08:00
• 49fd03df7f fix: 修改注销账号的实现方式 lele0521 2024-05-13 19:44:51 +08:00
• 6deed61311 fix: 增加商家订单备注功能 lele0521 2024-05-11 09:21:27 +08:00
• 6311767320 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2024-05-10 17:05:19 +08:00
• 2463d1b5bb 验证 TOKEN Chopper711 2024-05-10 17:04:32 +08:00
• 9d41ae3cae 分销订单立即结算功能注释，新版本逻辑必须通过定时任务处理 dev chc 2024-05-07 11:13:56 +08:00
• 2be8bf27bf 虚拟订单无法售后问题 chc 2024-05-07 10:51:01 +08:00
• 2d052ffb1a 多了一个结束符号进行移除 铉清 2024-04-19 05:17:44 +00:00
• 88ab071ac7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2024-04-01 19:14:34 +08:00
• bda72da679 fix: 足迹为空展示空信息问题，商品库存回滚数量错误问题 Chopper711 2024-04-01 19:14:28 +08:00
• 95e5ef2d33 !341 统计数据转换异常 Merge pull request !341 from Lele/dev Lele 2024-03-29 03:29:19 +00:00
• 48a294e7c6 fix: 统计数据转换异常 lele0521 2024-03-29 11:28:24 +08:00
• 794fa63302 fix: 核销订单如果订单不存在则抛出异常 Chopper711 2024-03-28 15:36:56 +08:00
• cdb8e851a8 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lele0521 2024-03-27 15:16:39 +08:00
• f8ee3a8d15 fix: 统计数据转换异常 lele0521 2024-03-27 15:16:26 +08:00
• 76ab997922 !340 修复会员基本信息显示null异常 Merge pull request !340 from Lele/dev Lele 2024-03-27 01:03:02 +00:00
• 97e7a130f1 fix: 修复会员基本信息显示null异常 lele0521 2024-03-26 18:50:24 +08:00
• 2a96ad4af7 !339 修复商城问题文档中的bug Merge pull request !339 from Lele/dev Lele 2024-03-25 08:32:24 +00:00
• e1aee4a744 fix: 修复商城问题文档中的bug lele0521 2024-03-25 16:29:24 +08:00
• ecfe1524d4 fix: 修复商城问题文档中的bug lele0521 2024-03-25 16:26:21 +08:00
• 42ea2dc986 订单后台收款后返回状态不对 chc 2024-03-22 19:07:02 +08:00
• 230e2e7407 !336 【交易投诉】交由商家处理报错。 Merge pull request !336 from Lele/dev Lele 2024-03-21 08:22:49 +00:00
• 92639ba309 fix: 【交易投诉】交由商家处理报错。bug修复 lele0521 2024-03-21 16:21:29 +08:00
• 19b3225312 !335 修复添加APP版本控制异常 Merge pull request !335 from Lele/dev Lele 2024-03-21 05:54:53 +00:00
• e56c20469d fix: APP版本控制区分APP类型 lele0521 2024-03-21 13:42:58 +08:00
• a28eceaf61 !334 OSS资源管理中增加店铺名称搜索条件 Merge pull request !334 from Lele/dev Lele 2024-03-19 10:03:16 +00:00
• 1925c6d33c fix: OSS资源增加按店铺筛选 lele0521 2024-03-19 17:55:11 +08:00
• fcac4002b1 fix: OSS资源增加按店铺筛选 lele0521 2024-03-19 17:03:55 +08:00
• ed3a2ae9fc Merge branch 'master' into dev lele0521 2024-03-19 16:39:47 +08:00
• 4955d2135b fix: OSS资源增加按店铺筛选 lele0521 2024-03-19 16:39:36 +08:00
• 9f1dacc1d4 方法名修改 chc 2024-03-11 15:35:14 +08:00
• f0765a6627 fix: 修复分销申请逻辑 lele0521 2024-03-07 11:23:50 +08:00
• a31a9fdfbd fix: 修复字段错误 lele0521 2024-03-07 09:22:54 +08:00
• fd2d0724a7 fix: token 过期后图片访问抛出一个未被捕获的异常问题处理，优化一个店铺审核的提示语 Chopper711 2024-02-01 15:37:59 +08:00
• 82d7389092 Merge remote-tracking branch 'origin/master' chc 2024-01-29 18:33:53 +08:00
• a53eb3cfde 售后关闭功能同步 chc 2024-01-29 18:33:47 +08:00
• bd048d725c !333 增加默认退款金额显示 Merge pull request !333 from Lele/dev Lele 2024-01-29 06:37:37 +00:00
• 8e275613e1 fix: 增加默认退款金额显示 lele0521 2024-01-29 14:35:19 +08:00
• fc869a34e0 !332 fix: 修复分销提现异常 Merge pull request !332 from Lele/dev Lele 2024-01-25 10:42:13 +00:00
• 48c84acb7c fix: 分销提现bug修复 lele0521 2024-01-25 18:39:27 +08:00
• 40d40a344e !331 fix & improve Merge pull request !331 from OceansDeep/pg OceansDeep 2024-01-25 08:46:48 +00:00
• d31257ba76 fix: 修复促销拼团订单取消后，活动结束后，检查成团没有筛选取消后的订单返还多余库存问题 misworga831 2024-01-25 16:12:33 +08:00
• f0a80338da Merge remote-tracking branch 'origin/master' chc 2024-01-25 14:02:24 +08:00
• 6b5ca5b337 分类缓存获取 chc 2024-01-25 14:02:18 +08:00
• 61f9d7812d !330 fix & improve Merge pull request !330 from OceansDeep/pg OceansDeep 2024-01-24 10:54:33 +00:00
• d5eeafc554 fix: 优化虚拟商品不需要填写收货地址 misworga831 2024-01-24 18:53:31 +08:00
• 2175433444 fix: 优化取消订单返还促销商品库存 misworga831 2024-01-24 18:52:43 +08:00
• cfbb1a1519 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop pikachu1995@126.com 2024-01-24 14:54:29 +08:00
• 1302ca6de4 优化结算单退款计算逻辑 pikachu1995@126.com 2024-01-24 14:54:23 +08:00
• 239b520939 Merge remote-tracking branch 'origin/master' chc 2024-01-24 11:32:43 +08:00
• 56d9dbee5b 库存预警功能,预警为0不进行预警 chc 2024-01-24 11:32:28 +08:00
• 41decf1fa1 !329 fix & improve Merge pull request !329 from OceansDeep/pg OceansDeep 2024-01-24 02:11:26 +00:00
• 1d2cb5737d fix: 修复促销商品库存扣减问题 misworga831 2024-01-24 10:10:43 +08:00
• a2496b267a fix: 优化商品图片获取 misworga831 2024-01-24 10:10:11 +08:00
• 178544fe2d 管理端支持下载结算单账单 pikachu1995@126.com 2024-01-24 09:48:25 +08:00
• 9e3b9c8f38 店铺结算单增加积分/砍价商品退款统计 pikachu1995@126.com 2024-01-23 15:06:14 +08:00
• b439d8283f !328 fix & improve Merge pull request !328 from OceansDeep/pg OceansDeep 2024-01-22 10:57:02 +00:00
• fb48bce38d fix: 优化商品图片地址存储结构，只保留图片地址，去除其他无效参数，优化商品图片规则，改为全部通用spu图片，可为第一个 规格项 单独设置一个图片。 misworga831 2024-01-22 18:56:13 +08:00
• b189fbe238 腾讯COS图片路径缺少符号 pikachu1995@126.com 2024-01-22 15:59:33 +08:00
• 26c1c97442 !327 fix & improve Merge pull request !327 from OceansDeep/pg OceansDeep 2024-01-22 02:55:04 +00:00
• ee8f5b6e1e fix: 优化商品图片地址存储结构，只保留图片地址，去除其他无效参数，优化商品图片规则，改为全部通用spu图片，可为第一个 规格项 单独设置一个图片。 misworga831 2024-01-22 10:44:24 +08:00
• 6755515b1f upgrade: 更新 hutool 和 mybatis plus 版本 misworga831 2024-01-22 10:43:09 +08:00
• 074036c0b5 !326 退款状态功能增加字段 Merge pull request !326 from Lele/dev Lele 2024-01-18 09:45:11 +00:00
• c7d0820eed Merge branch 'master' into dev lele0521 2024-01-18 17:42:37 +08:00
• 97c0fdbf1d feat: 退款状态功能增加字段 lele0521 2024-01-18 17:40:05 +08:00
• a962939db8 库存预警功能 chc 2024-01-18 11:44:08 +08:00
• a9802710ef !325 修复日志格式异常 Merge pull request !325 from Lele/dev Lele 2024-01-17 10:30:54 +00:00
• aaaa0b1ebf Merge branch 'master' into dev lele0521 2024-01-17 18:06:13 +08:00