111

k94314517

2023-11-02 8405a48c18d35df3a39bdbf1d89635d1983b6828

111

 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -310,7 +310,7 @@
            MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda()
                    .eq(MemberRides::getMemberId, memberId)
                    .eq(MemberRides::getOrdreId,goodsorder.getId())
                    .ne(MemberRides::getOrdreId,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT)
                    .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
                    .orderByDesc(MemberRides::getCreateDate)
                    .last(" limit 1  "));
            if (!Objects.isNull(memberRides)) {

 server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java

@@ -93,9 +93,9 @@
    public static  String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) {
        String title = "计费规则：";
        if(baseTime < 0){
            title = (basePrice.divide(new BigDecimal(100))).doubleValue()+"元畅骑一整天";
            title += (basePrice.divide(new BigDecimal(100))).doubleValue()+"元畅骑一整天";
        }else {
            title = "起步";
            title += "起步";
            int time = baseTime / 60;
            int min = baseTime % 60;
            if(time > 0){