From 9d7e27bfc73ebc50987d63623c5c2c18241969ab Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 14:49:53 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index 51e7d1a..93eb34e 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -133,7 +133,7 @@
scoreOrder.setStatus(ScoreOrder.STATUS_ON);
scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
}
- return scoreExpressInfo.getId();
+ return id;
}
public Long insureOrder(InsureOrderDto model) {
--
Gitblit v1.9.1