代码修正

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderInfoEx.java

@@ -35,4 +35,7 @@ public class OrderInfoEx extends OrderInfo implements RegionClientUtil.Region {
 
     List<StockTransferVo> stockTransferList;
 
+    /**接收状态*/
+    private Integer inStatus;
+
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockTransferMapper.xml

@@ -33,32 +33,6 @@
             ${ew.customSqlSegment}
     </select>
 
-    <resultMap id="page1Map" type="com.fjhx.params.order.OrderInfoEx">
-        <id property="id" column="id"/>
-        <result property="code" column="code"/>
-        <result property="amountMoney" column="amount_money"/>
-        <result property="status" column="status"/>
-
-        <result property="countryId" column="country_id"/>
-        <result property="provinceId" column="province_id"/>
-        <result property="countryId" column="city_id"/>
-        <result property="detailedAddress" column="detailed_address"/>
-        <result property="contacts" column="contacts"/>
-        <result property="phone" column="phone"/>
-        <result property="phonePrefixType" column="phone_prefix_type"/>
-
-        <collection property="stockTransferList" javaType="java.util.ArrayList" notNullColumn="id" ofType="com.fjhx.params.stock.StockTransferVo">
-            <id property="id" column="st_id"/>
-            <result property="productId" column="product_id"/>
-            <result property="outQuantity" column="out_quantity"/>
-            <result property="outWarehouseId" column="out_warehouse_id"/>
-            <result property="inWarehouseId" column="in_warehouse_id"/>
-            <result property="inQuantity" column="in_quantity"/>
-            <result property="inUser" column="in_user"/>
-            <result property="productName" column="name"/>
-
-        </collection>
-    </resultMap>
     <select id="getPage1" resultType="com.fjhx.params.order.OrderInfoEx">
         SELECT
             *

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

@@ -126,6 +126,9 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         Map<Long, List<StockTransferVo>> stockTransferListMap = copy.stream().collect(Collectors.groupingBy(StockTransfer::getJdOrderInfoId));
 
         List<Long> pids = copy.stream().map(StockTransferVo::getProductId).collect(Collectors.toList());
+        if(ObjectUtil.isEmpty(pids)){
+            return page;
+        }
         List<ProductInfo> productInfoList = productInfoService.listByIds(pids);
         Map<Long, String> productMap = productInfoList.stream().collect(Collectors.toMap(ProductInfo::getId, ProductInfo::getName));
         for (StockTransferVo stockTransferVo:copy){
@@ -134,6 +137,11 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
 
         for (OrderInfoEx orderInfoEx :records){
             List<StockTransferVo> stockTransfers = stockTransferListMap.get(orderInfoEx.getId());
+            if(ObjectUtil.isEmpty(stockTransfers)){
+                continue;
+            }
+            long count = stockTransfers.stream().filter(f -> f.getInStatus() == 1).count();
+            orderInfoEx.setInStatus(count>=stockTransfers.size()?1:0);//赋值京东订单接收状态
             orderInfoEx.setStockTransferList(stockTransfers);
         }
 
@@ -230,7 +238,10 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         List<Long> ids = dto.stream().map(StockTransfer::getId).collect(Collectors.toList());
         List<StockTransfer> stockTransfers = listByIds(ids);
         for(StockTransfer stockTransfer :stockTransfers){
-            Assert.eqTrue(StatusConstant.NO.equals(stockTransfer.getInStatus()), "物品已接收");
+//            Assert.eqTrue(StatusConstant.NO.equals(stockTransfer.getInStatus()), "物品已接收");
+            if(StatusConstant.YES.equals(stockTransfer.getInStatus())){
+                continue;
+            }
 
             stockTransfer.setInUser(AuthUtil.getUserId());
             stockTransfer.setInQuantity(stockTransferMap.get(stockTransfer.getId()).getInQuantity());