|
@@ -1020,7 +1020,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
|
|
|
Map<String,BigDecimal> bytedanceMap = new HashMap<>();
|
|
|
for (int i = 0; i < bytedanceCostList.size(); i++) {
|
|
|
- JSONObject jsonObject = kuaiShouCostList.get(i);
|
|
|
+ JSONObject jsonObject = bytedanceCostList.get(i);
|
|
|
bytedanceMap.put(jsonObject.getString("signature"),jsonObject.getBigDecimal("charges"));
|
|
|
}
|
|
|
|
|
@@ -1028,17 +1028,17 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
|
MaterialInfo materialInfo = setList.get(i);
|
|
|
if(!Check.isNullMap(kuaishouMap)){
|
|
|
if (!Check.isNull(kuaishouMap.get(materialInfo.getCode()))) {
|
|
|
- materialInfo.setBytedanceCost(kuaishouMap.get(materialInfo.getCode()));
|
|
|
+ materialInfo.setCost(kuaishouMap.get(materialInfo.getCode()));
|
|
|
} else {
|
|
|
- materialInfo.setBytedanceCost(new BigDecimal(0));
|
|
|
+ materialInfo.setCost(new BigDecimal(0));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if(!Check.isNullMap(bytedanceMap)){
|
|
|
if (!Check.isNull(bytedanceMap.get(materialInfo.getCode()))) {
|
|
|
- materialInfo.setCost(bytedanceMap.get(materialInfo.getCode()));
|
|
|
+ materialInfo.setBytedanceCost(bytedanceMap.get(materialInfo.getCode()));
|
|
|
} else {
|
|
|
- materialInfo.setCost(new BigDecimal(0));
|
|
|
+ materialInfo.setBytedanceCost(new BigDecimal(0));
|
|
|
}
|
|
|
}
|
|
|
|