Browse Source

no message

FengChaoYu 7 months ago
parent
commit
fc5037cdec

+ 3 - 3
mall-server-api/src/main/java/com/gree/mall/manager/logic/websit/WebsitSalesRetLogic.java

@@ -169,10 +169,10 @@ public class WebsitSalesRetLogic {
         }
 
         if (salesItem.getRetQty().compareTo(salesItem.getSalesQty()) >= 0) {
-            // 退货数量大于等于销售数量,全退转换数量
-            retConvertQty = websitSalesRetItem.getConvertQty().subtract(websitSalesRetItem.getRetConvertQty());
-            websitSalesRetItem.setRetConvertQty(retConvertQty);
+            // 退货数量大于等于销售数量,全退转换数量, 用销售单的转换数量减已退转换数量=剩余可退数量
+            final BigDecimal remainQty = salesItem.getConvertQty().subtract(salesItem.getConvertRetQty());
             salesItem.setConvertRetQty(salesItem.getConvertQty());
+            websitSalesRetItem.setRetConvertQty(remainQty);
         } else {
             // 历史退货转换数量加上本次退货转换数量
             salesItem.setConvertRetQty(salesItem.getConvertRetQty().add(retConvertQty));