Merge remote-tracking branch 'origin/score_shop' into develop

JiangYouYao

2022-03-15 9c5d7547fa9b37c09659c90448ade6df6db4f2de

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

@@ -70,9 +70,11 @@

   public int selectShopOrderTotalByApplyId(@Param("applyId") Long applyId);

   public List<Map<String,Object>>  selectOrderStatusCount(String openId);
   public List<Map<String,Object>>  selectOrderStatusCount(Long userId);

   public int batchUpdateOrderStatus(@Param("list") List<ShopOrder> list);

   public ShopOrder selectShopOrderByOrderNo(@Param("orderNo")String orderNo);


}