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

• ea817c25ae feat(inventory_transfer): 商品调拨列表增加导出功能并优化数据查询 mkm 2024-11-12 14:14:27 +08:00
• 1160bbadab Merge pull request 'fix(order): 修复订单相关问题' (#324) from dev into main mkm 2024-11-11 15:34:28 +08:00
• 9e32210670 fix(order): 修复订单相关问题 mkm 2024-11-11 15:19:09 +08:00
• 72d74cbc31 Merge pull request 'fix(store_order): 修复店铺订单统计按日期查询逻辑' (#323) from dev into main mkm 2024-11-11 14:10:35 +08:00
• 4651597ea5 fix(store_order): 修复店铺订单统计按日期查询逻辑 mkm 2024-11-11 14:10:08 +08:00
• 67396de70f Merge pull request 'fix(store_order): 修复 branches 门店商品数据同步问题' (#322) from dev into main mkm 2024-11-11 11:37:20 +08:00
• b960b9aba9 fix(store_order): 修复 branches 门店商品数据同步问题 mkm 2024-11-11 11:36:59 +08:00
• 05628300f9 Merge pull request 'dev' (#321) from dev into main mkm 2024-11-11 11:33:42 +08:00
• 520cb5875b fix(admin): 修正订单时间计算逻辑 mkm 2024-11-11 11:26:32 +08:00
• 4199943282 fix(admin): 修复订单总价计算错误 mkm 2024-11-11 11:16:43 +08:00
• 91546d26d1 refactor(admin): 优化前置订单相关功能 mkm 2024-11-10 15:59:30 +08:00
• 2bb8a1fa58 Merge pull request 'feat(admin): 优化预订单商品列表导出功能' (#320) from dev into main mkm 2024-11-08 17:26:27 +08:00
• 37f6381c2d feat(admin): 优化预订单商品列表导出功能 mkm 2024-11-08 17:24:14 +08:00
• 66138d4670 Merge pull request 'feat(admin): 为预订单表添加导出功能并优化订单导出内容' (#319) from dev into main mkm 2024-11-08 16:43:44 +08:00
• ae439f1389 feat(admin): 为预订单表添加导出功能并优化订单导出内容 mkm 2024-11-08 16:37:27 +08:00
• 090d3a1554 Merge pull request 'feat(api): 添加预订单记录查看和审核功能' (#318) from dev into main mkm 2024-11-08 03:34:07 +08:00
• b93ee02d31 feat(api): 添加预订单记录查看和审核功能 mkm 2024-11-08 03:33:30 +08:00
• a9e997bc02 Merge pull request 'refactor(admin): 移除 StoreOrderCartInfoTwoLists 中的调试代码' (#317) from dev into main mkm 2024-11-08 01:34:01 +08:00
• 994050d437 refactor(admin): 移除 StoreOrderCartInfoTwoLists 中的调试代码 mkm 2024-11-08 01:33:27 +08:00
• 11751fade5 Merge pull request 'fix(store): 修复订单总金额计算逻辑' (#316) from dev into main mkm 2024-11-08 01:02:09 +08:00
• e8dc53409a fix(store): 修复订单总金额计算逻辑 mkm 2024-11-08 01:01:45 +08:00
• 92a9959acd Merge pull request 'fix(store): 修复工作台订单金额统计问题' (#315) from dev into main mkm 2024-11-08 00:54:18 +08:00
• 573ff9dc9d fix(store): 修复工作台订单金额统计问题 mkm 2024-11-08 00:53:43 +08:00
• 1e4c9ced9c Merge pull request 'code(XD): 添加调试代码' (#314) from dev into main mkm 2024-11-08 00:37:26 +08:00
• b10abde619 code(XD): 添加调试代码 mkm 2024-11-08 00:37:00 +08:00
• aa91831a27 Merge pull request 'fix(workbench): 修复今日/昨日/最近七天订单金额未扣除退款金额的问题' (#313) from dev into main mkm 2024-11-08 00:34:22 +08:00
• fd1cf9292f fix(workbench): 修复今日/昨日/最近七天订单金额未扣除退款金额的问题 mkm 2024-11-08 00:33:55 +08:00
• 681496a7f8 Merge pull request 'refactor(warehouse): 优化仓库产品列表数据处理' (#312) from dev into main mkm 2024-11-07 17:13:26 +08:00
• 7c21a22f28 refactor(warehouse): 优化仓库产品列表数据处理 mkm 2024-11-07 17:12:50 +08:00
• 55a8afa5d1 Merge pull request 'feat(admin): 为 StoreOrderCartInfoTwoLists 添加顶级分类名称字段' (#311) from dev into main mkm 2024-11-07 16:43:30 +08:00
• c2df6b1c7e feat(admin): 为 StoreOrderCartInfoTwoLists 添加顶级分类名称字段 mkm 2024-11-07 16:43:02 +08:00
• fc28c31426 Merge pull request 'feat(admin): 添加商品顶级分类信息' (#310) from dev into main mkm 2024-11-07 16:19:39 +08:00
• 7af7906e01 feat(admin): 添加商品顶级分类信息 mkm 2024-11-07 16:19:10 +08:00
• 0a1d9c00e1 Merge pull request 'fix(xlsx): 修复订单列表合计预收计算错误' (#309) from dev into main mkm 2024-11-07 16:03:39 +08:00
• 110086e74b fix(xlsx): 修复订单列表合计预收计算错误 mkm 2024-11-07 16:02:57 +08:00
• f26a037897 Merge pull request 'feat(admin): 优化预售订单购物车信息逻辑' (#308) from dev into main mkm 2024-11-06 16:23:09 +08:00
• 40ded53246 feat(admin): 优化预售订单购物车信息逻辑 mkm 2024-11-06 16:22:31 +08:00
• 86c7aad0c7 Merge pull request 'feat(beforehand_order): 添加审批记录功能并优化相关逻辑' (#307) from dev into main mkm 2024-11-06 15:47:45 +08:00
• f9cb852e37 feat(beforehand_order): 添加审批记录功能并优化相关逻辑 mkm 2024-11-06 15:46:53 +08:00
• 1f655f9844 Merge pull request 'feat(StoreOrderController): 添加设置订单店铺功能' (#306) from dev into main mkm 2024-11-05 10:20:28 +08:00
• 3d05c5940f feat(StoreOrderController): 添加设置订单店铺功能 mkm 2024-11-05 10:15:17 +08:00
• 2541790a1a Merge pull request 'fix(xlsx): 修复订单导出 Excel 显示问题' (#305) from dev into main mkm 2024-11-05 09:47:38 +08:00
• 30f1b3ec61 fix(xlsx): 修复订单导出 Excel 显示问题 mkm 2024-11-05 09:47:14 +08:00
• 92964020ed Merge pull request 'dev' (#304) from dev into main mkm 2024-11-05 09:43:57 +08:00
• a5a8e6c5fe fix(admin): 修复预约订单创建时的参数错误 mkm 2024-11-05 09:42:37 +08:00
• 53f554c574 feat(admin): 优化订单创建逻辑并添加额外信息 mkm 2024-11-05 09:42:05 +08:00
• 4cc4c8a5f6 fix(admin): 修复订单导出时的表头和数据对应问题 mkm 2024-11-05 09:35:53 +08:00
• 4268fd5da2 Merge pull request 'fix(xlsx): 修复订单信息导出时的空值错误' (#303) from dev into main mkm 2024-11-04 17:55:26 +08:00
• 02228255fa fix(xlsx): 修复订单信息导出时的空值错误 mkm 2024-11-04 17:54:58 +08:00
• b78b3c0dd6 Merge pull request 'feat(admin): 为预定单列表添加时间筛选功能' (#302) from dev into main mkm 2024-11-04 17:33:47 +08:00
• b057d4bae8 feat(admin): 为预定单列表添加时间筛选功能 mkm 2024-11-04 17:33:07 +08:00
• 320e821ce0 Merge pull request 'dev' (#301) from dev into main mkm 2024-11-04 16:29:47 +08:00
• dfc426ec94 feat(beforehand_order): 添加导出功能并优化订单处理 mkm 2024-11-04 16:20:09 +08:00
• fb94dcf7d5 feat(admin): 在仓库产品退货列表中添加 BHOID 搜索功能 mkm 2024-11-03 10:38:47 +08:00
• bdf2eaf9fe Merge pull request 'feat(purchase): 优化采购商品信息展示和存储' (#300) from dev into main mkm 2024-11-01 21:17:38 +08:00
• 710c999cef feat(purchase): 优化采购商品信息展示和存储 mkm 2024-11-01 21:11:34 +08:00
• 33cbd1a6dd Merge pull request 'feat(beforehand_order): 添加订单其他数据字段并优化用户资金流操作' (#299) from dev into main mkm 2024-10-31 15:20:00 +08:00
• 962a3df197 feat(beforehand_order): 添加订单其他数据字段并优化用户资金流操作 mkm 2024-10-31 15:15:18 +08:00
• ff7228babe Merge pull request 'refactor(admin): 优化仓库订单列表搜索功能' (#298) from dev into main mkm 2024-10-30 16:32:04 +08:00
• 0f742b653e refactor(admin): 优化仓库订单列表搜索功能 mkm 2024-10-30 16:31:31 +08:00
• ed6b2debc1 Merge pull request 'feat(admin): 为仓库订单和产品列表添加代码搜索功能' (#297) from dev into main mkm 2024-10-30 16:24:07 +08:00
• 8d62bfc3c7 feat(admin): 为仓库订单和产品列表添加代码搜索功能 mkm 2024-10-30 16:23:40 +08:00
• 0192fd57f6 Merge pull request 'refactor(store_product): 移除查询中的 field 方法' (#296) from dev into main mkm 2024-10-30 15:51:33 +08:00
• a2c561711c refactor(store_product): 移除查询中的 field 方法 mkm 2024-10-30 15:43:40 +08:00
• 07a2527e62 Merge pull request 'fix(admin): 修复预约订单参数为空时的处理逻辑' (#295) from dev into main mkm 2024-10-30 14:48:37 +08:00
• 9c63e3ac9d fix(admin): 修复预约订单参数为空时的处理逻辑 mkm 2024-10-30 14:48:06 +08:00
• 619371297e Merge pull request 'fix(admin): 优化商品信息处理逻辑' (#294) from dev into main mkm 2024-10-30 14:43:14 +08:00
• 1333d13fdf fix(admin): 优化商品信息处理逻辑 mkm 2024-10-30 14:40:51 +08:00
• 7dd46d13a5 Merge pull request 'dev' (#293) from dev into main mkm 2024-10-30 10:19:36 +08:00
• 837d9ed548 更新提现 mkm 2024-10-29 16:32:47 +08:00
• e6e2cc78c3 feat(user): 新增设置采购款和余额功能 mkm 2024-10-29 12:00:25 +08:00
• 36c1c45415 refactor(warehouse): 优化仓库产品逻辑中的数值处理 mkm 2024-10-28 10:17:03 +08:00
• 61a5d5d6d5 feat(warehouse): 仓库产品列表增加分类名称显示 mkm 2024-10-27 18:09:48 +08:00
• 9aa4431523 feat(admin): 优化仓库产品和财务流水列表 mkm 2024-10-24 11:17:41 +08:00
• 97e0704cec feat(beforehand_order): 优化订单逻辑和商品详情 mkm 2024-10-21 15:43:01 +08:00
• 561d92567e Merge pull request 'feat(admin): 修复后台商品状态操作权限问题' (#292) from dev into main mkm 2024-10-21 10:00:39 +08:00
• 34b9cd8061 feat(admin): 修复后台商品状态操作权限问题 mkm 2024-10-21 10:00:03 +08:00
• edace3e788 Merge pull request 'feat(purchase): 添加采购产品价格计算功能' (#291) from dev into main mkm 2024-10-19 17:16:57 +08:00
• 0668c84279 feat(purchase): 添加采购产品价格计算功能 mkm 2024-10-19 17:15:51 +08:00
• d551e4480f Merge pull request 'fix(warehouse): 修正采购价格计算错误' (#290) from dev into main mkm 2024-10-18 16:55:07 +08:00
• e924954a9a fix(warehouse): 修正采购价格计算错误 mkm 2024-10-18 16:54:48 +08:00
• 4da19372e1 Merge pull request 'fix(warehouse): 修复采购单总金额计算错误' (#289) from dev into main mkm 2024-10-18 16:53:32 +08:00
• 66d759a7c6 fix(warehouse): 修复采购单总金额计算错误 mkm 2024-10-18 16:53:11 +08:00
• 3310da11a8 Merge pull request 'fix(warehouse): 修正仓库订单总价计算错误' (#288) from dev into main mkm 2024-10-18 16:49:17 +08:00
• c6b550821d fix(warehouse): 修正仓库订单总价计算错误 mkm 2024-10-18 16:48:44 +08:00
• 20b7fedc58 Merge pull request 'refactor(warehouse): 优化仓库订单控制器中的价格计算逻辑' (#287) from dev into main mkm 2024-10-18 16:47:35 +08:00
• d5301bf8fc refactor(warehouse): 优化仓库订单控制器中的价格计算逻辑 mkm 2024-10-18 16:46:59 +08:00
• e1b3509123 Merge pull request 'feat(purchase_product_offer): 添加订单 ID 和备注到 Excel 导出字段' (#286) from dev into main mkm 2024-10-18 15:44:23 +08:00
• 42f30c8d09 feat(purchase_product_offer): 添加订单 ID 和备注到 Excel 导出字段 mkm 2024-10-18 15:43:46 +08:00
• 55e417a1e2 Merge pull request 'dev' (#285) from dev into main mkm 2024-10-18 15:39:35 +08:00
• dbc97dca98 feat(admin): 优化预订单导出功能 mkm 2024-10-18 15:39:07 +08:00
• 25eaaab509 fix(admin): 优化预订单购物车详情状态更新逻辑 mkm 2024-10-18 15:06:49 +08:00
• f09eca45a3 Merge pull request 'refactor(admin): 优化预订单更新逻辑' (#284) from dev into main mkm 2024-10-18 13:00:35 +08:00
• 2506a02601 refactor(admin): 优化预订单更新逻辑 mkm 2024-10-18 13:00:10 +08:00
• 2ec21746eb Merge pull request 'refactor(admin): 优化仓库产品价格更新逻辑' (#283) from dev into main mkm 2024-10-18 12:58:12 +08:00
• f9b5cfa478 refactor(admin): 优化仓库产品价格更新逻辑 mkm 2024-10-18 12:57:50 +08:00
• 7348dd425d Merge pull request 'dev' (#282) from dev into main mkm 2024-10-18 11:45:38 +08:00
• 07b5564e0e fix(admin): 修复订单提交时商品数量为零的问题 mkm 2024-10-18 11:43:53 +08:00
• 7a742331de feat(admin): 设置仓库商品信息并优化订单处理逻辑 mkm 2024-10-18 11:36:46 +08:00
• c726030b1c Merge pull request 'dev' (#281) from dev into main mkm 2024-10-18 09:41:30 +08:00