no message

mall-server-api/src/main/java/com/gree/mall/manager/enums/material/MaterialFlagEnum.java

@@ -16,6 +16,7 @@ public enum MaterialFlagEnum implements BaseEnum {
     SUBMIT("SUBMIT","提交"),
     OK("OK","通过"),
     CANCEL("CANCEL","作废"),
+    FAIL("FAIL","失败"),
     ;
 
     @EnumValue

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

@@ -156,16 +156,20 @@ public class WebsitSalesRetLogic {
 
     private void checkConvertRetQty(WebsitSalesItem salesItem, WebsitSalesRetItem websitSalesRetItem) {
         // 退货单明细退货转换数量
-        BigDecimal retConvertQty = websitSalesRetItem.getRetQty().divide(salesItem.getGoodsSalesConvertQty(), 1, BigDecimal.ROUND_UP);
+        BigDecimal retConvertQty = websitSalesRetItem.getRetQty();
         websitSalesRetItem.setRetConvertQty(retConvertQty);
         websitSalesRetItem.setWorkerGoodsId(salesItem.getWorkerGoodsId());
         websitSalesRetItem.setWorkerGoodsName(salesItem.getWorkerGoodsName());
 
+        if (!salesItem.getGoodsStockUnit().equals(salesItem.getGoodsSalesUnit())) {
+            retConvertQty = websitSalesRetItem.getRetQty().divide(salesItem.getGoodsSalesConvertQty(), 1, BigDecimal.ROUND_UP);
+        }
+
         if (salesItem.getRetQty().compareTo(salesItem.getSalesQty()) >= 0) {
             // 退货数量大于等于销售数量，全退转换数量
             retConvertQty = websitSalesRetItem.getConvertQty().subtract(websitSalesRetItem.getRetConvertQty());
             websitSalesRetItem.setRetConvertQty(retConvertQty);
-            salesItem.setConvertRetQty(retConvertQty);
+            salesItem.setConvertRetQty(salesItem.getConvertQty());
         } else {
             // 历史退货转换数量加上本次退货转换数量
             salesItem.setConvertRetQty(salesItem.getConvertRetQty().add(retConvertQty));