bugfix列表主键ID

src/main/resources/mapper/OrderCommonMapper.xml

@@ -30,6 +30,7 @@
         cso.orderTime,
         cso.orderSubmitType,
         cso.splitFlag,
+        cso.sendOutStatus,
         s.name AS shopName,
         s.logo AS shopLogo
         FROM cm_shop_order cso
@@ -58,6 +59,7 @@
     </select>
     <select id="getShopOrderProduct" resultType="com.caimei365.order.model.vo.OrderProductVo">
         SELECT
+        cop.orderProductID AS orderProductId,
         cop.orderID AS orderId,
         cop.orderNo,
         cop.shopOrderID AS shopOrderId,
@@ -107,6 +109,7 @@
     </select>
     <select id="getDiscernReceipt" resultType="com.caimei365.order.model.vo.DiscernReceiptVo">
         SELECT
+        cdr.id,
         cdr.payWay,
         cdr.payType,
         cdr.receiptType,
@@ -176,6 +179,7 @@
     </select>
     <select id="getOrderProductByOrderId" resultType="com.caimei365.order.model.vo.OrderProductVo">
         SELECT
+        cop.orderProductID AS orderProductId,
         cop.orderID AS orderId,
         cop.orderNo,
         cop.shopOrderID AS shopOrderId,
@@ -316,6 +320,7 @@
         orderTime,
         orderSubmitType,
         payStatus,
+        sendOutStatus,
         splitFlag
         FROM cm_shop_order
         WHERE delFlag = 0

src/main/resources/mapper/PayOrderMapper.xml

@@ -135,6 +135,7 @@
     </select>
     <select id="getSplitAccountList" resultType="com.caimei365.order.model.po.SplitAccountPo">
         SELECT
+            id,
             orderId,
             productId,
             orderProductId,

src/main/resources/mapper/ShipMapper.xml

@@ -120,6 +120,7 @@
             a.orderTime,
             a.orderSubmitType,
             a.payStatus,
+            a.sendOutStatus,
             a.splitFlag
         FROM cm_shop_order a
         LEFT JOIN bp_order_userinfo ou ON  ou.orderId=a.orderId
@@ -213,6 +214,7 @@
             orderTime,
             orderSubmitType,
             payStatus,
+            sendOutStatus,
             splitFlag
         FROM cm_shop_order
         WHERE shopOrderID = #{shopOrderId} AND delFlag = '0'
@@ -233,6 +235,7 @@
     </select>
     <select id="getOrderProductById" resultType="com.caimei365.order.model.vo.OrderProductVo">
         SELECT
+            cop.orderProductID AS orderProductId,
             cop.orderID AS orderId,
             cop.orderNo,
             cop.shopOrderID AS shopOrderId,
@@ -350,6 +353,7 @@
     </select>
     <select id="getLogisticsRecord" resultType="com.caimei365.order.model.vo.LogisticsRecordVo">
         SELECT
+            id,
             logisticsBatchID AS logisticsBatchId,
             shopOrderID AS shopOrderId,
             orderID AS orderId,