處理出貨單的調整

src/main/java/com/uas/platform/b2c/core/support/log/TradeBufferedLogger.java

@@ -4,8 +4,6 @@ import com.uas.platform.b2c.common.account.model.TradeLog;
 import com.uas.platform.b2c.common.account.service.TradeLogService;
 import com.uas.platform.b2c.core.utils.ContextUtils;
 import com.uas.platform.b2c.core.utils.PathUtils;
-import com.uas.platform.b2c.logistics.model.InvoiceFOrder;
-import com.uas.platform.b2c.logistics.model.InvoiceFPurchase;
 import com.uas.platform.b2c.trade.order.model.Order;
 import com.uas.platform.b2c.trade.order.model.Purchase;
 import com.uas.platform.core.exception.IllegalOperatorException;
@@ -63,32 +61,4 @@ public class TradeBufferedLogger extends BufferedLogger<TradeLog> {
 		log(purchase.getClass().getSimpleName(), purchase.getPurchaseid(), voucherOperation, changeLog);
 	}
 
-	/**
-	 * 记录交易流程卖家出货单操作日志
-	 *
-	 * @param invoice				状态变更的卖家出货单的实例
-	 * @param voucherOperation		单据操作
-	 * @param changeLog				操作具体日志记录
-	 */
-	public void log(InvoiceFPurchase invoice, TradeLog.VoucherOperation voucherOperation, String changeLog) {
-		if (invoice == null) {
-			throw new IllegalOperatorException("卖家出货单数据已失效");
-		}
-		log(invoice.getClass().getSimpleName(), invoice.getInvoiceid(), voucherOperation, changeLog);
-	}
-
-	/**
-	 * 记录交易流程平台出货单操作日志
-	 *
-	 * @param invoice				状态变更的平台出货单的实例
-	 * @param voucherOperation		单据操作
-	 * @param changeLog				操作具体日志记录
-	 */
-	public void log(InvoiceFOrder invoice, TradeLog.VoucherOperation voucherOperation, String changeLog) {
-		if (invoice == null) {
-			throw new IllegalOperatorException("平台出货单数据已失效");
-		}
-		log(invoice.getClass().getSimpleName(), invoice.getInvoiceid(), voucherOperation, changeLog);
-	}
-
 }

src/main/java/com/uas/platform/b2c/external/erp/order/service/impl/InvoiceNotifyServiceImpl.java

@@ -4,9 +4,10 @@ import com.uas.api.b2c_erp.buyer.model.AcceptNotify;
 import com.uas.api.b2c_erp.buyer.model.AcceptNotifyDetail;
 import com.uas.api.b2c_erp.buyer.service.InvoiceNotifyService;
 import com.uas.platform.b2c.core.support.SystemSession;
+import com.uas.platform.b2c.logistics.dao.InvoiceDao;
 import com.uas.platform.b2c.logistics.dao.InvoiceFOrderDao;
