|
@@ -77,6 +77,8 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
|
|
|
rmsOilPrice.setId(new BigDecimal(id));
|
|
|
rmsOilPrice.setUpdateTime(new Date());
|
|
|
rmsOilPrice.setPriceStatus(new BigDecimal(0));
|
|
|
+ //加入正数条件
|
|
|
+ mesMap.put("flag","1");
|
|
|
//油价联动
|
|
|
amsFeign.batchUpdateTransportPriceByOilPrice1(mesMap);
|
|
|
return rmsOilPriceMapper.updateByPrimaryKeySelective(rmsOilPrice);
|
|
@@ -134,7 +136,7 @@ public class RmsOilPriceServiceImpl implements IRmsOilPriceService {
|
|
|
}
|
|
|
//如果新增的油价是启用的则关闭该油品之前的已启用的
|
|
|
Boolean priceStatus = (Boolean) map.get("priceStatus");
|
|
|
- if(priceStatus){
|
|
|
+ if(priceStatus && n.compareTo(BigDecimal.ZERO)==-1){
|
|
|
if(mesMap != null){
|
|
|
map.put("oilTypeId", oilTypeId);
|
|
|
rmsOilPriceMapper.closeLastOilPrice(map);
|