字段更改名称

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

@@ -22,9 +22,9 @@ import java.math.BigDecimal;
 public class SubscribeDetail extends BasePo {
 
     /**
-     * 关联ID  产品ID/货品ID
+     * 产品ID/货品ID
      */
-    private Long bussinessId;
+    private Long productId;
 
     /**
      * 申购单ID

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

@@ -94,7 +94,7 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
             return new Page<>();
         }
         List<Long> productIds = productList.stream().map(ProductInfoVo::getId).collect(Collectors.toList());
-        wrapper.in("t1", SubscribeDetail::getBussinessId, productIds);
+        wrapper.in("t1", SubscribeDetail::getProductId, productIds);
 
         // 维多利亚扩展根据到货仓库id过滤
         wrapper.eq("json_unquote(t2.victoriatourist_json -> '$.receiptWarehouseId')", dto.getReceiptWarehouseId());
@@ -118,7 +118,7 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
         // 赋值产品信息
         for (SubscribeDetailVo s : list) {
             Map<Long, ProductInfoVo> productMap = productList.stream().collect(Collectors.toMap(ProductInfoVo::getId, Function.identity()));
-            ProductInfoVo productInfo = productMap.get(s.getBussinessId());
+            ProductInfoVo productInfo = productMap.get(s.getProductId());
             s.setProductCode(productInfo.getCode());
             s.setProductName(productInfo.getName());
             s.setProductType(productInfo.getType());
@@ -165,12 +165,12 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
         List<SubscribeDetailVo> list = baseMapper.getDetail(ids);
         if (CollectionUtils.isNotEmpty(list)) {
             //根据申购businessId取出所有产品
-            List<Long> productIds = list.stream().map(SubscribeDetail::getBussinessId).collect(Collectors.toList());
+            List<Long> productIds = list.stream().map(SubscribeDetail::getProductId).collect(Collectors.toList());
             List<ProductInfoVo> productInfoVos = productInfoService.getListByProductIds(productIds);
             Map<Long, List<ProductInfoVo>> productMap = productInfoVos.stream().collect(Collectors.groupingBy(ProductInfoVo::getId));
             for (SubscribeDetailVo s : list) {
                 if (MapUtils.isNotEmpty(productMap)) {
-                    ProductInfoVo p = productMap.get(s.getBussinessId()).get(0);
+                    ProductInfoVo p = productMap.get(s.getProductId()).get(0);
                     s.setProductCategory(p.getClassifyName());
                     s.setProductCode(p.getCode());
                     s.setProductUnit(p.getUnit());

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

@@ -111,12 +111,12 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
                         .eq(SubscribeDetail::getSubscribeId, id));
         if (CollectionUtils.isNotEmpty(subscribeDetailList)) {
             //根据申购businessId取出所有产品
-            List<Long> productIds = subscribeDetailList.stream().map(SubscribeDetail::getBussinessId).collect(Collectors.toList());
+            List<Long> productIds = subscribeDetailList.stream().map(SubscribeDetail::getProductId).collect(Collectors.toList());
             List<ProductInfoVo> productInfoVos = productInfoService.getListByProductIds(productIds);
             Map<Long, List<ProductInfoVo>> productMap = productInfoVos.stream().collect(Collectors.groupingBy(ProductInfoVo::getId));
             for (SubscribeDetail s : subscribeDetailList) {
                 if (MapUtils.isNotEmpty(productMap)) {
-                    ProductInfoVo p = productMap.get(s.getBussinessId()).get(0);
+                    ProductInfoVo p = productMap.get(s.getProductId()).get(0);
                     s.setProductCategory(p.getClassifyName());
                     s.setProductCode(p.getCode());
                     s.setProductUnit(p.getUnit());
@@ -194,7 +194,7 @@ public class SubscribeServiceImpl extends ServiceImpl<SubscribeMapper, Subscribe
         if (ObjectUtils.isEmpty(list)) {
             return new ArrayList<>();
         }
-        List<Long> ids = list.stream().map(SubscribeDetail::getBussinessId).collect(Collectors.toList());
+        List<Long> ids = list.stream().map(SubscribeDetail::getProductId).collect(Collectors.toList());
         List<ProductInfo> list1 = productInfoService.listByIds(ids);
 //        for (ProductInfo productInfo : list1) {
 //            String victoriatouristJson = productInfo.getVictoriatouristJson();

hx-sale/src/main/java/com/fjhx/sale/flow/EhsdPurchaseFlow.java

@@ -1,13 +1,11 @@
 package com.fjhx.sale.flow;
 
 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.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.area.utils.CustomizeAreaUtil;
-import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
@@ -332,7 +330,7 @@ public class EhsdPurchaseFlow extends FlowDelegate {
             for (SubscribeDetail subscribeDetail : subscribeDetails) {
                 //获取申购明细下的所有采购记录 计算已采购数
                 List<EhsdPurchaseProduct> purchaseDetails = purchaseProductService.list(q -> q.eq(EhsdPurchaseProduct::getSubscribeDetailId,
-                        subscribeDetail.getId()).eq(EhsdPurchaseProduct::getProductId, subscribeDetail.getBussinessId()));
+                        subscribeDetail.getId()).eq(EhsdPurchaseProduct::getProductId, subscribeDetail.getProductId()));
                 BigDecimal count = purchaseDetails.stream()
                         .map(EhsdPurchaseProduct::getQuantity)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);