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

• 7f08124afc 砍价活动第一版本 pikachu 2021-07-12 23:38:32 +08:00
• 86f010b87e maven 规范 Chopper 2021-07-12 16:33:32 +08:00
• d29d166ce0 banner 统一 Chopper 2021-07-12 14:44:11 +08:00
• 3c78a06008 订单取消时，如未支付，则不需要进行退款处理 Chopper 2021-07-12 12:41:00 +08:00
• b6a5630021 获取用户问题处理 Chopper 2021-07-12 12:30:22 +08:00
• 560ab5f102 调整readme Chopper 2021-07-10 14:13:53 +08:00
• da1b2c3aa8 精简readme Chopper 2021-07-10 14:08:56 +08:00
• 7db5690a26 更新readme Chopper 2021-07-10 14:01:55 +08:00
• a1fcadf8b2 修改readme Chopper 2021-07-09 18:42:00 +08:00
• 8302ca2e3a Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-09 14:46:12 +08:00
• 17b977ef94 对索引生成判定进行处理 Chopper 2021-07-09 14:46:03 +08:00
• 512a298cc9 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-07-09 11:56:19 +08:00
• 86625e9e9d 增加订单申请售后失效、订单投诉申请失效天数。 lifenlong 2021-07-09 11:55:43 +08:00
• a599fb9d01 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-09 11:17:08 +08:00
• 89b057dfca 去除无效代码，规范代码 Chopper 2021-07-09 11:16:11 +08:00
• 18d2379a19 采用阿里代码规约，对代码进行优化 lifenlong 2021-07-09 08:42:16 +08:00
• 3e73257922 采用阿里代码规约，对代码进行优化 lifenlong 2021-07-09 01:56:24 +08:00
• 9e240f22b6 解决售后单列表的排序问题 lifenlong 2021-07-08 09:59:54 +08:00
• 6aadd00e45 优惠券按照添加时间进行排序 lifenlong 2021-07-08 09:35:25 +08:00
• 5fc962b29d Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-07-07 16:18:04 +08:00
• 00e93c91f5 优化订单商品类型 lifenlong 2021-07-07 16:17:38 +08:00
• 0e7a4ee06c Merge branch 'master' into qiuqiu pikachu 2021-07-06 18:36:01 +08:00
• 531ca13555 砍价商品 pikachu 2021-07-06 18:35:40 +08:00
• a903160305 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-06 14:53:34 +08:00
• cd2942a96b mq单向消息报错问题，先做还原处理 Chopper 2021-07-06 14:53:17 +08:00
• 6235faba96 优化颠婆分类 lifenlong 2021-07-06 10:43:16 +08:00
• 6e7254e765 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-07-06 10:12:16 +08:00
• e338229902 优化秒杀初始化方法 lifenlong 2021-07-06 10:12:07 +08:00
• 9ff40291ee Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-05 16:42:31 +08:00
• 4c8375e861 足迹记录mq时，单向发送，不等待mq响应 Chopper 2021-07-05 16:41:39 +08:00
• acc40dc6fc 店铺配送不展示已经禁用的物流公司 lifenlong 2021-07-05 15:45:57 +08:00
• 177cd86366 支持添加重复名称的商品分类 lifenlong 2021-07-05 11:14:15 +08:00
• d06b5ceb89 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-07-05 09:25:10 +08:00
• 6926cd583d 商品索引生成是，对索引值的非空处理 Chopper 2021-07-05 09:25:03 +08:00
• de2777e244 商品索引包含sku信息问题处理 Chopper 2021-07-05 09:22:45 +08:00
• c10b698aed 支持文章传图 lifenlong 2021-07-03 13:40:18 +08:00
• 256d9e240e 商品参数返回vo处理 Chopper 2021-07-02 15:05:08 +08:00
• f9662bd61a Merge branch 'master' into qiuqiu pikachu 2021-07-01 18:42:38 +08:00
• eedea676aa 商品详情展示参数 lifenlong 2021-07-01 17:06:13 +08:00
• 92c3c21e32 商品删除，删除分销商品 lifenlong 2021-07-01 14:31:33 +08:00
• bd13a9b150 Merge branch 'master' into Bulbasaur lifenlong 2021-07-01 11:19:16 +08:00
• 931276f72b 添加ResultCode lifenlong 2021-07-01 11:17:18 +08:00
• e38f9aa2ff !13 fix https://gitee.com/beijing_hongye_huicheng/lilishop/issues/I3YFU4 Merge pull request !13 from OceansDeep/feature/pg v4.2.0 OceansDeep 2021-07-01 02:16:42 +00:00
• 696e075fcd Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2021-07-01 10:12:40 +08:00
• d25ba76094 fix https://gitee.com/beijing_hongye_huicheng/lilishop/issues/I3YFU4 paulGao 2021-07-01 10:12:33 +08:00
• cce14b4794 同步 lifenlong 2021-07-01 08:35:18 +08:00
• f6706d6394 1.使用hutool进行Object to Int格式转换 2.添加部分resultCode lifenlong 2021-07-01 08:33:19 +08:00
• 7e3a9eb904 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-06-30 19:59:42 +08:00
• 079437100d 版本好升级 Chopper 2021-06-30 19:59:36 +08:00
• d7ce709ce6 使用hutool进行格式转换 lifenlong 2021-06-30 16:29:19 +08:00
• cff2b95c48 同步 lifenlong 2021-06-30 15:47:33 +08:00
• 1a77b3cec7 商品数据转换问题 lifenlong 2021-06-30 15:46:52 +08:00
• 346465630c 添加ResultCode lifenlong 2021-06-30 15:45:33 +08:00
• 23388eff6b 升级项目版本号 Chopper 2021-06-30 14:53:26 +08:00
• 800437473d 1.分销员添加结算银行信息 2.电话校验支持手机号 lifenlong 2021-06-30 12:02:35 +08:00
• 46f216c191 1.店铺关闭，批量下架店铺商品问题。 2.解决实物/虚拟订单发货逻辑判断问题 lifenlong 2021-06-30 10:26:32 +08:00
• a60a535708 修改分销可提现金额 lifenlong 2021-06-30 08:41:04 +08:00
• 888b5e2558 解决直播间时间不正确问题 lifenlong 2021-06-29 17:01:55 +08:00
• 1431d990f9 解决直播间时间不正确问题 lifenlong 2021-06-29 16:58:54 +08:00
• f509b8745d token生成时权限过滤问题处理 Chopper 2021-06-29 16:43:38 +08:00
• c1b9f287c7 新增管理员即赋予权限无法生效问题处理。直播间未登录用户报错问题处理 Chopper 2021-06-29 16:26:52 +08:00
• 3ee3e49d0b 用户在请求直播时没有登录抛出异常问题处理。 Chopper 2021-06-29 15:40:37 +08:00
• 05904b25c4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop v4.2 Chopper 2021-06-29 11:56:45 +08:00
• 5e54b2f179 规格值字段新增 Chopper 2021-06-29 11:56:40 +08:00
• e6d045c663 同步 lifenlong 2021-06-29 11:29:05 +08:00
• 50f96727b3 分销商品VO返回GoodsId lifenlong 2021-06-29 11:24:53 +08:00
• 39e851ee78 aop积分日志记录兼容问题处理 Chopper 2021-06-29 11:15:27 +08:00
• 5a415ffc77 条件判定语句顺序调整 Chopper 2021-06-29 10:25:45 +08:00
• 6a9ba13fc0 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-06-29 10:13:24 +08:00
• d96d5edcd5 会员提现api注解问题处理 Chopper 2021-06-29 10:13:18 +08:00
• d35eb293dd Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-06-29 09:23:37 +08:00
• fcfa140a0a 添加注释 lifenlong 2021-06-29 09:23:22 +08:00
• 707c4dbec2 !12 会员消息问题整改 Merge pull request !12 from chopper711/qiuqiu chopper711 2021-06-29 01:05:15 +00:00
• 13b1c353b9 Merge branch 'master' into qiuqiu pikachu 2021-06-29 08:26:22 +08:00
• 8ed54e061f 会员消息修改 pikachu 2021-06-29 08:25:54 +08:00
• d5fab95707 1.优惠券活动由定时器修改为延时任务执行。 2.修改shopEditDTO,不继承ShopDetail lifenlong 2021-06-28 18:18:23 +08:00
• bbf18b7b0a Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-06-28 16:09:13 +08:00
• fe06555a0b 初始化30天的秒杀活动 lifenlong 2021-06-28 16:09:03 +08:00
• cf9e6a659a qq联合登录openid问题处理 Chopper 2021-06-28 15:16:32 +08:00
• c628c0ebb2 店铺入驻字段缺失问题处理 Chopper 2021-06-28 14:56:34 +08:00
• 31479bab19 同步 lifenlong 2021-06-28 11:31:42 +08:00
• 63802a596b 添加秒杀设置 lifenlong 2021-06-28 11:30:37 +08:00
• 84f6f0e7ee 评价判定问题处理 Chopper 2021-06-28 11:28:09 +08:00
• 98a2da489d !11 商品参数校验，在线充值回调 Merge pull request !11 from chopper711/qiuqiu chopper711 2021-06-28 01:03:41 +00:00
• 5786cb9e55 修改商品参数校验以及充值回调接口 pikachu 2021-06-26 16:48:06 +08:00
• 1cbab4a219 店铺评价列表，展示当前店铺数据 lifenlong 2021-06-26 15:24:59 +08:00
• 873a960d3a 店铺直播列表，展示当前店铺数据 lifenlong 2021-06-26 15:23:00 +08:00
• 80007a6b86 设定默认商家结算日 lifenlong 2021-06-26 14:44:55 +08:00
• 467e9887d0 本地校验直播间开始、结束时间 lifenlong 2021-06-26 14:38:27 +08:00
• 2d5c0d6a1f 删除优惠券，删除优惠券活动关联 lifenlong 2021-06-26 14:07:21 +08:00
• d047546374 直播间去重复商品 lifenlong 2021-06-26 11:18:14 +08:00
• 788e9ca239 添加电话校验 lifenlong 2021-06-26 11:04:20 +08:00
• 4939e31e71 添加电话校验 lifenlong 2021-06-26 11:02:42 +08:00
• 701ea240ab Merge branch 'master' into qiuqiu pikachu 2021-06-26 10:58:57 +08:00
• b5088415ce Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2021-06-25 18:30:03 +08:00
• df44a7ae30 不能使用余额支付进行充值 Chopper 2021-06-25 18:29:58 +08:00
• 4b3c2cbea5 微信小程序接口，调用成功统一处理返回 lifenlong 2021-06-25 17:34:00 +08:00
• 7dfbb164ae Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lifenlong 2021-06-25 16:03:18 +08:00
• 3c2cf69cbe 微信媒体返回 lifenlong 2021-06-25 16:03:14 +08:00
• 0d6d92139b 余额支付错误的判定问题处理 Chopper 2021-06-25 16:00:23 +08:00