Merge remote-tracking branch 'origin/developerF' into developerF

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -1324,7 +1324,7 @@
                 #{authVipRecordId}, #{type}, #{subUserNo}, #{splitAccount},
                 #{mbOrderId}, #{orderRequestNo}, #{payStatus}, #{productType},#{shopOrderId}, NOW());
     </insert>
-    <insert id="insertPayShop">
+    <insert id="insertPayShop" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
         INSERT INTO cm_pay_shop (shopID, name, bankAccountName, bankAccount, bankName, type, totalAmount, balancePayFee,
                                  transferPayFee, payType, wipePayment, wipeRemarks, wipeRemarkImages, wipeTime, applicant,
                                  applyTime, reviewer, reviewTime, payTime, status, reason, delFlag)
@@ -1332,7 +1332,7 @@
                 #{transferPayFee}, #{payType}, #{wipePayment}, #{wipeRemarks}, #{wipeRemarkImages}, #{wipeTime}, #{applicant},
                 #{applyTime}, #{reviewer}, #{reviewTime}, #{payTime}, #{status}, #{reason}, #{delFlag})
     </insert>
-    <insert id="insertPayShopRecord">
+    <insert id="insertPayShopRecord" keyColumn="id" keyProperty="id"  useGeneratedKeys="true">
         INSERT INTO cm_pay_shop_record (shopID, shopOrderID, shopOrderNo, payAmount, wipePayment, payType, payTime, payShopID, status, delFlag)
         VALUES (#{shopId}, #{shopOrderId}, #{shopOrderNo}, #{payAmount}, #{wipePayment}, #{payType}, #{payTime}, #{payShopId}, #{status}, #{delFlag})
     </insert>

src/main/resources/mappings/modules/order/ShopOrderMapper.xml

@@ -1124,6 +1124,7 @@
         WHERE co.organizeID = 0
           AND co.refundType != 2
           AND co.delFlag = 0
+          AND co.orderType != 2
           AND a.delFlag = 0
           AND a.shopID != 998
           AND cdr.payWay = 1