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

src/main/resources/mapper/OrderClubMapper.xml

@@ -75,7 +75,8 @@
     </update>
     <update id="cancelMainShopOrder">
         UPDATE cm_shop_order
-        SET shopStatus = #{status}
+        SET shopStatus = #{status},
+            closeTime = now()
         WHERE shopOrderId = #{shopOrderId}
     </update>
     <update id="deleteMainOrder">