Commit Graph

Select branches

Hide Pull Requests

aa

batch

bb

dev

dev1

dev3

dev_one

main

mkm-patch-1

mkm-patch-2

product

refund

rose

updateOrder

update_warehouse_product

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#45

#450

#451

#452

#453

#454

#455

#456

#457

#458

#459

#46

#460

#461

#462

#463

#464

#465

#466

#467

#468

#469

#47

#470

#471

#472

#473

#474

#475

#476

#477

#478

#479

#48

#480

#481

#482

#483

#484

#485

#486

#487

#488

#489

#49

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#5

#50

#500

#501

#502

#503

#504

#505

#506

#507

#508

#509

#51

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#53

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#54

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#55

#550

#551

#552

#553

#554

#555

#556

#557

#558

#559

#56

#560

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

1.0.0

1.0.1

1.0.2

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1.1

1.1.2

1.1.3

1.1.4

1.10.0

Mono Color

• e2a3472a11 修改定时更新出库商品供货价 lewis 2025-01-10 14:21:40 +08:00
• 6cd8f1649e Merge pull request 'dev' (#456) from dev into main mkm 2025-01-10 11:53:31 +08:00
• 1fb09ae1fb refactor(admin): 优化前置订单统计功能 mkm 2025-01-10 11:38:56 +08:00
• 3f3644ac69 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2025-01-10 11:23:02 +08:00
• 3f29aed4ba fix(PayNotifyLogic): 修复 xprinter 打印支持 mkm 2025-01-10 11:22:56 +08:00
• 58b8c6d007 Merge pull request '修改用户搜索' (#455) from dev into main mkm 2025-01-10 10:44:42 +08:00
• c55533e764 修改用户搜索 lewis 2025-01-10 10:44:02 +08:00
• a9b0f7e6c3 Merge pull request 'dev' (#454) from dev into main mkm 2025-01-09 17:59:18 +08:00
• bf936b31fb Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2025-01-09 17:58:44 +08:00
• 222dcbfcbb feat(admin): 添加订单列表统计功能 mkm 2025-01-09 17:58:39 +08:00
• 0b26b8cfb2 添加定时更新出库商品供货价 lewis 2025-01-09 17:40:11 +08:00
• 214f1f8639 修改用户搜索 lewis 2025-01-09 16:34:40 +08:00
• a15ad48e4c 修改用户搜索 lewis 2025-01-09 16:33:28 +08:00
• 0590791bd9 Merge pull request 'dev' (#453) from dev into main mkm 2025-01-09 15:13:52 +08:00
• 3d897d5dda feat(admin): 优化产品搜索功能 mkm 2025-01-09 15:10:00 +08:00
• 8595617908 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-09 14:56:52 +08:00
• db0e7c6068 添加预订单日志 lewis 2025-01-09 14:56:45 +08:00
• ff5daba642 Merge pull request 'perf(StoreFinanceFlowLogic): 优化用户余额更新逻辑' (#452) from dev into main mkm 2025-01-09 14:24:34 +08:00
• bbdd0081a0 perf(StoreFinanceFlowLogic): 优化用户余额更新逻辑 mkm 2025-01-09 14:24:08 +08:00
• 2a4863b33a Merge pull request 'dev' (#451) from dev into main mkm 2025-01-09 13:48:02 +08:00
• 945097566e fix(api): 修复价格更新和库存扣减问题 mkm 2025-01-09 13:47:28 +08:00
• 19d9ca9734 feat(store-product): 添加活动价查询功能 mkm 2025-01-09 12:03:35 +08:00
• ccba524703 Merge pull request 'feat(admin): 添加订单商品列表的退款数量和退款金额字段' (#450) from dev into main mkm 2025-01-08 17:56:37 +08:00
• caab5cca6f feat(admin): 添加订单商品列表的退款数量和退款金额字段 mkm 2025-01-08 17:56:14 +08:00
• 823cfb7ec7 Merge pull request 'feat(admin): 订单列表添加退款相关数据展示' (#449) from dev into main mkm 2025-01-08 17:42:03 +08:00
• e924c14f8a feat(admin): 订单列表添加退款相关数据展示 mkm 2025-01-08 17:41:27 +08:00
• 4df60a5c65 Merge pull request '修改门店预订单商品搜索' (#448) from dev into main mkm 2025-01-08 17:35:40 +08:00
• 349b6c3f5f 修改门店预订单商品搜索 lewis 2025-01-08 17:30:03 +08:00
• f871bd65a7 Merge pull request '修改订单退款的错误' (#447) from dev into main mkm 2025-01-08 17:27:22 +08:00
• 784c274f28 修改订单退款的错误 lewis 2025-01-08 16:56:52 +08:00
• fad173b82d Merge pull request 'fix(admin): 修复后台订单列表中商品单位名称显示问题' (#446) from dev into main mkm 2025-01-08 16:17:00 +08:00
• f0eda34869 fix(admin): 修复后台订单列表中商品单位名称显示问题 mkm 2025-01-08 16:16:27 +08:00
• f0b299f1dc Merge pull request 'dev' (#445) from dev into main mkm 2025-01-08 15:27:31 +08:00
• 554ca5fa6d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2025-01-08 15:27:08 +08:00
• 9da7292a9e refactor(admin): 优化入库单确认流程 mkm 2025-01-08 15:27:02 +08:00
• 9316467ffa Merge pull request 'dev' (#444) from dev into main mkm 2025-01-08 15:15:31 +08:00
• 5417d58b6b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-08 15:15:02 +08:00
• ebd7ea7825 修改采购单导出 lewis 2025-01-08 15:14:56 +08:00
• 0ca77643f1 fix(admin): 优化库存更新逻辑 mkm 2025-01-08 15:13:02 +08:00
• 8e07237489 refactor(admin): 修改仓库商品退货逻辑 mkm 2025-01-08 14:42:01 +08:00
• 3284d43e14 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-08 10:16:19 +08:00
• d2c7c7d74d 修改微信退款的错误 lewis 2025-01-08 10:15:55 +08:00
• e162789490 Merge pull request 'dev' (#443) from dev into main mkm 2025-01-07 17:39:00 +08:00
• 9fe2b657c2 feat(warehouse): 优化仓库产品出库价格计算逻辑 mkm 2025-01-07 17:38:20 +08:00
• 19b9c98582 feat(admin): 添加商品缺库存管理功能 mkm 2025-01-07 16:56:44 +08:00
• 8c8ee2892e Merge pull request '修改出库单title' (#442) from dev into main mkm 2025-01-07 15:19:37 +08:00
• a001ab233c 修改出库单title lewis 2025-01-07 15:18:39 +08:00
• b4bc60cf4c Merge pull request 'dev' (#441) from dev into main mkm 2025-01-07 15:11:44 +08:00
• ef7d95a51b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-07 14:40:40 +08:00
• bcc6f2f21f 修改预订单列表字段 lewis 2025-01-07 14:40:28 +08:00
• b9adf2dce3 refactor(admin): 优化变更日志列表和购买产品报价逻辑 mkm 2025-01-07 14:33:25 +08:00
• 07643c6d11 添加门店备注 lewis 2025-01-07 11:49:24 +08:00
• 429e02120c 调整订单退款 lewis 2025-01-06 17:41:34 +08:00
• df13985929 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-06 17:22:09 +08:00
• 63baffcb10 Merge branch 'refund' into dev lewis 2025-01-06 17:21:32 +08:00
• a031bf1006 Merge pull request 'feat(SystemStoreStorage): 添加不记录日志属性' (#440) from dev into main mkm 2025-01-06 17:18:51 +08:00
• d5e70298bc feat(SystemStoreStorage): 添加不记录日志属性 mkm 2025-01-06 17:18:14 +08:00
• 3ff4f3b5b0 调整订单退款 refund lewis 2025-01-06 17:15:58 +08:00
• 65f10f0a20 Merge pull request 'fix(admin): 修正仓库产品总价计算逻辑' (#439) from dev into main mkm 2025-01-06 15:24:22 +08:00
• b99eb4a52a fix(admin): 修正仓库产品总价计算逻辑 mkm 2025-01-06 15:23:44 +08:00
• 9285760681 Merge pull request 'dev' (#438) from dev into main mkm 2025-01-06 15:15:02 +08:00
• 33eff351fc fix(warehouse): 修复仓库产品数量增减操作的精度问题 mkm 2025-01-06 15:13:19 +08:00
• a93207ff4c refactor(warehouse): 优化仓库产品数量变更逻辑 mkm 2025-01-06 14:44:12 +08:00
• 1caae07bb9 feat(warehouse): 优化仓库产品编辑功能和变更日志 mkm 2025-01-06 14:15:12 +08:00
• 148e6cf019 refactor(仓储逻辑): 为相关函数增加管理员ID参数 mkm 2025-01-06 12:04:18 +08:00
• a4e66dcacb Merge pull request 'refactor(admin): 优化 ChangeLog 列表的搜索条件' (#437) from dev into main mkm 2025-01-06 11:30:56 +08:00
• 7379406cb9 refactor(admin): 优化 ChangeLog 列表的搜索条件 mkm 2025-01-06 11:30:28 +08:00
• 5dae3e769e Merge pull request 'dev' (#436) from dev into main mkm 2025-01-06 11:01:14 +08:00
• 03cc208b1d refactor(model): 移除门店、仓库和库存模型中的日志记录钩子 mkm 2025-01-06 11:00:46 +08:00
• 788a8cb211 添加数据变更记录 lewis 2025-01-06 10:17:25 +08:00
• 2e6372ea64 Merge pull request 'fix(order): 修复支付宝即时到账和扫码支付的订单金额显示问题' (#435) from dev into main mkm 2025-01-05 10:18:21 +08:00
• 80364d4b1a fix(order): 修复支付宝即时到账和扫码支付的订单金额显示问题 mkm 2025-01-05 10:17:23 +08:00
• f396ca117e Merge pull request 'refactor(api): 重构 DemoLogic 中的数据库操作' (#434) from dev into main mkm 2025-01-04 23:01:34 +08:00
• cf56637d82 refactor(api): 重构 DemoLogic 中的数据库操作 mkm 2025-01-04 23:01:02 +08:00
• 0312e2ee83 Merge pull request 'refactor(app): 优化 DemoLogic 中数据库操作' (#433) from dev into main mkm 2025-01-04 22:50:21 +08:00
• 3310584ca0 refactor(app): 优化 DemoLogic 中数据库操作 mkm 2025-01-04 22:49:44 +08:00
• f60da981f9 Merge pull request 'fix(app): 修复预售订单导出逻辑' (#432) from dev into main mkm 2025-01-04 19:15:55 +08:00
• dfdb3256dc fix(app): 修复预售订单导出逻辑 mkm 2025-01-04 19:15:20 +08:00
• 2a2709ca74 Merge pull request 'dev' (#431) from dev into main mkm 2025-01-04 17:53:23 +08:00
• c5968370b6 修改采购款支付的错误 lewis 2025-01-04 17:52:41 +08:00
• 6379fa0eae 添加无价格出库单导出 lewis 2025-01-04 16:11:49 +08:00
• 25f067d3fe Merge pull request 'fix(warehouse): 修复库存数量计算错误' (#430) from dev into main mkm 2025-01-04 15:30:48 +08:00
• dc2cadfab9 fix(warehouse): 修复库存数量计算错误 mkm 2025-01-04 15:30:17 +08:00
• cb90aafd60 Merge pull request 'dev' (#429) from dev into main mkm 2025-01-04 15:21:08 +08:00
• 559af685af Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2025-01-04 15:20:44 +08:00
• 81968761f4 fix(warehouse): 修复仓库产品减库操作异常 mkm 2025-01-04 15:20:31 +08:00
• adf0ae1d42 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-04 15:20:28 +08:00
• d58712a268 门店后台添加一键入库 lewis 2025-01-04 15:20:20 +08:00
• 08b7e490cb Merge pull request 'fix(warehouse): 修复仓库调拨库存数量错误问题' (#428) from dev into main mkm 2025-01-04 15:08:56 +08:00
• cbbd75cf60 fix(warehouse): 修复仓库调拨库存数量错误问题 mkm 2025-01-04 15:08:29 +08:00
• 2693cb2c3c Merge pull request 'feat(model): 添加字段忽略日志记录功能' (#427) from dev into main mkm 2025-01-04 12:40:40 +08:00
• 24cd3ef828 feat(model): 添加字段忽略日志记录功能 mkm 2025-01-04 12:40:13 +08:00
• bfa152c149 Merge pull request 'fix(admin): 修复库存日志记录中的错误' (#426) from dev into main mkm 2025-01-04 12:16:56 +08:00
• 1504af0892 fix(admin): 修复库存日志记录中的错误 mkm 2025-01-04 12:16:31 +08:00
• 0a9adda758 Merge pull request 'refactor(exception): 重构异常处理逻辑' (#425) from dev into main mkm 2025-01-04 12:09:51 +08:00
• c82b6ade42 refactor(exception): 重构异常处理逻辑 mkm 2025-01-04 12:09:11 +08:00
• 300abefbed Merge pull request 'fix(admin): 修复预售订单创建逻辑' (#424) from dev into main mkm 2025-01-04 11:43:52 +08:00
• 95334b874a fix(admin): 修复预售订单创建逻辑 mkm 2025-01-04 11:43:27 +08:00
• 59523fc637 Merge pull request 'dev' (#423) from dev into main mkm 2025-01-04 10:53:37 +08:00
• 8ec78fe7d0 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-01-04 10:36:56 +08:00