达沃特工厂发货生成溢付款修改

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/enums/OrderTypeEnum.java

@@ -52,6 +52,10 @@ public enum OrderTypeEnum {
 	 * 采购合同
 	 */
 	PURCHASE_CONTRACT("CGHT"),
+	/**
+	 * 代理商订单
+	 */
+	AGENCY_ORDER("DLDD"),
 	// 贸易方式
 
 	/**

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -587,7 +587,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					// ===================增加益付款逻辑=========================
 					if (e.getPurchaseQuantity().compareTo(e.getActualQuantity()) > 0) {
 						BigDecimal number = e.getPurchaseQuantity().subtract(e.getActualQuantity());
-						BigDecimal price = e.getPrice();
+						BigDecimal price = e.getPurchaseAmount();
 						//需要处理的益付款=(差额数量 * 单价)
 						BigDecimal total = number.multiply(price);
 						//益付款明细
@@ -680,7 +680,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					BigDecimal itemTotal = list.stream().map(BusinessOverpaymentItem::getOverpayment).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 					//益付款
 					Overpayment overpayment = new Overpayment();
-					overpayment.setCorpId(corpId);
+					overpayment.setCorpId(select.getSalesCompany());
 					overpayment.setType("add");
 					overpayment.setSrcPid(deliveryId);
 					overpayment.setAmount(itemTotal);

blade-service/trade-purchase/src/main/java/com/trade/purchase/dealer/PurchaseContract.java

@@ -13,10 +13,7 @@ import com.trade.purchase.order.entity.OrderFees;
 import com.trade.purchase.order.entity.OrderFiles;
 import com.trade.purchase.order.entity.OrderItems;
 import com.trade.purchase.order.enums.OrderTypeEnum;
-import com.trade.purchase.order.service.IOrderFeesService;
-import com.trade.purchase.order.service.IOrderFilesService;
-import com.trade.purchase.order.service.IOrderItemsService;
-import com.trade.purchase.order.service.IOrderService;
+import com.trade.purchase.order.service.*;
 import com.trade.purchase.order.vo.OrderDTO;
 import com.trade.purchase.order.vo.OrderVO;
 import io.swagger.annotations.Api;
@@ -71,6 +68,7 @@ public class PurchaseContract {
 
 	private IUserClient userClient;
 	private IStorageClient iStorageClient;//库区信息
+	private IPurchaseService purchaseService;
 
 
 	/**
@@ -388,4 +386,15 @@ public class PurchaseContract {
 	}
 	//经销商采购合同审批
 	//经销商采购合同提交平台生成平台销售订单
+	@PostMapping("/createOrder")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "提交平台", notes = "传入order 主表id")
+	public R createOrder(@Valid @RequestBody Order order){
+		if (order.getId() == null){
+			throw new SecurityException("请选择要提交的订单");
+		}
+		order.setBillType(OrderTypeEnum.PURCHASE_CONTRACT.getType());
+		order.setTradeType(OrderTypeEnum.DEALER.getType());
+		return null;
+	}
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/IPurchaseService.java

@@ -0,0 +1,20 @@
+package com.trade.purchase.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.trade.purchase.order.entity.Order;
+import org.springblade.core.tool.api.R;
+
+/**
+ * 采购合同 服务类
+ *
+ * @author BladeX
+ * @since 2021-09-26
+ */
+public interface IPurchaseService extends IService<Order> {
+	/**
+	 * 经销商采购合同生成平台代理订单
+	 * @param order
+	 * @return
+	 */
+	R createOrder(Order order);
+}

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/PurchaseServiceImpl.java

@@ -0,0 +1,19 @@
+package com.trade.purchase.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trade.purchase.order.entity.Order;
+import com.trade.purchase.order.mapper.OrderMapper;
+import com.trade.purchase.order.service.IPurchaseService;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class PurchaseServiceImpl extends ServiceImpl<OrderMapper, Order> implements IPurchaseService {
+
+	@Override
+	public R createOrder(Order order) {
+		return null;
+	}
+}