订单加本次溢付款

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -687,5 +687,7 @@ public class Order implements Serializable {
 
 	@ApiModelProperty(value = "本次赠送积分")
 	private BigDecimal presenterIntegral;
+	@ApiModelProperty(value = "本次溢付款")
+	private BigDecimal caseOverPayment;
 
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -610,5 +610,7 @@ public class Order extends OrderBase {
 
 	@ApiModelProperty(value = "本次赠送积分")
 	private BigDecimal presenterIntegral;
+	@ApiModelProperty(value = "本次溢付款")
+	private BigDecimal caseOverPayment;
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -103,6 +103,7 @@
         <result column="single_ticket_margin" property="singleTicketMargin"/>
         <result column="convert_integral" property="convertIntegral"/>
         <result column="presenter_integral" property="presenterIntegral"/>
+        <result column="case_over_payment" property="caseOverPayment"/>
     </resultMap>
 
 

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -125,6 +125,9 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 			stockGoods.setLockingQuantity(datum.getLockingQuantity());
 			stockGoods.setBalanceQuantity(datum.getBalanceQuantity());
 			stockGoods.setSurplusRouteQuantity(datum.getSurplusRouteQuantity());
+			if (stockGoods.getInQuantity() == null){
+				stockGoods.setInQuantity(datum.getBalanceQuantity());
+			}
 			stockGoods.setTenantId(SecureUtil.getTenantId());
 			//获取商品id
 			R<GoodsDesc> goodsDesc = goodsDescClient.GoodsByCode(datum.getCode());

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -101,6 +101,7 @@
         <result column="single_ticket_margin" property="singleTicketMargin"/>
         <result column="convert_integral" property="convertIntegral"/>
         <result column="presenter_integral" property="presenterIntegral"/>
+        <result column="case_over_payment" property="caseOverPayment"/>
     </resultMap>