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

• 1f9765d44f feat: 优化了支付通知逻辑，增加了条件判断以处理不同情况下的手续费、平台费用等支出和收入。 mkm 2024-06-15 18:45:10 +08:00
• d04149ba48 更新数据字段 liu 2024-06-15 18:12:07 +08:00
• bf98d4837a 修改回调和商品成本 liu 2024-06-15 18:00:53 +08:00
• 6b75053f6f feat(OrderEnum): 添加会员订单获取类型 mkm 2024-06-15 17:19:37 +08:00
• b2bea08671 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-15 17:18:01 +08:00
• 4c8ce2bd64 feat(OrderEnum): 添加订单保证金类型 mkm 2024-06-15 17:17:57 +08:00
• dfc7266fb0 补齐模型调用 liu 2024-06-15 17:15:18 +08:00
• f8e232fc58 feat: 修改财务流水分支逻辑并优化订单枚举类 mkm 2024-06-15 17:13:44 +08:00
• 68624a0304 feat(OrderLogic): 修改订单逻辑，优化用户分享关系获取方式 mkm 2024-06-15 16:47:50 +08:00
• fe1aecaf87 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-15 16:46:13 +08:00
• d4c53ac69d feat(order): 添加用户等级判断逻辑以调整订单总价和抵扣金额 mkm 2024-06-15 16:41:04 +08:00
• 39173539d4 修改参数报错 liu 2024-06-15 16:38:53 +08:00
• a75b72224e Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-15 16:07:54 +08:00
• bfbd01fcc1 feat: 增加用户余额和购买资金字段，优化支付通知逻辑，限制充值会员不能前端设置 mkm 2024-06-15 16:07:50 +08:00
• 8c1608207e 新增发送短信验证检验用户采购款够支付否 liu 2024-06-15 16:06:28 +08:00
• 341cbe7457 兼容商户端订单查询 liu 2024-06-15 15:54:32 +08:00
• 8e82e40379 收银台相关验证码逻辑新增 liu 2024-06-15 15:35:03 +08:00
• 98683fcc52 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-15 15:08:09 +08:00
• b756c07191 feat: 修改用户余额字段及相关逻辑 mkm 2024-06-15 15:07:59 +08:00
• bc867d7362 小程序登录临时处理 liu 2024-06-15 14:30:23 +08:00
• 94d89f86dc feat: 移除 UserAddressValidate 类中的 detail 字段验证 mkm 2024-06-15 14:15:05 +08:00
• df8e852373 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-15 13:44:41 +08:00
• e2c471c030 feat: 修改支付逻辑增加充值功能 mkm 2024-06-15 13:44:32 +08:00
• 1109eb92f1 购物车新增删除标识 liu 2024-06-15 11:42:54 +08:00
• 5e5cc45490 兼容已经删除的创建相关 liu 2024-06-15 11:36:34 +08:00
• e960f06837 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-15 11:13:57 +08:00
• 97a7a830c3 feat: 增加地址API功能 mkm 2024-06-15 11:13:52 +08:00
• 64fce0c613 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev liu 2024-06-15 11:07:15 +08:00
• aa2c146300 修改采购款标识 liu 2024-06-15 11:07:02 +08:00
• 177d9576c7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-15 11:00:29 +08:00
• 48a66a5328 feat(UserLists): 添加搜索功能实现ListsSearchInterface mkm 2024-06-15 11:00:20 +08:00
• 545e01e75a 新增采购款支付方式和预留用户分享逻辑 liu 2024-06-15 10:49:53 +08:00
• 9cefd94d26 feat: 添加对短信服务商的支持 mkm 2024-06-15 10:38:13 +08:00
• 1741babcf4 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-15 10:18:36 +08:00
• 975a296b46 feat: 添加库存类型参数和库存处理逻辑 mkm 2024-06-15 10:18:32 +08:00
• fc59e41fc6 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev liu 2024-06-15 09:46:51 +08:00
• 112e9b9c4a 更新充值到用户得采购款 liu 2024-06-15 09:46:41 +08:00
• d48ee7b613 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-15 09:44:28 +08:00
• 03ea382ab7 feat: 修改了供应链订单获得逻辑 mkm 2024-06-15 09:44:23 +08:00
• b3d6645953 返回用户相关金额 liu 2024-06-15 09:38:59 +08:00
• 6e68525779 兼容分类查询 liu 2024-06-14 18:19:05 +08:00
• 41ff69e0d9 兼容2级和1级别查询 liu 2024-06-14 18:16:52 +08:00
• 305707d179 修改时间查询 liu 2024-06-14 17:55:56 +08:00
• 189c872815 新增时间搜索 liu 2024-06-14 17:53:31 +08:00
• 46ba3cb31f 修改默认查询店铺数据 liu 2024-06-14 17:44:59 +08:00
• 449ecc0508 修改默认商户id liu 2024-06-14 17:35:04 +08:00
• fbae752232 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-14 16:40:52 +08:00
• e8ee8531d0 feat(UserShipLists): 修改用户 ship 列表中的会员等级描述 mkm 2024-06-14 16:40:48 +08:00
• b18561b28c 更新状态 liu 2024-06-14 16:39:35 +08:00
• 5de9a7f264 时间处理 liu 2024-06-14 16:37:05 +08:00
• 0a0fba85df 修改查询逻辑 liu 2024-06-14 16:16:42 +08:00
• 218bbdfe4b feat: 新增用户注册地址信息创建功能 mkm 2024-06-14 16:05:48 +08:00
• 39b3e124cd feat: 添加'村'和'大队'到不需要登录的API列表 mkm 2024-06-14 15:56:33 +08:00
• a29d2d42d2 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-14 15:53:56 +08:00
• e14290ef82 feat: 移除 API 文档注释 mkm 2024-06-14 15:53:47 +08:00
• 3bbf947674 财务上传凭证相关 liu 2024-06-14 15:34:50 +08:00
• a21727f09b 店铺提现列表,后台设置商户的提现银行相关信息 liu 2024-06-14 15:06:09 +08:00
• 83f03f126d Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-14 14:15:16 +08:00
• 78f238e67c feat(StoreOrderLogic): 修改了计算价格的逻辑，完善了商品信息的查询 mkm 2024-06-14 14:15:11 +08:00
• df65644fe8 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev liu 2024-06-14 14:07:16 +08:00
• 12ad62e4f5 发送给店铺确认消息 liu 2024-06-14 14:07:03 +08:00
• d2c269deb7 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-14 13:56:13 +08:00
• 180ac14af8 feat: 增加'swap'参数到商品存储逻辑 mkm 2024-06-14 13:56:09 +08:00
• f0b2b3cc5a 店铺提现相关流程 liu 2024-06-14 13:54:37 +08:00
• 88e6f861ab feat: 修改了支付通知逻辑，优化了资金流向计算方式，增加了对VIP订单和普通订单的区分处理。 mkm 2024-06-14 13:46:03 +08:00
• 5f10ea20af Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-14 11:50:48 +08:00
• b1d6d23f73 feat: 添加会员订单获得等枚举值和处理VIP订单等逻辑 mkm 2024-06-14 11:50:35 +08:00
• d84aa1d021 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev liu 2024-06-14 10:54:39 +08:00
• f0a6491adb 搜索相关兼容 liu 2024-06-14 10:54:24 +08:00
• 445c784d1f feat: 修改了商品管理、订单处理和用户优惠逻辑 mkm 2024-06-14 09:48:45 +08:00
• 2c3d82e17f feat: 增加对商品分类更新逻辑 mkm 2024-06-14 09:15:28 +08:00
• e9843de7b3 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-13 17:49:52 +08:00
• 192169542e feat: 更新商品分类逻辑 mkm 2024-06-13 17:49:42 +08:00
• 6280a3e6b6 订单相关数据查询 liu 2024-06-13 17:25:39 +08:00
• f2d777d5e3 订单支付为0时处理 liu 2024-06-13 17:05:43 +08:00
• 18da768909 Merge pull request 'dev' (#1) from dev into main mkm 2024-06-13 16:49:32 +08:00
• 7c35d4e504 feat: 修改订单逻辑以处理库存和销售数据 mkm 2024-06-13 16:38:28 +08:00
• 3f90482d70 feat: 修改订单创建逻辑，优化了支付类型判断和订单生成过程，并调整了部分代码结构。 mkm 2024-06-13 16:11:14 +08:00
• a1b54043d2 feat(StoreOrderLogic): 修改订单逻辑，简化折扣计算，调整利润计算方法 mkm 2024-06-13 16:09:31 +08:00
• ae5f0044b3 feat: 增加会员折扣功能 mkm 2024-06-13 16:00:19 +08:00
• 69236a50d2 feat: 修改了商品列表和商品逻辑，增加了VIP价格字段，并更新了分类统计功能。 mkm 2024-06-13 15:23:06 +08:00
• 37f7d9ef4e Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-13 15:15:37 +08:00
• 8b39a9e635 feat: 添加价格和会员价格字段 mkm 2024-06-13 15:15:24 +08:00
• f1015916d6 收银机展示小程序已经核销的 liu 2024-06-13 11:08:37 +08:00
• 5e08f9359c 新增商户查询接口 liu 2024-06-13 10:27:56 +08:00
• c88b37c25e feat(StoreOrderLogic): 修改配送方式默认值为3 mkm 2024-06-13 10:01:40 +08:00
• 0451dea858 feat: 修改支付通知逻辑，移除Redis消息的过期时间 mkm 2024-06-13 09:51:36 +08:00
• cf0520f1e6 feat: 修改订单逻辑和支付通知逻辑，并更新存储发送中的商品信息 mkm 2024-06-13 09:35:33 +08:00
• a37151676b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-12 18:17:01 +08:00
• ac86bf341f feat: 修改了工作台控制器，添加了商品浏览量、支付金额和退款金额的API接口；修复了当订单金额为0时，支付转化率计算错误的bug；重构了代码，使其更加简洁易读。 mkm 2024-06-12 18:16:53 +08:00
• acb37149ca 修改路径地址 liu 2024-06-12 17:09:56 +08:00
• baa01821e2 详情处理 liu 2024-06-12 16:59:33 +08:00
• 8c7684477f 拼接数据 liu 2024-06-12 16:39:26 +08:00
• 06258e7854 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-06-12 16:12:02 +08:00
• b818d716f4 feat(WorkbenchLogic): 增加购物车统计功能 mkm 2024-06-12 16:11:53 +08:00
• bd925bed5b 修改参数 liu 2024-06-12 16:07:09 +08:00
• b5d860a4c0 修改存储路径方式 liu 2024-06-12 16:05:49 +08:00
• 14c588718a 核销图片字段 liu 2024-06-12 15:54:41 +08:00
• 664d24091c add核销码图片 liu 2024-06-12 15:22:43 +08:00
• 955e28a4c6 修改搜索器 liu 2024-06-12 15:14:05 +08:00