赠送积分更新状态

xiaoyong931011

2023-07-27 6b5d8c00ab9e3f96e4f577fabbde3bef351933da

赠送积分更新状态

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

@@ -43,4 +43,6 @@
    BigDecimal selectAmountByFlowtypeAndType(@Param("memberId")Long memberId,@Param("flowType")Integer flowType,
                                             @Param("type")Integer type, @Param("status")Integer status,
                                             @Param("dateDay") Date DateTime,@Param("dateMonth") Date dateMonth);

    List<MoneyFlowVo> selectMoneyFlowByOrderNo(@Param("orderNo")String orderNo, @Param("memberId")Long memberId);
}

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -13,10 +13,7 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.mall.vo.ApiLeaderListVo;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.model.OrderStateDto;
import cc.mrbird.febs.pay.service.IPayService;
@@ -84,6 +81,7 @@
    private final MallElectronicFenceMapper mallElectronicFenceMapper;
    private final MallMemberWalletMapper mallMemberWalletMapper;
    private final MallRollPerkMapper mallRollPerkMapper;
    private final MallMoneyFlowMapper mallMoneyFlowMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -615,6 +613,9 @@
            long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
            orderDetailVo.setRemainTime(remainTime);
        }
        String orderNo = orderInfo.getOrderNo();
        List<MoneyFlowVo> moneyFlowVos = mallMoneyFlowMapper.selectMoneyFlowByOrderNo(orderNo,orderInfo.getMemberId());
        orderDetailVo.setMoneyFlowVos(moneyFlowVos);
        return orderDetailVo;
    }


 src/main/java/cc/mrbird/febs/mall/vo/OrderDetailVo.java

@@ -126,6 +126,8 @@
    private Integer isHome;
    @ApiModelProperty(value = "配送方式 1：自提 2：快递")
    private Integer deliveryType;
    @ApiModelProperty(value = "支付详情")
    private List<MoneyFlowVo> moneyFlowVos;

}


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

@@ -161,4 +161,11 @@
            </if>
        </where>
    </select>



    <select id="selectMoneyFlowByOrderNo" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
        select a.* from mall_money_flow a
        where a.order_no = #{orderNo} and a.member_id = #{memberId}
    </select>
</mapper>