Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-16 aa6febca297b0e1a68b1877fc9f41885e9fc0c7a

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

@@ -30,21 +30,14 @@
@Service
public class PricingRuleServiceImpl implements PricingRuleService {


    @Autowired
    PricingParamMapper pricingParamMapper;

    @Autowired
    PricingDetailMapper pricingParamMapper;


    @Autowired
    MemberRidesMapper memberRidesMapper;


    @Autowired
    BaseParamMapper baseParamMapper;


    @Override
    public PricingRuleDTO getPricingRule(String goodaorderId) {
@@ -58,7 +51,6 @@
        PricingRuleDTO pricingRule = getPricingRule(memberRides);
        return pricingRule;
    }


    @Override
    public PricingRuleDTO getPricingRule(List<MemberRides> memberRidesList) {