mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 02:55:04 +08:00
update
This commit is contained in:
@@ -56,7 +56,7 @@ import com.jsowell.pile.vo.SupStationStatsVO;
|
||||
import com.jsowell.pile.vo.base.PileInfoVO;
|
||||
import com.jsowell.pile.vo.base.*;
|
||||
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
|
||||
import com.jsowell.pile.vo.nanrui.NROrderInfoVO;
|
||||
import com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO;
|
||||
import com.jsowell.pile.vo.uniapp.*;
|
||||
import com.jsowell.pile.vo.web.*;
|
||||
import com.jsowell.wxpay.common.WeChatPayParameter;
|
||||
@@ -999,16 +999,16 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public NROrderInfoVO getNROrderInfoByOrderCode(String orderCode) {
|
||||
public JiangSuOrderInfoVO getNROrderInfoByOrderCode(String orderCode) {
|
||||
NRQueryOrderDTO dto = new NRQueryOrderDTO();
|
||||
dto.setOrderCode(orderCode);
|
||||
List<NROrderInfoVO> nrOrderInfos = orderBasicInfoMapper.getNROrderInfoByOrderCode(dto);
|
||||
if (CollectionUtils.isEmpty(nrOrderInfos)) {
|
||||
List<JiangSuOrderInfoVO> jsOrderInfos = orderBasicInfoMapper.getNROrderInfoByOrderCode(dto);
|
||||
if (CollectionUtils.isEmpty(jsOrderInfos)) {
|
||||
return null;
|
||||
}
|
||||
// 此方法仅通过订单编号查,因此只有一条数据
|
||||
NROrderInfoVO nrOrderInfoVO = nrOrderInfos.get(0);
|
||||
return nrOrderInfoVO;
|
||||
JiangSuOrderInfoVO jsOrderInfoVO = jsOrderInfos.get(0);
|
||||
return jsOrderInfoVO;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1018,8 +1018,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<NROrderInfoVO> getNROrderInfos(NRQueryOrderDTO dto) {
|
||||
List<NROrderInfoVO> nrOrderInfoVOList = orderBasicInfoMapper.getNROrderInfoByOrderCode(dto);
|
||||
public List<JiangSuOrderInfoVO> getNROrderInfos(NRQueryOrderDTO dto) {
|
||||
List<JiangSuOrderInfoVO> nrOrderInfoVOList = orderBasicInfoMapper.getNROrderInfoByOrderCode(dto);
|
||||
if (CollectionUtils.isEmpty(nrOrderInfoVOList)) {
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user