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

• 2d4cf29da8 导出功能,福禄清除 chc 2022-09-02 10:31:35 +08:00
• eea47aea55 导出 chc 2022-09-02 09:52:11 +08:00
• 2648a0b57e 店员，商品导入，sql chc 2022-09-01 18:53:12 +08:00
• 46dfe4650e !230 优化规格信息存储顺序，HashMap 替换为 LinkedHashMap Merge pull request !230 from OceansDeep/feature/pg OceansDeep 2022-09-01 09:37:12 +00:00
• 7eca11d51b 优化规格信息存储顺序，HashMap 替换为 LinkedHashMap paulGao 2022-09-01 17:27:13 +08:00
• 43022a9838 !229 bug 优惠券领取数量错误 from @Fxz Merge pull request !229 from Fxz/N/A Chopper711 2022-09-01 01:59:23 +00:00
• b873ec2095 电子面单接口完善,商家导入商品功能 chc 2022-08-31 17:37:07 +08:00
• 18f8718de2 bug 优惠券领取数量错误 对于每一张优惠券扣减数量应该是会员数量 * 每张优惠券发放的数量 即memberList.size()*couponActivityItem.getNum() 也就是memberCouponList.size() Fxz 2022-08-31 09:11:06 +00:00
• c6c0801d14 !228 优惠券折扣条件判断不可能同时成立 Merge pull request !228 from Fxz/N/A OceansDeep 2022-08-30 09:18:23 +00:00
• 196d27b7c5 店铺入驻问题处理 Chopper 2022-08-29 15:48:39 +08:00
• daed961a99 优惠券折扣条件判断不可能同时成立 Fxz 2022-08-27 06:07:44 +00:00
• 8387e03254 !227 修复consumer每日任务更新会员评价异常问题;优化生成每日秒杀活动 Merge pull request !227 from OceansDeep/feature/pg OceansDeep 2022-08-25 02:48:55 +00:00
• b6d43a069f a paulGao 2022-08-25 10:47:31 +08:00
• 558eea94e2 修复consumer每日任务更新会员评价异常问题;优化生成每日秒杀活动 paulGao 2022-08-25 10:43:56 +08:00
• f5f99efff6 !226 增加商品sku参数空值判断 Merge pull request !226 from OceansDeep/feature/pg OceansDeep 2022-08-19 09:47:26 +00:00
• cc95fa92e7 增加商品sku参数空值判断 paulGao 2022-08-19 17:46:12 +08:00
• 9eba3287b2 !225 增加订单取消返还优惠券 Merge pull request !225 from OceansDeep/feature/pg OceansDeep 2022-08-16 00:36:58 +00:00
• 46845dd4b9 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-08-15 09:42:52 +08:00
• c3be2cdfe5 增加订单取消返还优惠券 paulGao 2022-08-12 17:35:42 +08:00
• 443cf1829e !224 修复秒杀活动商品时间不正确问题 Merge pull request !224 from OceansDeep/feature/pg OceansDeep 2022-08-12 03:02:33 +00:00
• ae833b245e 修复秒杀活动商品时间不正确问题 paulGao 2022-08-12 11:00:33 +08:00
• 88338877b0 !223 优化秒杀活动获取时，当前时间大于活动最后一个时间时，显示最后一个时间 Merge pull request !223 from OceansDeep/feature/pg OceansDeep 2022-08-11 12:25:57 +00:00
• 0d74a4aecc 优化秒杀活动获取时，当前时间大于活动最后一个时间时，显示最后一个时间。优化订单促销类型显示 paulGao 2022-08-11 20:17:58 +08:00
• 1cf0496cd1 !222 优化清除无效促销活动任务，改为批量清除 Merge pull request !222 from OceansDeep/feature/pg OceansDeep 2022-08-11 04:01:38 +00:00
• 050b026166 优化清除无效促销活动任务，改为批量清除 paulGao 2022-08-11 11:57:58 +08:00
• 8d95319e39 每日任务日志前缀修复 Chopper 2022-08-11 10:16:53 +08:00
• fe12b0a665 !221 修复新增编辑商品时，生成商品索引时，参数没有传递问题。优化商品新增编辑代码 Merge pull request !221 from OceansDeep/feature/pg OceansDeep 2022-08-10 12:37:17 +00:00
• 93dd2e06d8 修复新增编辑商品时，生成商品索引时，参数没有传递问题。优化商品新增编辑代码 paulGao 2022-08-10 20:27:38 +08:00
• 05f29a264e 启动报错 fengtianyangyang 2022-08-09 20:26:40 +08:00
• 26dd8ed13a Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into fengtianyangyang_clerk fengtianyangyang 2022-08-09 18:54:19 +08:00
• 72c58059bd 优惠券活动创建限制 Chopper 2022-08-09 16:08:54 +08:00
• 7e596d47a6 fix: 修复相关bug xiaochangbai 2022-08-08 11:11:28 +08:00
• c38a8c0475 地址重复存在的问题处理 Chopper 2022-08-08 09:14:15 +08:00
• 15adbf489e feat: app扫码登录 xiaochangbai 2022-08-07 21:34:20 +08:00
• 98b863be6f 后台操作店铺验证存在问题处理 Chopper 2022-08-05 17:14:20 +08:00
• ecd40523d4 演示站点限制修改密码 Chopper 2022-08-04 11:17:14 +08:00
• 7f6de6e64e !218 修复商品索引生成报错问题 Merge pull request !218 from OceansDeep/feature/pg OceansDeep 2022-08-02 07:22:56 +00:00
• 002163fbdc 修复商品索引生成报错问题 paulGao 2022-08-02 15:21:00 +08:00
• da9ea504fb Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-08-02 15:15:43 +08:00
• bb171f6e23 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-08-02 10:57:31 +08:00
• b860c2eed0 优化结构 Chopper 2022-08-02 10:52:47 +08:00
• fdf81d1b39 分词问题优化 Chopper 2022-08-02 10:51:10 +08:00
• 40bf6d3010 优化获取秒杀活动 paulGao 2022-07-27 22:13:56 +08:00
• 2d63d36f51 !217 优化促销验证商品，检查商品是否可以参与促销 Merge pull request !217 from OceansDeep/feature/pg OceansDeep 2022-07-27 09:22:37 +00:00
• ed976e90dc 优化促销验证商品，检查商品是否可以参与促销 paulGao 2022-07-27 17:21:48 +08:00
• 6f4994b5da !216 add transactional Merge pull request !216 from OceansDeep/feature/pg OceansDeep 2022-07-27 04:07:29 +00:00
• a2a923809e add transactional paulGao 2022-07-27 12:06:47 +08:00
• 8d06ccace9 !215 修复小程序注册用户没有发送会员注册信息问题 Merge pull request !215 from OceansDeep/feature/pg OceansDeep 2022-07-26 11:30:20 +00:00
• 99479e722a 修复小程序注册用户没有发送会员注册信息问题 paulGao 2022-07-26 19:18:01 +08:00
• 70890cdc19 !214 修复积分商品购买时，价格问题 Merge pull request !214 from OceansDeep/feature/pg OceansDeep 2022-07-25 13:00:47 +00:00
• 0eebc544a6 修复积分商品购买时，价格问题 paulGao 2022-07-25 20:52:03 +08:00
• 12280e5769 !213 优化代码，修复自动生成的es分词无效问题 Merge pull request !213 from OceansDeep/feature/pg OceansDeep 2022-07-21 03:53:36 +00:00
• 4ec2c1b943 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-07-21 11:52:17 +08:00
• d6edb93403 优化代码，修复自动生成的es分词无效问题 paulGao 2022-07-21 11:52:12 +08:00
• 3236a05ae9 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-07-19 18:45:42 +08:00
• 5576ae7305 解决 lilishop4.2.4中存在序列化购物车，促销信息会在序列化后丢失，无法反序列化。 Chopper 2022-07-19 18:45:08 +08:00
• d5aadf6926 店铺入驻分批保存可能存在无法入住问题解决 Chopper 2022-07-19 18:38:38 +08:00
• 2eb469b228 improve code paulGao 2022-07-19 15:24:39 +08:00
• 088c6faae1 店铺保存问题处理，解决可能存在多次入驻店铺无法申请失败问题 Chopper 2022-07-19 15:15:59 +08:00
• 04f7d22e3f !212 优化商品索引的促销信息生成。优化批量生成分词 Merge pull request !212 from OceansDeep/feature/pg OceansDeep 2022-07-18 11:12:12 +00:00
• 950274f6be 优化商品索引的促销信息生成。优化批量生成分词 paulGao 2022-07-18 19:06:17 +08:00
• c6596fff1a !211 更新部分es日志 Merge pull request !211 from OceansDeep/feature/pg OceansDeep 2022-07-18 04:11:55 +00:00
• 7cbbc57514 更新部分es日志 paulGao 2022-07-18 12:11:16 +08:00
• 8041a4a4fc 店铺退款流水金额计算错误 fengtianyangyang 2022-07-15 14:27:10 +08:00
• 1fa247aa35 !210 优化保存楼层装修。优化管理端优惠券搜索 Merge pull request !210 from OceansDeep/feature/pg OceansDeep 2022-07-13 13:05:15 +00:00
• 7de49dcfb8 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-07-13 20:03:12 +08:00
• b21e307640 优化保存楼层装修。优化管理端优惠券搜索 paulGao 2022-07-13 20:03:05 +08:00
• aae7eedd49 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-07-13 19:06:06 +08:00
• bce60310c5 minio增加字段，可配置前端访问地址。endpoint可以继续走局域网ip Chopper 2022-07-13 19:05:59 +08:00
• d17cb4ce96 !209 修复批发商品订单下单时，订单单项价格错误问题 Merge pull request !209 from OceansDeep/feature/pg OceansDeep 2022-07-12 09:16:09 +00:00
• 4b25a03b1d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-07-12 17:13:35 +08:00
• 682433efe4 修复批发商品订单下单时，订单单项价格错误问题 paulGao 2022-07-12 17:13:17 +08:00
• a6f28d67eb 代码格式化一下 Chopper 2022-07-12 10:17:34 +08:00
• c663aa2799 minio上传失败前端无感知问题处理 Chopper 2022-07-11 18:53:07 +08:00
• 2c02b816b5 一个分销时间展示以及一个字段没有正确的存储值问题处理 Chopper 2022-07-11 18:52:31 +08:00
• d14b87729a !208 解决短信发送失败 时，前端无感知问题。from zypy333/N/A Merge pull request !208 from zypy333/N/A Chopper711 2022-07-11 03:51:16 +00:00
• 70b41ab8a8 sql修改 fengtianyangyang 2022-07-08 15:17:59 +08:00
• d185b548f7 update framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java. 抛出返回码错误 zypy333 2022-07-08 03:57:53 +00:00
• 4b5dcec08b !207 优化取消订单生成店铺流水 Merge pull request !207 from OceansDeep/feature/pg OceansDeep 2022-07-07 10:11:04 +00:00
• 13a7a875a4 优化取消订单生成店铺流水 paulGao 2022-07-07 18:10:31 +08:00
• 8743bf4b93 !206 增加取消订单生成店铺流水，优化代码 Merge pull request !206 from OceansDeep/feature/pg OceansDeep 2022-07-07 09:26:32 +00:00
• d8792e9e27 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-07-07 17:25:36 +08:00
• 82a0cd0336 增加取消订单生成店铺流水，优化代码 paulGao 2022-07-07 17:25:15 +08:00
• 60ae5b8965 后台用户编辑问题处理 Chopper 2022-07-06 17:30:01 +08:00
• 4d4b54ec36 分销订单0元佣金记录订单问题处理 Chopper 2022-07-06 16:41:40 +08:00
• 53f6910a34 积分商品不允许使用优惠券 Chopper 2022-07-06 15:57:49 +08:00
• 826c3a8f8f !205 代码优化，修复订单投诉问题 Merge pull request !205 from OceansDeep/feature/pg OceansDeep 2022-07-04 10:32:34 +00:00
• 727ddd3198 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-07-04 18:31:49 +08:00
• 7b535434ae 代码优化，修复订单投诉问题 paulGao 2022-07-04 18:31:36 +08:00
• da8ed53c60 !204 修正方法命名 Merge pull request !204 from zypy333/N/A 感谢支持 Chopper711 2022-07-04 09:14:40 +00:00
• 40e9d6f392 时间不归零导致无法展示订单统计历史数据 Chopper 2022-07-01 15:36:07 +08:00
• d189f55de1 修正方法命名 zypy333 2022-07-01 03:18:20 +00:00
• 893f4a0388 !202 update framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java. Merge pull request !202 from zypy333/N/A Chopper711 2022-06-30 07:21:35 +00:00
• a28547c581 update framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java. 修正错别字 zypy333 2022-06-29 03:10:05 +00:00
• a8079e0d35 !201 优化生成索引时，自动将分词信息添加到分词表 Merge pull request !201 from OceansDeep/feature/pg OceansDeep 2022-06-29 01:42:36 +00:00
• 60a210a45f 优化生成索引时，自动将分词信息添加到分词表 paulGao 2022-06-29 09:33:02 +08:00
• 170aa01946 变更购物车会导致优惠券金额错误问题处理 Chopper 2022-06-27 17:57:48 +08:00
• f4c8e5d493 !200 优化商品索引，如数据库中无当前商品则删除商品索引 Merge pull request !200 from OceansDeep/feature/pg OceansDeep 2022-06-23 01:58:22 +00:00
• b3a0a402d7 优化监听事务提交发送mq事件，为订单变更发送mq增加事务提交监听 paulGao 2022-06-23 09:55:52 +08:00
• b6c70d1530 update README.md. Chopper711 2022-06-23 01:46:05 +00:00