-import com.uas.platform.b2c.logistics.model.InvoiceFOrder;
-import com.uas.platform.b2c.logistics.model.InvoiceFOrderDetail;
+import com.uas.platform.b2c.logistics.model.Invoice;
+import com.uas.platform.b2c.logistics.model.InvoiceDetail;
 import com.uas.platform.core.model.Status;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,30 +21,30 @@ import java.util.List;
 public class InvoiceNotifyServiceImpl implements InvoiceNotifyService {
 
 	@Autowired
-	private InvoiceFOrderDao inForDao;
+	private InvoiceDao inForDao;
 
 	@Override
 	public List<AcceptNotify> getAllInvoiceNoitify() {
 		List<AcceptNotify> acceptNotifys = new ArrayList<AcceptNotify>();
 		// 获取平台发货单
-		List<InvoiceFOrder> fOrders = inForDao.findByBuyerenuuAndSendstatusAndUasPurcidNotNull(SystemSession.getUser().getEnterprise()
+		List<Invoice> fOrders = inForDao.findByBuyerenuuAndSendstatusAndUasPurcidNotNull(SystemSession.getUser().getEnterprise()
 				.getUu(), Status.NOT_UPLOAD.value());
 		if (!CollectionUtils.isEmpty(fOrders)) {
-			for (InvoiceFOrder fOrder : fOrders) {
+			for (Invoice fOrder : fOrders) {
 				AcceptNotify acceptNotify = new AcceptNotify();
 				acceptNotify.setCreateTime(new Date());
 				acceptNotify.setId(fOrder.getId());
 				// 这里记录的是平台的订单号
-				acceptNotify.setPurchaseId(fOrder.getOrid());
+				acceptNotify.setPurchaseId(fOrder.getOrderId());
 				double qtys = 0D;
 				List<AcceptNotifyDetail> notifyDetails = new ArrayList<AcceptNotifyDetail>();
-				for (InvoiceFOrderDetail detail : fOrder.getInvoiceFOrderDetails()) {
+				for (InvoiceDetail detail : fOrder.getInvoiceDetails()) {
 					AcceptNotifyDetail notifyDetail = new AcceptNotifyDetail();
 					notifyDetail.setBatchcode(detail.getBatchCode());
-					notifyDetail.setQty(detail.getNumber());
-					notifyDetail.setPrice(detail.getTaxunitprice());
+					notifyDetail.setQty(detail.getQty());
+					notifyDetail.setPrice(detail.getTaxUnitprice());
 					notifyDetails.add(notifyDetail);
-					qtys = qtys + detail.getNumber();
+					qtys = qtys + detail.getQty();
 				}
 				acceptNotify.setNotifyDetail(notifyDetails);
 				acceptNotify.setQty(qtys);
@@ -57,7 +58,7 @@ public class InvoiceNotifyServiceImpl implements InvoiceNotifyService {
 	@Override
 	public void backSuccess(long[] ids) {
 		for (long id : ids) {
-			InvoiceFOrder fOrder = inForDao.findOne(id);
+			Invoice fOrder = inForDao.findOne(id);
 			fOrder.setSendstatus(Status.DOWNLOADED.value());
 			inForDao.save(fOrder);
 		}
@@ -66,7 +67,7 @@ public class InvoiceNotifyServiceImpl implements InvoiceNotifyService {
 	@Override
 	public void agreeInvoice(long[] ids) {
 		for (long id : ids) {
-			InvoiceFOrder fOrder = inForDao.findOne(id);
+			Invoice fOrder = inForDao.findOne(id);
 			// 安全性验证一下
 			if (fOrder.getSendstatus() == Status.DOWNLOADED.value()) {
 				fOrder.setStatusReceived(SystemSession.getUser().getUserUU());

src/main/java/com/uas/platform/b2c/logistics/controller/InvoiceController.java

@@ -7,8 +7,6 @@ import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
 import com.uas.platform.b2c.logistics.model.Invoice;
-import com.uas.platform.b2c.logistics.model.InvoiceFOrder;
-import com.uas.platform.b2c.logistics.model.InvoiceFPurchase;
 import com.uas.platform.b2c.logistics.service.InvoiceFOrderService;
 import com.uas.platform.b2c.logistics.service.InvoiceFPurchaseService;
 import com.uas.platform.b2c.logistics.service.InvoiceService;

src/main/java/com/uas/platform/b2c/logistics/dao/InvoiceDao.java

@@ -49,4 +49,14 @@ public interface InvoiceDao extends JpaSpecificationExecutor<Invoice>, JpaReposi
 	 */
 	@Query(value = "select count(1) from Invoice ifo where ifo.invoiceid in (:invoiceids) and ifo.status = 404 and ifo.piclass = :piclass")
 	Integer countInBoundInvoice(@Param("invoiceids") List<String> invoiceids, @Param("piclass") Integer piclass);
+
+
+	/**
+	 * 根据买家UU和状态查询平台发货单
+	 *
+	 * @param buyerenuu  the buyerenuu 买家enuu
+	 * @param sendstatus the sendstatus 状态
+	 * @return list 返回InvoiceFOrder列表
+	 */
+	List<Invoice> findByBuyerenuuAndSendstatusAndUasPurcidNotNull(Long buyerenuu, Integer sendstatus);
 }

src/main/java/com/uas/platform/b2c/logistics/dao/InvoiceDetailDao.java

@@ -15,5 +15,5 @@ public interface InvoiceDetailDao extends JpaSpecificationExecutor<InvoiceDetail
      * @param pudetailid the pudetailid 采购单明细id
      * @return InvoiceFPurchaseDetail 返回InvoiceFPurchaseDetail对象
      */
-    InvoiceDetail findInvoiceFPurchaseDetailByPudetailid(Long pudetailid);
+    InvoiceDetail findByPurchaseDetailId(Long pudetailid);
 }

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFOrderDetailServiceImpl.java

@@ -1,10 +1,7 @@
 package com.uas.platform.b2c.logistics.service.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.uas.platform.b2c.logistics.dao.InvoiceFOrderDetailDao;
-import com.uas.platform.b2c.logistics.model.InvoiceFOrderDetail;
 import com.uas.platform.b2c.logistics.service.InvoiceFOrderDetailService;
 
 @Service

src/main/java/com/uas/platform/b2c/trade/order/controller/PurchaseController.java

@@ -8,6 +8,7 @@ import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.support.view.JxlsExcelView;
 import com.uas.platform.b2c.core.utils.FastjsonUtils;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
+import com.uas.platform.b2c.logistics.model.Invoice;
 import com.uas.platform.b2c.logistics.model.InvoiceFPurchase;
 import com.uas.platform.b2c.logistics.model.Logistics;
 import com.uas.platform.b2c.prod.store.service.StoreInService;
@@ -238,7 +239,7 @@ public class PurchaseController {
 	 * @return the invoice f purchase
 	 */
 	@RequestMapping(value = "/{invoiceid}/ensurereceipt", method = RequestMethod.PUT)
-	public InvoiceFPurchase ensureReceipt(@PathVariable String invoiceid) {
+	public Invoice ensureReceipt(@PathVariable String invoiceid) {
 		assert logger != null;
 		logger.log("采购单管理", "平台确认收货，出货单id： " + invoiceid);
 		return purchaseService.ensuerAcceptInvoise(invoiceid);

src/main/java/com/uas/platform/b2c/trade/order/model/OrderIndex.java

@@ -2,7 +2,7 @@ package com.uas.platform.b2c.trade.order.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
-import com.uas.platform.b2c.logistics.model.InvoiceFOrder;
+import com.uas.platform.b2c.logistics.model.Invoice;
 import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
 import com.uas.platform.core.model.EncodingRulesConstant;
 import com.uas.platform.core.model.Status;
@@ -1130,21 +1130,21 @@ public class OrderIndex extends Document implements Serializable {
 	 * @param createNumberService the create number service
 	 * @return the invoice f order
 	 */
-	public InvoiceFOrder convertInvoiceFOrder(CreateNumberService createNumberService) {
+	public Invoice convertInvoiceFOrder(CreateNumberService createNumberService) {
 		String invoiceid = EncodingRulesConstant.INVOICE_FROMORDER.replace("_TIMESTAP_NUMBER",
 				createNumberService.getTimeNumber("trade$invoice_fmor", 8));
 		Date date = new Date();
-		InvoiceFOrder inFor = new InvoiceFOrder();
+		Invoice inFor = new Invoice();
 		inFor.setInvoiceid(invoiceid);
 		// 给属性赋值
-		inFor.setCreattime(date);
+		inFor.setCreatetime(date);
 		inFor.setBuyeruu(this.getBuyeruu());
 		inFor.setBuyerenuu(this.getBuyerenuu());
 		inFor.setPrice(this.getPrice());
 		// TODO 这里需要考虑确认总价的（默认和总价相等 打折等其他逻辑待考虑）
 		inFor.setEnsurePrice(this.ensurePrice);
 		inFor.setJsonSpAddress(this.getJsonAddress());
-		inFor.setOrid(this.getId());
+		inFor.setOrderId(this.getId());
 		inFor.setSourceid(this.orderid);
 		inFor.setProofingid(this.proofingid);
 		return inFor;

src/main/java/com/uas/platform/b2c/trade/order/model/OrderIndexDetail.java

@@ -1,6 +1,6 @@
 package com.uas.platform.b2c.trade.order.model;
 
-import com.uas.platform.b2c.logistics.model.InvoiceFOrderDetail;
+import com.uas.platform.b2c.logistics.model.InvoiceDetail;
 import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
 import com.uas.platform.core.model.EncodingRulesConstant;
 import com.uas.platform.core.persistence.StatusColumn;
@@ -473,8 +473,8 @@ public class OrderIndexDetail {
 	 * @param createNumberService the create number service
 	 * @return the invoice f order detail
 	 */
-	public InvoiceFOrderDetail convertInvoiceFOrderDetail(CreateNumberService createNumberService) {
-		InvoiceFOrderDetail inForD = new InvoiceFOrderDetail();
+	public InvoiceDetail convertInvoiceFOrderDetail(CreateNumberService createNumberService) {
+		InvoiceDetail inForD = new InvoiceDetail();
 		String detailid = EncodingRulesConstant.INVOICE_DETAIL_FROMORDER.replace("_TIMESTAP_NUMBER",
 				createNumberService.getTimeNumber("trade$invoice_fmor_dt", 9));
 		inForD.setDetailid(detailid);
@@ -483,12 +483,12 @@ public class OrderIndexDetail {
 		inForD.setCmpCode(this.cmpCode);
 		inForD.setImg(this.img);
 		inForD.setUnitprice(this.getUnitprice());
-		inForD.setNumber(this.getNumber());
+		inForD.setQty(this.getNumber());
 		inForD.setPrice(this.getPrice());
 		// TODO 这里需要考虑确认总价的（默认和总价相等 打折等其他逻辑待考虑）
 		inForD.setEnsurePrice(this.ensurePrice);
 		inForD.setStatus(this.getStatus());
-		inForD.setOrdetailid(this.getId());
+		inForD.setOrderDetailId(this.getId());
 		return inForD;
 	}
 

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -39,11 +39,8 @@ import com.uas.platform.b2c.fa.settlement.model.ExchangeRate;
 import com.uas.platform.b2c.fa.settlement.service.BillSubmitService;
 import com.uas.platform.b2c.fa.settlement.service.ExchangeRateService;
 import com.uas.platform.b2c.logistics.dao.AddressDao;
-import com.uas.platform.b2c.logistics.dao.InvoiceFOrderDao;
-import com.uas.platform.b2c.logistics.dao.InvoiceFPurchaseDao;
 import com.uas.platform.b2c.logistics.dao.PickUpAddressDao;
 import com.uas.platform.b2c.logistics.model.*;
-import com.uas.platform.b2c.logistics.service.InvoiceFPurchaseService;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
 import com.uas.platform.b2c.logistics.service.InvoiceService;
@@ -55,7 +52,6 @@ import com.uas.platform.b2c.prod.commodity.model.GoodsQtyPrice;
 import com.uas.platform.b2c.prod.commodity.service.GoodsHistoryService;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
-import com.uas.platform.b2c.prod.product.component.dao.ComponentDao;
 import com.uas.platform.b2c.prod.product.component.modal.Component;
 import com.uas.platform.b2c.prod.product.component.service.ComponentService;
 import com.uas.platform.b2c.prod.store.dao.StoreInDao;

src/main/java/com/uas/platform/b2c/trade/order/service/impl/PurchaseServiceImpl.java

@@ -1018,7 +1018,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 	 */
 // 传入已经修改为已收票状态的明细id
 	public void changeReceiptToReceivedBill(Long purchaseDetailId) {
-		InvoiceDetail invoiceFPurchaseDetail = invoiceDetailDao.findInvoiceFPurchaseDetailByPudetailid(purchaseDetailId);
+		InvoiceDetail invoiceFPurchaseDetail = invoiceDetailDao.findByPurchaseDetailId(purchaseDetailId);
 		List<ReceiptDetail> receiptDetails = receiptDetailDao.findReceiptDetailBySourceid(invoiceFPurchaseDetail.getDetailid());
 		if (receiptDetails == null || receiptDetails.size() == 0) {
 			System.out.println("出货单的明细对应不到入库单的明细行，出库单的明细行是：" + invoiceFPurchaseDetail.getDetailid());