Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy

Helius

2022-09-23 7c6f033b8754b07bf5c75ae8745a982d76f9abb4

 src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java

@@ -8,6 +8,7 @@
import cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo;
import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
import cc.mrbird.febs.mall.vo.AdminOrderDetailVo;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -44,6 +45,8 @@

    List<MallOrderInfo> selectOrderInfoByStatus(@Param("status") Integer status);

    List<MallOrderInfo> selectOrderInfoUpTime(@Param("status") Integer status);

    Integer selectCntDirectOrTeam(@Param("type") Integer type, @Param("inviteId") String inviteId);

    Integer selectCntDirect(@Param("inviteId") String inviteId);
@@ -56,11 +59,17 @@

    MallOrderInfo selectByOrderNo(@Param("orderNo") String orderNo);

    int updateOrderConfirmStatus(@Param("date") Date date);
    int updateOrderConfirmStatus(@Param("updateTime")DateTime updateTime,@Param("date") Date date);

    List<MallOrderInfo> selectOrderInfoWithNormalGoods(@Param("date") Date date);

    BigDecimal selectSumAmountByPayMethodAndStatue(@Param("payMethod")String name, @Param("statue")int value);

    void updateOrderStateAndDeliveryState(@Param("orderId")Long orderId, @Param("orderState")int orderState, @Param("deliveryState")int deliveryState);

    List<Map<String, Integer>> selectMemberOrderStatusCntByUniquecode(@Param("uniqueCode")String uniqueCode);

    List<MallOrderInfo> selectOrderByStatusAndPayTime(@Param("status")Integer i, @Param("paytime")DateTime offsetDay);

    IPage<MallOrderInfo> selectNewApiOrderListInPage(IPage<MallOrderInfo> page, @Param("record") OrderListDto orderListDto);
}