维多利亚申购扩展

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/po/Subscribe.java

@@ -74,4 +74,7 @@ public class Subscribe extends BasePo {
     @TableField(exist = false)
     private List<SubscribeDetail> subscribeDetailList;
 
+    /**维多利亚扩展json*/
+    private String victoriatouristJson;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/vo/SubscribeDetailVo.java

@@ -45,4 +45,7 @@ public class SubscribeDetailVo extends SubscribeDetail {
      * 采购数量
      */
     private String purchaseCount;
+
+    /**维多利亚扩展json*/
+    private String victoriatouristJson;
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fjhx.purchase.service.subscribe.impl;
 
 import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -15,6 +16,8 @@ import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.purchase.util.code.CodeEnum;
+import com.fjhx.wms.entity.warehouse.po.Warehouse;
+import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.obs.services.internal.ServiceException;
 import io.seata.spring.annotation.GlobalTransactional;
 import org.apache.commons.collections4.MapUtils;
@@ -50,6 +53,9 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
     @Autowired
     private ProductInfoService productInfoService;
 
+    @Autowired
+    WarehouseService warehouseService;
+
     @Override
     public Page<SubscribeVo> getPage(SubscribeSelectDto dto) {
         IWrapper<Subscribe> wrapper = getWrapper();
@@ -93,6 +99,17 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
             }
         }
         subscribe.setSubscribeDetailList(subscribeDetailList);
+        //赋值维多利亚扩展收货仓库名
+        String victoriatouristJson = subscribe.getVictoriatouristJson();
+        if(ObjectUtils.isNotEmpty(victoriatouristJson)){
+            JSONObject json = JSONObject.parseObject(victoriatouristJson);
+            Long receiptWarehouseId = json.getLong("receiptWarehouseId");
+            Warehouse warehouse = warehouseService.getById(receiptWarehouseId);
+            if(ObjectUtils.isNotEmpty(victoriatouristJson)) {
+                json.put("receiptWarehouseName",warehouse.getName());
+                subscribe.setVictoriatouristJson(json.toJSONString());
+            }
+        }
         return subscribe;
     }
 

hx-purchase/src/main/resources/mapper/subscribe/SubscribeDetailMapper.xml

@@ -8,7 +8,8 @@
             t2.subcribe_content AS subscribeContent,
             t2.subcribe_time AS subcribeTime,
             t2.subcribe_name AS subcribeName,
-            t2.id AS subcribeId
+            t2.id AS subcribeId,
+            t2.victoriatourist_json
         FROM
             subscribe_detail t1
         LEFT JOIN subscribe t2 ON t1.subscribe_id = t2.id