diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java index bad7859..f39a010 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/OrderHandleServiceImpl.java @@ -22,6 +22,7 @@ import com.dxhy.base.thirdservice.module.base.service.BaseService; import com.dxhy.order.baseservice.exception.OrderReceiveException; import com.dxhy.order.baseservice.model.OrderInvoiceInfo; import com.dxhy.order.baseservice.model.OrderOriginExtendInfo; +import com.dxhy.order.baseservice.model.QuickResponseCodeItemInfo; import com.dxhy.order.baseservice.model.queue.CommonTsMqData; import com.dxhy.order.baseservice.model.queue.FpYxTsMqData; import com.dxhy.order.consumer.dao.OrderOriginExtendInfoMapper; @@ -304,7 +305,7 @@ public class OrderHandleServiceImpl implements OrderHandleService { if (flag){ fileModel.setCode(ConfigureConstant.STRING_0000); fileModel.setFilePath(path.toString()); - fileModel.setFileName(fileDownLoad.getFileName()); + fileModel.setFileName(fileName); return fileModel; } fileModel.setCode(ConfigureConstant.STRING_9999); @@ -448,6 +449,7 @@ public class OrderHandleServiceImpl implements OrderHandleService { OrderInvoiceInfo orderQuery = new OrderInvoiceInfo(); orderQuery.setFpqqlsh(fpqqlsh); orderQuery.setPushStatus(OrderInfoEnum.PUSH_STATUS_1.getKey()); + orderQuery.setInvoicePushSbyy("推送成功"); int updateByPrimaryKeySelective = orderInvoiceInfoService.updateOrderInvoiceInfoByFpqqlsh(orderQuery, shList); if (updateByPrimaryKeySelective <= 0) { log.error("推送状态更新失败"); diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index d4362d3..fc7b127 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -36,16 +36,14 @@ import com.dxhy.order.consumer.modules.bespoke.service.OrderService; import com.dxhy.order.consumer.openapi.protocol.v4.order.*; import com.dxhy.order.consumer.openapi.protocol.v6.order.QdTxxBO; import com.dxhy.order.consumer.openapi.service.AllocateInvoiceInterfaceServiceV3; -import com.dxhy.order.invoice.module.invoice.dao.OrderInfoMapper; import com.dxhy.order.invoice.module.invoice.dao.OrderItemInfoMapper; -import com.dxhy.order.invoice.module.invoice.service.OrderInvoiceInfoService; import com.github.pagehelper.PageInfo; import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; @@ -55,6 +53,9 @@ import java.util.*; @Service("skOrderServiceImpl") public class SkOrderServiceImpl implements OrderService { + @Value("${pdf.back.url}") + private String backUrl; + @Resource private SkOrderInfoMapper skOrderInfoMapper; @@ -85,9 +86,6 @@ public class SkOrderServiceImpl implements OrderService { @Resource private TInvoiceInvmapMapper tInvoiceInvmapMapper; - @Resource - private LuoxinBack luoxinBack; - // 订单读入 @Override public R orderRead(ReqParam reqParam) { @@ -231,16 +229,16 @@ public class SkOrderServiceImpl implements OrderService { newTable.setInvoiceNo(orderInvoiceInfo.getSdfphm()); newTable.setInvoiceTime(orderInvoiceInfo.getKprq()); newTable.setInvoiceAmount(orderInvoiceInfo.getKphjje()); - newTable.setInvoicePhoto(fileModel.getFilePath()); newTable.setInvoiceFilename(fileModel.getFileName()); newTable.setOperater(orderInvoiceInfo.getKpr()); newTable.setOperateDate(orderInvoiceInfo.getKprq()); - newTable.setShipper(luoxinBack.getWrite(orderInvoiceInfo.getXhfNsrsbh())); + newTable.setShipper(orderInvoiceInfo.getXhfNsrsbh()); + newTable.setStatus(ConfigureConstant.STRING_1); + newTable.setInvoicePhoto(backUrl.concat(fileModel.getFilePath()).concat("/").concat(fileModel.getFileName())); DynamicContextHolder.push(ConfigureConstant.MAIN); - tInvoiceInvmapMapper.deleteBackMsg(newTable.getCDLCode()); + tInvoiceInvmapMapper.deleteBackMsg(orderInvoiceInfo.getSdfphm()); tInvoiceInvmapMapper.insertBackMsg(newTable); - } } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java index 025be72..d7d6363 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java @@ -42,10 +42,9 @@ import com.github.pagehelper.page.PageMethod; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; @@ -55,6 +54,9 @@ import java.util.*; @Service("yyOrderService") public class YyOrderServiceImpl implements OrderService { + @Value("${pdf.back.url}") + private String backUrl; + @Resource private YyOrderMapper yyOrderMapper; @@ -231,10 +233,12 @@ public class YyOrderServiceImpl implements OrderService { newTable.setInvoiceNo(orderInvoiceInfo.getSdfphm()); newTable.setInvoiceTime(orderInvoiceInfo.getKprq()); newTable.setInvoiceAmount(orderInvoiceInfo.getKphjje()); - newTable.setInvoicePhoto(fileModel.getFilePath()); newTable.setInvoiceFilename(fileModel.getFileName()); newTable.setOperater(orderInvoiceInfo.getKpr()); newTable.setOperateDate(orderInvoiceInfo.getKprq()); + newTable.setShipper(orderInvoiceInfo.getXhfNsrsbh()); + newTable.setStatus(ConfigureConstant.STRING_1); + newTable.setInvoicePhoto(backUrl.concat(fileModel.getFilePath()).concat("/").concat(fileModel.getFileName())); newTableList.add(newTable); //更新会写表