This commit is contained in:
Lemon
2024-07-09 14:31:53 +08:00
parent 39aab5e499
commit 7d945c074a

View File

@@ -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<>();
}