|
@@ -591,17 +591,17 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
BigDecimal newAmount = updateSteelAmounts(map);
|
|
BigDecimal newAmount = updateSteelAmounts(map);
|
|
bmstruckDetailsOrder.setDetailsAmount(newAmount.divide(new BigDecimal(1),2, RoundingMode.HALF_UP));
|
|
bmstruckDetailsOrder.setDetailsAmount(newAmount.divide(new BigDecimal(1),2, RoundingMode.HALF_UP));
|
|
//修改单价的历史时间
|
|
//修改单价的历史时间
|
|
- omstruckOrderMapper.modifyOldTime(priceId,new Date());
|
|
|
|
|
|
+ //omstruckOrderMapper.modifyOldTime(priceId,new Date());
|
|
}catch (Exception e) {
|
|
}catch (Exception e) {
|
|
System.out.println("更新历史时间失败");
|
|
System.out.println("更新历史时间失败");
|
|
}
|
|
}
|
|
result = bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);
|
|
result = bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);
|
|
}
|
|
}
|
|
- try {
|
|
|
|
|
|
+ /*try {
|
|
amsFeign.copySteelPrice(mapValue);
|
|
amsFeign.copySteelPrice(mapValue);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
if(DataChange.dataToBigDecimal(mapValue.get("updatePlace")).intValue() == 1) {
|
|
if(DataChange.dataToBigDecimal(mapValue.get("updatePlace")).intValue() == 1) {
|
|
Map<String, Object> stringObjectMap = bmstruckDetailsOrderMapper.getsaleShippingAddressId(mapValue);
|
|
Map<String, Object> stringObjectMap = bmstruckDetailsOrderMapper.getsaleShippingAddressId(mapValue);
|
|
BigDecimal saleShippingAddressId = (BigDecimal) stringObjectMap.get("saleShippingAddressId");
|
|
BigDecimal saleShippingAddressId = (BigDecimal) stringObjectMap.get("saleShippingAddressId");
|
|
@@ -928,6 +928,8 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
//bmstruckDetailsOrder.setWetherToStatement(new BigDecimal(1));
|
|
//bmstruckDetailsOrder.setWetherToStatement(new BigDecimal(1));
|
|
//i += bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);
|
|
//i += bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);
|
|
i += bmstruckDetailsOrderMapper.updateDetailsStatus(orderId);
|
|
i += bmstruckDetailsOrderMapper.updateDetailsStatus(orderId);
|
|
|
|
+ /*BigDecimal priceId = omstruckOrderMapper.getPriceId(orderId);
|
|
|
|
+ omstruckOrderMapper.modifyOldTime(priceId,new Date());*/
|
|
}
|
|
}
|
|
return i;
|
|
return i;
|
|
}
|
|
}
|
|
@@ -936,4 +938,34 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
public int getSaleOrderStatus(BigDecimal orderId) {
|
|
public int getSaleOrderStatus(BigDecimal orderId) {
|
|
return bmstruckDetailsOrderMapper.getSaleOrderStatus(orderId);
|
|
return bmstruckDetailsOrderMapper.getSaleOrderStatus(orderId);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public int insertPriceValue(List<Map<String, Object>> mapList) {
|
|
|
|
+ for (Map<String, Object> map : mapList) {
|
|
|
|
+ Integer placeId =(Integer) map.get("placeId");
|
|
|
|
+ //根据位置ID去查询是否有单价存在,如果有就跳过
|
|
|
|
+ BigDecimal priceIdInt = bmstruckDetailsOrderMapper.getPriceIdInt(placeId);
|
|
|
|
+ if (priceIdInt!=null&&priceIdInt.compareTo(BigDecimal.ZERO)!=0){
|
|
|
|
+ break;
|
|
|
|
+ }else {
|
|
|
|
+ //新增单价
|
|
|
|
+ BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
|
|
|
|
+ BigDecimal omsTruckOrderPriceId = bmstruckDetailsOrderMapper.getOmsTruckOrderPriceId(orderId);
|
|
|
|
+ Map<String,Object> map1=new HashMap<>();
|
|
|
|
+ map1.put("orderId",orderId);
|
|
|
|
+ map1.put("priceId",omsTruckOrderPriceId);
|
|
|
|
+ try {
|
|
|
|
+ amsFeign.copySteelPrice(map1);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ //单价的主键
|
|
|
|
+ //map1.put("priceId",bmstruckDetailsOrderMapper.selectMaxIdNew());
|
|
|
|
+ //map1.put("priceValue",map.get("priceValue"));
|
|
|
|
+ //map1.put("placeId",placeId);
|
|
|
|
+ //bmstruckDetailsOrderMapper.insertPriceValue(map1);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
}
|
|
}
|