From 808cc69dc7c72f3fa3221549c0b1da906e82bdf7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Jun 2021 18:47:36 +0800
Subject: [PATCH] 20210624 商品分类

---
 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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 04201e4..4cc2af1 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
@@ -96,7 +96,7 @@
         return viewOrderVo;
     }
 
-    public void deliverGoods(DeliverGoodsDto model) {
+    public Long deliverGoods(DeliverGoodsDto model) {
         /**
          * 获取物流表的信息
          * 更新物流信息
@@ -107,12 +107,16 @@
         Example.Criteria criteriaExpress = exampleExpress.createCriteria();
         criteriaExpress.andEqualTo("orderId",id);
         ScoreExpressInfo scoreExpressInfo = scoreExpressInfoMapper.selectOneByExample(exampleExpress);
-        scoreExpressInfo.setExpressNo(model.getExpressNo());
-        scoreExpressInfo.setExpressCom(model.getExpressCom());
-        scoreExpressInfoMapper.updateByPrimaryKeySelective(scoreExpressInfo);
+        if(ObjectUtil.isNotEmpty(scoreExpressInfo)){
+            scoreExpressInfo.setExpressNo(model.getExpressNo());
+            scoreExpressInfo.setExpressCom(model.getExpressCom());
+            scoreExpressInfoMapper.updateByPrimaryKeySelective(scoreExpressInfo);
 
-        ScoreOrder scoreOrder = scoreOrderMapper.selectByPrimaryKey(id);
-        scoreOrder.setStatus(ScoreOrder.STATUS_ING);
-        scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+            ScoreOrder scoreOrder = new ScoreOrder();
+            scoreOrder.setId(id);
+            scoreOrder.setStatus(ScoreOrder.STATUS_ING);
+            scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder);
+        }
+        return scoreExpressInfo.getId();
     }
 }

--
Gitblit v1.9.1