Commit 08a5d7a5 authored by liao_ds's avatar liao_ds

结算-开票-查询发票

parent 995eb79d
......@@ -56,5 +56,5 @@ public interface IFeignService {
* @param orderId
* @return
*/
Wrapper<OrderSettleAccountInvoiceFeignDetailVO> findSettleAccountInvoiceDetail(Long orderId);
Wrapper<OrderSettleAccountInvoiceFeignDetailVO> findSettleAccountInvoiceDetail(String orderNo);
}
......@@ -4,7 +4,7 @@ import com.ssy.lingxi.common.response.Wrapper;
import com.ssy.lingxi.message.api.feign.SystemMessageControllerFeign;
import com.ssy.lingxi.message.api.vo.request.SystemMessageRequest;
import com.ssy.lingxi.order.api.feign.OrderFeignService;
import com.ssy.lingxi.order.api.model.vo.request.OrderIdFeignVO;
import com.ssy.lingxi.order.api.model.vo.request.OrderNoFeignVO;
import com.ssy.lingxi.order.api.model.vo.response.OrderSettleAccountInvoiceFeignDetailVO;
import com.ssy.lingxi.report.api.enums.OperateDataSourceEnum;
import com.ssy.lingxi.report.api.enums.SettleAccountReceivableOperateTypeEnum;
......@@ -138,11 +138,11 @@ public class FeignServiceImpl implements IFeignService {
}
@Override
public Wrapper<OrderSettleAccountInvoiceFeignDetailVO> findSettleAccountInvoiceDetail(Long orderId) {
OrderIdFeignVO feignVO=new OrderIdFeignVO();
feignVO.setOrderId(orderId);
public Wrapper<OrderSettleAccountInvoiceFeignDetailVO> findSettleAccountInvoiceDetail(String orderNo) {
OrderNoFeignVO feignVO=new OrderNoFeignVO();
feignVO.setOrderNo(orderNo);
Wrapper<OrderSettleAccountInvoiceFeignDetailVO> feignResult = orderFeignService.findSettleAccountInvoiceDetail(feignVO);
FeignLogUtils.printLog("查询订单发票",feignResult,orderId);
FeignLogUtils.printLog("查询订单发票",feignResult,orderNo);
return feignResult;
}
}
......@@ -280,7 +280,7 @@ public class MemberReceiptInvoiceServiceImpl implements IMemberReceiptInvoiceSer
}
// 如果单据类型为订单,则发票信息来源于订单发票信息栏
else if (SettlementOrderTypeEnum.ORDER.getCode().equals(receiptInvoiceDO.getSettlementOrderType())) {
Wrapper<OrderSettleAccountInvoiceFeignDetailVO> wrapper = feignService.findSettleAccountInvoiceDetail(receiptInvoiceDO.getDataId());
Wrapper<OrderSettleAccountInvoiceFeignDetailVO> wrapper = feignService.findSettleAccountInvoiceDetail(receiptInvoiceDO.getOrderNo());
if (null != wrapper && ResponseCode.SUCCESS.getCode() == wrapper.getCode() && null != wrapper.getData()) {
result.setKindName(InvoiceKindEnum.getMessage(wrapper.getData().getInvoiceKind()));
result.setTypeName(InvoiceTypeEnum.getMessage(wrapper.getData().getInvoiceType()));
......@@ -388,7 +388,7 @@ public class MemberReceiptInvoiceServiceImpl implements IMemberReceiptInvoiceSer
MemberReceiptInvoiceProveDO entity = invoiceProveRepository.findByReceiptInvoiceId(invoiceDO.getId());
// 未开票则查询相关票据信息
if (entity == null) {
Wrapper<OrderSettleAccountInvoiceFeignDetailVO> wrapper = feignService.findSettleAccountInvoiceDetail(invoiceDO.getDataId());
Wrapper<OrderSettleAccountInvoiceFeignDetailVO> wrapper = feignService.findSettleAccountInvoiceDetail(invoiceDO.getOrderNo());
if (null != wrapper && ResponseCode.SUCCESS.getCode() == wrapper.getCode() && null != wrapper.getData()) {
result.setKindName(InvoiceKindEnum.getMessage(wrapper.getData().getInvoiceKind()));
result.setTypeName(InvoiceTypeEnum.getMessage(wrapper.getData().getInvoiceType()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment