bugfix供应商发货

src/main/java/com/caimei365/order/service/impl/ShipServiceImpl.java

@@ -23,6 +23,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
@@ -228,6 +229,7 @@ public class ShipServiceImpl implements ShipService {
      *                        ],
      *                     }
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public ResponseJson<Integer> addDelivery(LogisticsDto logisticsDto) {
         JSONArray logistics;

src/main/resources/mapper/OrderClubMapper.xml

@@ -188,7 +188,7 @@
             cop.shouldPayFee,
             cop.productUnit,
             cop.num,
-            cop.presentNum,
+            IFNULL(cop.presentNum,0) AS presentNum,
             cop.discountFee,
             cop.includedTax,
             cop.invoiceType,

src/main/resources/mapper/OrderCommonMapper.xml

@@ -345,9 +345,9 @@
     <select id="getLogisticsRecord" resultType="com.caimei365.order.model.vo.LogisticsRecordVo">
         SELECT
         clr.id,
-        clr.logisticsBatchID AS shopOrderId,
+        clr.logisticsBatchID AS logisticsBatchId,
         clr.shopOrderID AS shopOrderId,
-        clr.orderID AS orderProductId,
+        clr.orderID AS orderId,
         clr.orderProductID AS orderProductId,
         clr.buyNum,
         clr.num,

src/main/resources/mapper/ShipMapper.xml

@@ -210,7 +210,7 @@
             shopTaxFee,
             shouldPayShopAmount,
             outStoreNum,
-            presentNum,
+            IFNULL(presentNum,0) AS presentNum,
             orderTime,
             orderSubmitType,
             payStatus,
@@ -257,7 +257,7 @@
             cop.shouldPayFee,
             cop.productUnit,
             cop.num,
-            cop.presentNum,
+            IFNULL(cop.presentNum,0) AS presentNum,
             cop.discountFee,
             cop.includedTax,
             cop.invoiceType,