luobang 1 year ago
parent
commit
adf01df3d6

+ 1 - 1
src/main/java/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.java

@@ -198,7 +198,7 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
 
     Map<String, Object> getsaleShippingAddressId(Map<String, Object> mapValue);
 
-    int updateDetailsStatus(Integer orderId);
+    int updateDetailsStatus(Integer detailsId);
 
     int getSaleOrderStatus(BigDecimal orderId);
 

+ 5 - 0
src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -1214,6 +1214,11 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             List<Map<String,Object>> weightTaskResultIdList = bmstruckDetailsOrderMapper.getSteelWeightTaskResultId(orderId);
             for (Map<String, Object> map : weightTaskResultIdList) {
                 BigDecimal weightTaskResultId = DataChange.dataToBigDecimal(map.get("weightTaskResultId"));
+                BigDecimal netWeightIsNull = bmstruckDetailsOrderMapper.getNetWeight(weightTaskResultId);
+                if (netWeightIsNull == null) {
+                    System.out.println("没有计量实绩,不生成结算数据:" + orderId);
+                    continue;
+                }
                 //计算总费用
                 BigDecimal  detailsAmountOld = generateTruckFeesForDirect(priceValue, weightTaskResultId);
                 Double amount = detailsAmountOld.doubleValue();