Merge branch 'dev-new' into dev-new-rabbitmq

# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
This commit is contained in:
Guoqs
2024-11-19 17:13:09 +08:00
12 changed files with 364 additions and 64 deletions

View File

@@ -4,16 +4,18 @@ import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
import com.jsowell.common.util.DateUtils;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.PersonalChargingRecord;
import com.jsowell.pile.domain.PileBasicInfo;
import com.jsowell.pile.dto.QueryPersonPileDTO;
import com.jsowell.pile.mapper.PersonalChargingRecordMapper;
import com.jsowell.pile.service.PersonalChargingRecordService;
import com.jsowell.pile.service.PileBasicInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
import com.jsowell.pile.mapper.PersonalChargingRecordMapper;
import com.jsowell.pile.domain.PersonalChargingRecord;
import com.jsowell.pile.service.PersonalChargingRecordService;
@Service
public class PersonalChargingRecordServiceImpl implements PersonalChargingRecordService{
@@ -177,4 +179,9 @@ public class PersonalChargingRecordServiceImpl implements PersonalChargingRecord
personalChargingRecordMapper.insertOrUpdateSelective(chargingRecord);
}
@Override
public List<PersonalChargingRecord> getPersonalChargingRecord(QueryPersonPileDTO dto) {
return personalChargingRecordMapper.getPersonalChargingRecord(dto);
}
}