bug

jiangqs

2023-08-06 094ef61ce4661fc69847ce154b8ae1ea0de31d54

bug

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -1519,6 +1519,7 @@
            if (memberTotalChangeDto.getTypeService() == 2) {
                memberTotal.setUseableServiceCount(memberTotal.getUseableServiceCount() - memberTotalChangeDto.getServiceCount());
                memberTotal.setUsedServiceCount(memberTotal.getUsedServiceCount() + memberTotalChangeDto.getServiceCount());
                memberTotal.setLastServiceTime(new Date());
            } else {
                memberTotal.setUseableServiceCount(memberTotal.getUseableServiceCount() + memberTotalChangeDto.getServiceCount());
                memberTotal.setTotalServiceCount(memberTotal.getTotalServiceCount() + memberTotalChangeDto.getServiceCount());

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/MemberMapper.xml

@@ -779,7 +779,7 @@
        SELECT
        IFNULL(SUM(CASE WHEN gender = 0 THEN 1 ELSE 0 END),0) manTotal,
        IFNULL(SUM(CASE WHEN gender = 1 THEN 1 ELSE 0 END),0) womenTotal,
        IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, birthday, CURDATE()) BETWEEN 1 AND 20 THEN 1 ELSE 0 END),0) AS tenAge,
        IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, birthday, CURDATE()) <= 20 THEN 1 ELSE 0 END),0) AS tenAge,
        IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, birthday, CURDATE()) BETWEEN 21 AND 30 THEN 1 ELSE 0 END),0) AS twentyAge,
        IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, birthday, CURDATE()) BETWEEN 31 AND 40 THEN 1 ELSE 0 END),0) AS ThirtyAge,
        IFNULL(SUM(CASE WHEN TIMESTAMPDIFF(YEAR, birthday, CURDATE()) BETWEEN 41 AND 50 THEN 1 ELSE 0 END),0) AS fortyAge,
@@ -892,16 +892,16 @@
            </foreach>
        </if>
        <if test="param.startDate!=null and param.startDate!=''">
            AND Date(tm.create_time) &gt;= #{param.startDate}
            AND Date(tmt.last_service_time) &gt;= #{param.startDate}
        </if>
        <if test="param.endDate!=null and param.endDate!=''">
            AND Date(tm.create_time) &lt;= #{param.endDate}
            AND Date(tmt.last_service_time) &lt;= #{param.endDate}
        </if>
    </select>

    <select id="getMerMemberPayRank" resultType="com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo">
        SELECT
        tm.nick_name mapKey,
        tm.real_name mapKey,
        tmt.total_pay_count mapValue
        FROM t_member tm
        INNER JOIN t_member_total tmt ON tm.member_id = tmt.member_id

 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -1333,7 +1333,7 @@
            IFNULL(SUM(CASE WHEN order_status = 2 THEN 1 ELSE 0 END),0) unHandleOrder,
            IFNULL(SUM(change_receivable_money),0) shopTurnover
        FROM t_order
        WHERE del_flag = 0 AND shop_id = #{shopId}
        WHERE del_flag = 0 AND shop_id = #{shopId} AND order_status IN (2,3)
    </select>

    <select id="getMerHomeShopsTotalVo" resultType="com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo">
@@ -1495,13 +1495,16 @@
        IFNULL(SUM(receivable_money-IFNULL(online_pay_money,0)),0) receivableMoney,
        IFNULL(SUM(change_receivable_money),0) relReceiveMoney,
        IFNULL(SUM(CASE pay_type WHEN 1 THEN online_pay_money WHEN 2 THEN IFNULL(offline_pay_money,0) END),0) relPayMoney,
        IFNULL(SUM(receivable_money-IFNULL(CASE pay_type WHEN 1 THEN online_pay_money WHEN 2 THEN IFNULL(offline_pay_money,0) END,0)),0) unpaidMoney,
        IFNULL(SUM(receivable_deposit),0) receivableDeposit
        IFNULL(SUM(change_receivable_money-IFNULL(CASE pay_type WHEN 1 THEN online_pay_money WHEN 2 THEN IFNULL(offline_pay_money,0) END,0)),0) unpaidMoney,
        IFNULL(SUM(CASE pay_type WHEN 2 THEN online_pay_money ELSE 0 END),0) receivableDeposit
        FROM t_order
        WHERE del_flag = 0 AND shop_id = #{param.shopId}
        <if test="param.memberUserId != null and param.memberUserId != ''">
            AND user_id = #{param.memberUserId}
        </if>
        <if test="param.type == null">
            AND order_status (order_status = 2 OR order_status = 3)
        </if>
        <if test="param.type != null and param.type ==1 ">
            AND (order_status = 2 OR order_status = 3)
        </if>

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java

@@ -90,6 +90,7 @@
        memberTask.setCreateTime(new Date());
        this.saveOrUpdate(memberTask);
        MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
        memberTotalChangeDto.setUserId(merCreateMemberTaskDto.getMemberUserId());
        memberTotalChangeDto.setNextTaskTime(merCreateMemberTaskDto.getTaskDate());
        remoteMemberService.changeMemberTotal(memberTotalChangeDto);
    }
@@ -212,6 +213,7 @@
            memberTask.setCreateTime(new Date());
            this.saveOrUpdate(memberTask);
            MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
            memberTotalChangeDto.setUserId(oldMemberTask.getUserId());
            memberTotalChangeDto.setNextTaskTime(merFollowMemberTaskDto.getNextTaskDate());
            remoteMemberService.changeMemberTotal(memberTotalChangeDto);
        }