yzc 1 gadu atpakaļ
vecāks
revīzija
1e2939dc8a

+ 0 - 5
hx-item/src/main/java/com/fjhx/item/entity/product/dto/ProductInfoDto.java

@@ -20,11 +20,6 @@ public class ProductInfoDto extends ProductInfo {
     private List<ObsFile> fileList;
 
     /**
-     * 部门id
-     */
-    private Long deptId;
-
-    /**
      * 开始时间
      */
     private  String beginTime;

+ 4 - 3
hx-item/src/main/java/com/fjhx/item/entity/product/po/ProductInfo.java

@@ -81,9 +81,6 @@ public class ProductInfo extends BasePo {
      */
     private Long productSpuId;
 
-    @TableField(exist = false)
-    private Integer count;
-
     /**
      * 尔泓json
      */
@@ -99,4 +96,8 @@ public class ProductInfo extends BasePo {
      */
     private BigDecimal unitPrice;
 
+    private Long deptId;
+
+    @TableField(exist = false)
+    private Integer count;
 }

+ 3 - 1
hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -454,13 +454,15 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     @DSTransactional
     @Override
     public void addByWdly(ProductInfoDto productInfoDto) {
+        Long deptId = SecurityUtils.getDeptId();
         //处理维多利亚扩展
         String victoriatouristJson = productInfoDto.getVictoriatouristJson();
         if (ObjectUtil.isNotEmpty(victoriatouristJson)) {
             JSONObject json = JSONObject.parseObject(victoriatouristJson);
-            json.put("deptId", SecurityUtils.getDeptId());
+            json.put("deptId", deptId);
             productInfoDto.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
         }
+        productInfoDto.setDeptId(deptId);
         add(productInfoDto);
     }