Merge remote-tracking branch 'origin/develop' into develop

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

@@ -145,6 +145,7 @@ public class WebsitSalesRetLogic {
 
             websitSales.updateById();
             websitSalesRetItem.setSalesRetId(websitSalesRetAddUP.getSalesRetId());
+            websitSalesRetItem.setGoodsStockUnit(one.getGoodsStockUnit());
             websitSalesRetItem.setConvertQty(one.getConvertQty());
             websitSalesRetItem.setExamineQty(websitSalesRetItem.getRetQty());
             if (websitSalesRetItem.getSaleAmount() != null)
@@ -164,6 +165,7 @@ public class WebsitSalesRetLogic {
 
         if (!salesItem.getGoodsStockUnit().equals(salesItem.getGoodsSalesUnit())) {
             retConvertQty = websitSalesRetItem.getRetQty().divide(salesItem.getGoodsSalesConvertQty(), 1, BigDecimal.ROUND_UP);
+            websitSalesRetItem.setRetConvertQty(retConvertQty);
         }
 
         if (salesItem.getRetQty().compareTo(salesItem.getSalesQty()) >= 0) {