Merge remote-tracking branch 'origin/developer' into developerC

# Conflicts:
#	src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

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

@@ -2051,10 +2051,10 @@ public class ReceiptServiceImpl implements ReceiptService {
             // 建设银行
             if (Arrays.asList(1, 18, 19).contains(typeId)) {
                 for (int i = 1; i < 5; i++) {
-                    if(contentTime.get(i).length()<2){
+                    if (contentTime.get(i).length() < 2) {
                         String s = contentTime.get(i);
-                        s="0"+s;
-                        contentTime.set(i,s);
+                        s = "0" + s;
+                        contentTime.set(i, s);
                     }
                 }
                 time = year + "-" + contentTime.get(1) + "-" + contentTime.get(2) + " " + contentTime.get(3) + ":" + contentTime.get(4) + ":" + "00";

src/main/resources/mapper/OrderCommonMapper.xml

@@ -215,7 +215,7 @@
         cop.productImage AS image,
         cop.price,
         cop.shopName,
-        IF(cop.shopid=998 AND co.freight> 0,co.freight,cop.price)AS costPrice,
+        IF(cop.shopid=998 AND co.freight> 0,co.freight,cop.costPrice)AS costPrice,
         cop.normalPrice,
         cop.ladderPriceFlag,
         cop.discountPrice,

src/main/resources/mapper/ReceiptMapper.xml

@@ -866,6 +866,7 @@
         cror.splitStatus
         FROM cm_receipt_order_relation cror
         WHERE cror.receiptID = #{receiptId}
+        and cror.delflag = 0
         ORDER BY cror.id DESC
     </select>
     <select id="getPendingAuditCount" resultType="java.lang.Integer">