Merge branch 'feature_master_xh_standard' into 'master'

第三方均价展示

See merge request !356
This commit is contained in:
2022-07-25 17:26:15 +08:00
3 changed files with 142 additions and 55 deletions
@@ -187,11 +187,11 @@ public class AverageStatisticsServiceImpl implements AverageStatisticsService {
Integer zhongyuanPrice = (Integer) dataMap.get("zhongyuan_price");
if(null == zhongyuanPrice){
if (isValid(entity.getCentanetEsfPrice())) {
dataMap.put("zhongyuan_price", entity.getCentanetEsfPrice());
if (isValid(entity.getZhongyuanEsfPrice())) {
dataMap.put("zhongyuan_price", entity.getZhongyuanEsfPrice());
}else{
if(isValid(entity.getCentanetNewPrice())){
dataMap.put("zhongyuan_price", entity.getCentanetNewPrice());
if(isValid(entity.getZhongyuanNewPrice())){
dataMap.put("zhongyuan_price", entity.getZhongyuanNewPrice());
}
}
}