增加余额抵扣导出

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/PjOrderExportExcelXS.java

@@ -22,6 +22,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -104,6 +105,12 @@ public class PjOrderExportExcelXS implements Serializable {
 	 */
 	@ExcelProperty(value = "已付金额")
 	private BigDecimal paymentAmountTl;
+
+	/**
+	 * 余额支付金额
+	 */
+	@ExcelProperty(value = "余额抵扣")
+	private BigDecimal paymentRecoveredBalance;
 	/**
 	 * 运费
 	 */

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -269,7 +269,7 @@ public class OrderController extends BladeController {
 				PjOrder::getGoodsTotalShipAmount, PjOrder::getOutGoodsTotalShipNum, PjOrder::getOutGoodsTotalShipAmount,
 				PjOrder::getGoodsTotalShipNum, PjOrder::getSalesAmount, PjOrder::getRefno, PjOrder::getPrimaryGoodsTotalNum,
 				PjOrder::getPrimaryFundingAmount, PjOrder::getUseAdvanceChargeAmount, PjOrder::getProduceAdvanceChargeAmount,
-				PjOrder::getCost, PjOrder::getGrossProfit, PjOrder::getFreight)
+				PjOrder::getCost, PjOrder::getGrossProfit, PjOrder::getFreight, PjOrder::getPaymentRecoveredBalance)
 			.eq(PjOrder::getTenantId, exportUser.getTenantId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, order.getBsType())