Merge branch 'gray' into dev_order

@@ -116,17 +116,9 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
             throw new ServiceException(ServiceError.ORDER_NULL);
             throw new ServiceException(ServiceError.ORDER_NULL);
         }
         }
 
 
-        // 保存订单物流信息
-        saveExpress(sellerUid,expressCompanyId,orderCode,wayBillCode,expressType,depotNum);
-
-        // 发送mq获取物流信息
-        sendExpressMQ(sellerUid,expressCompanyId,orderCode,wayBillCode);
-        LOGGER.info("deliverToDepot end ! send express to erp  ");
-
         //根据skup ，更新鉴定中心
         //根据skup ，更新鉴定中心
-        int skup;
         SellerOrderGoods sellerOrderGoods=new SellerOrderGoods();
         SellerOrderGoods sellerOrderGoods=new SellerOrderGoods();
-        sellerOrderGoods.setId(skup=buyerOrderGoods.getSkup());
+        sellerOrderGoods.setId(buyerOrderGoods.getSkup());
         sellerOrderGoods.setDepotNo(depotNum);
         sellerOrderGoods.setDepotNo(depotNum);
         sellerOrderGoodsMapper.updateByPrimaryKeySelective(sellerOrderGoods);
         sellerOrderGoodsMapper.updateByPrimaryKeySelective(sellerOrderGoods);
 
 
@@ -135,6 +127,16 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
         // 更新买家订单状态
         // 更新买家订单状态
         int updateBuyerCnt = buyerOrderMapper.updateStatusByOrderCode(orderCode, buyerOrder.getUid(),
         int updateBuyerCnt = buyerOrderMapper.updateStatusByOrderCode(orderCode, buyerOrder.getUid(),
                 expectOrderStatus.getCode(), targetOrderStatus.getCode(), DateUtil.getCurrentTimeSecond());
                 expectOrderStatus.getCode(), targetOrderStatus.getCode(), DateUtil.getCurrentTimeSecond());
+        if (updateBuyerCnt > 0) {  // 更新买家订单成功之后，插入物流信息。防止并发、重复提交
+            // 保存订单物流信息
+            saveExpress(sellerUid,expressCompanyId,orderCode,wayBillCode,expressType,depotNum);
+
+            // 发送mq获取物流信息
+            sendExpressMQ(sellerUid,expressCompanyId,orderCode,wayBillCode);
+
+            LOGGER.info("deliverToDepot end ! send express to erp  ");
+        }
+
         LOGGER.info("deliverToDepot update buyer order  status result {} ",updateBuyerCnt);
         LOGGER.info("deliverToDepot update buyer order  status result {} ",updateBuyerCnt);