fix(votesActivity): 修复支付方式显示逻辑错误

Administrator

2025-04-30 747b1968b2d9ad3d4279485d13dfe24d0968fd99

 src/main/resources/mapper/modules/MallOrderInfoMapper.xml

@@ -56,9 +56,10 @@
        select a.*,
               b.name memberName,
               b.bind_phone memberBindPhone,
               b.phone memberPhone
               b.phone memberPhone,
               (select member.name from mall_member member where member.invite_id = b.referrer_id) refererName
        from mall_order_info a
        left join mall_member b on a.member_id = b.id
        inner join mall_member b on a.member_id = b.id
        <where>
            <if test="record != null">
                <if test="record.payResult != null and record.payResult != ''">
@@ -126,6 +127,7 @@
        <result column="take_unique_code" property="takeUniqueCode" />
        <result column="delivery_state" property="deliveryState" />
        <result column="is_home" property="isHome" />
        <result column="is_free" property="isFree" />
        <result column="del_flag" property="delFlag" />
        <result column="leader_name" property="leaderName" />
        <result column="leader_phone" property="leaderPhone" />
@@ -151,6 +153,8 @@
            <result property="price" column="price" />
            <result property="amount" column="amount" />
            <result property="isNormal" column="is_normal" />
            <result property="memberInviteId" column="member_invite_id" />
            <result property="memberCouponId" column="member_coupon_id" />
            <result property="state" column="state" />
        </collection>
    </resultMap>
@@ -199,6 +203,8 @@
            b.cnt,
            b.price,
            b.amount,
            b.member_invite_id,
            b.member_coupon_id,
            b.is_normal
        from mall_order_info a
             inner join mall_order_item b on a.id=b.order_id
@@ -210,7 +216,7 @@
            a.status,
            count(1) cnt
        from mall_order_info a
        where a.del_flag=2 and a.member_id=#{memberId}
        where a.del_flag=2 and a.member_id=#{memberId} and order_type = 1
        group by a.status
    </select>

@@ -226,6 +232,10 @@

    <select id="selectOrderInfoByStatus" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
        select * from mall_order_info where status=#{status}
    </select>

    <select id="selectOrderInfoByStatusAndIsInvoice" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
        select * from mall_order_info where status = #{status} and is_invoice = #{isInvoice}
    </select>

    <select id="selectOrderInfoUpTime" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
@@ -365,6 +375,7 @@
        <result column="take_unique_code" property="takeUniqueCode" />
        <result column="delivery_state" property="deliveryState" />
        <result column="is_home" property="isHome" />
        <result column="is_free" property="isFree" />
        <result column="del_flag" property="delFlag" />
        <result column="leader_name" property="leaderName" />
        <result column="leader_phone" property="leaderPhone" />
@@ -377,12 +388,15 @@
        <result column="city" property="city" />
        <result column="township" property="township" />
        <result column="detail_address" property="detailAddress" />
        <result column="express_no" property="expressNo" />
    </resultMap>

    <select id="selectNewApiOrderListInPage" resultMap="NewOrderInfoMap">
        select
        a.*
        ,express.express_no
        from mall_order_info a
            left join mall_express_info express on a.id=express.order_id
        <where>
            a.del_flag=2
            <if test="record.memberId != null">
@@ -423,20 +437,38 @@
    </select>

    <select id="getGoodsStatisticsInPage" resultType="cc.mrbird.febs.mall.vo.AdminGoodsStatisticsVo">
    select
        goods_name goodsName,
        SUM(cnt) goodsCnt
    from mall_order_item
    <where>
    1=1
        <if test="record.orderIdsStr != null">
            and order_id in
                <foreach collection="record.orderIdsStr" item="id" index="index" open="(" close=")" separator=",">
                    #{id}
                </foreach>
        </if>
    </where>
        GROUP BY goods_id
        ORDER BY goods_id desc
</select>
        select
            goods_name goodsName,
            SUM(cnt) goodsCnt
        from mall_order_item
        <where>
        1=1
            <if test="record.orderIdsStr != null">
                and order_id in
                    <foreach collection="record.orderIdsStr" item="id" index="index" open="(" close=")" separator=",">
                        #{id}
                    </foreach>
            </if>
        </where>
            GROUP BY goods_id
            ORDER BY goods_id desc
    </select>

    <select id="selectAmountOrTeamAmount" resultType="java.math.BigDecimal">
        select IFNULL(sum(IFNULL(a.amount,0)),0) from mall_order_info a
        inner join mall_member b on a.member_id=b.ID
        <where>
            a.status in (2,3,4)
            <if test="type == 1">
                and b.invite_id=#{inviteId}
            </if>
            <if test="type == 2">
                and FIND_IN_SET(#{inviteId},b.referrer_ids)
            </if>
        </where>
    </select>

    <select id="selectBypayOrderNo" resultType="cc.mrbird.febs.mall.entity.MallOrderInfo">
        select * from mall_order_info where pay_order_no = #{payOrderNo}
    </select>
</mapper>