Merge remote-tracking branch 'origin/master'

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/stock/StockChangeVo.java

@@ -21,9 +21,10 @@ public class StockChangeVo {
     private String defaultRemarks;
 
     /**
-     * 业务id
+     * 默认业务ID
+     * 未指定业务ID时，会使用此业务ID
      */
-    private Long businessId;
+    private Long defaultBusinessId;
 
     /**
      * InTypeEnum or OutTypeEnum
@@ -38,6 +39,11 @@ public class StockChangeVo {
     public interface ChangeDetails {
 
         /**
+         * 业务id
+         */
+        Long getBusinessId();
+
+        /**
          * 物品id
          */
         Long getGoodsId();

hx-service/victoriatourist/src/main/java/com/fjhx/service/stock/impl/StockServiceImpl.java

@@ -24,7 +24,11 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -152,7 +156,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             stockJournal.setType(type);
             stockJournal.setDetailsType(typeEnum instanceof InTypeEnum ?
                     ((InTypeEnum) typeEnum).getKey() : ((OutTypeEnum) typeEnum).getKey());
-            stockJournal.setBusinessId(stockChangeVo.getBusinessId());
+            stockJournal.setBusinessId(ObjectUtil.defaultIfNull(changeDetails.getBusinessId(), stockChangeVo.getDefaultBusinessId()));
             stockJournal.setGoodsId(changeDetails.getGoodsId());
             stockJournal.setWarehouseId(changeDetails.getWarehouseId());
             stockJournal.setChangeQuantity(changeQuantity);