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

xiaoyong931011

2022-05-18 f5a898b9927c05179c213bf4e6a6f2310e097e74

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

@@ -23,6 +23,8 @@
 **/
public interface MallOrderInfoMapper extends BaseMapper<MallOrderInfo> {

    IPage<MallOrderInfo> selectInPage(@Param("record") MallOrderInfo mallOrderInfo, IPage<MallOrderInfo> page);

    MallOrderInfo selectOrderByMemberIdAndId(@Param("memberId") Long memberId, @Param("id") Long id);

    IPage<AdminMallOrderInfoVo> selectOrderListInPage(Page<AdminMallOrderInfoVo> page, @Param("record") MallOrderInfoDto mallOrderInfo);
@@ -48,4 +50,6 @@
    BigDecimal selectTotalAmount(@Param("memberId") Long memberId);

    BigDecimal selectTotalAmountForDate(@Param("date") Date date, @Param("member") Long memberId);

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