Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderV2Dao.java

@@ -10,10 +10,11 @@
public interface ShopOrderV2Dao extends BaseMapper<ShopOrder> {

   /** 统计已收货订单数 */
   int selectReceivedOrderCount(String openId);
   int selectReceivedOrderCount(Long userId);
   /** 统计已收货订单金额 */
   Double countOrderAmount(String openId);
   Double countOrderAmount(Long userId);

   /** 统计是否消费过了指定产品 */
   int countBuyZdcp(@Param("openId") String openId, @Param("productIds")String productIds);
   int countBuyZdcp(@Param("userId") Long userId, @Param("productIds")String productIds);

}