思迅总额计算
This commit is contained in:
parent
30b24dda04
commit
62239d4dec
@ -625,7 +625,11 @@ public class SxDataDao extends BaseDao{
|
|||||||
rmSaleflow.setItemNo(itemNo);
|
rmSaleflow.setItemNo(itemNo);
|
||||||
rmSaleflow.setSalePrice(unitPrice);
|
rmSaleflow.setSalePrice(unitPrice);
|
||||||
rmSaleflow.setSaleQnty(stock_qty);
|
rmSaleflow.setSaleQnty(stock_qty);
|
||||||
rmSaleflow.setSaleMoney(productQuantityConsumptionDto.getSaleAmount());
|
BigDecimal saleMoney = unitPrice.multiply(stock_qty).setScale(2, RoundingMode.HALF_UP);
|
||||||
|
if(saleMoney.compareTo(BigDecimal.ZERO)<0){
|
||||||
|
saleMoney=saleMoney.multiply(new BigDecimal(-1));
|
||||||
|
}
|
||||||
|
rmSaleflow.setSaleMoney(saleMoney);
|
||||||
// rmSaleflow.setSourcePrice(unitPrice);
|
// rmSaleflow.setSourcePrice(unitPrice);
|
||||||
rmSaleflow.setFlownoRand(productQuantityConsumptionDto.getOrderId());//随机子单号 设置网上订单号
|
rmSaleflow.setFlownoRand(productQuantityConsumptionDto.getOrderId());//随机子单号 设置网上订单号
|
||||||
if(null!=productQuantityConsumptionDto.getSaleTime()){
|
if(null!=productQuantityConsumptionDto.getSaleTime()){
|
||||||
|
|||||||
@ -815,7 +815,15 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
|
|||||||
Map<String,ProductQuantityConsumptionDto> productQuantityConsumptionDtoMap=new HashMap<>();
|
Map<String,ProductQuantityConsumptionDto> productQuantityConsumptionDtoMap=new HashMap<>();
|
||||||
|
|
||||||
productQuantityConsumptionDtoList.forEach(productQuantityConsumptionDto -> {
|
productQuantityConsumptionDtoList.forEach(productQuantityConsumptionDto -> {
|
||||||
productQuantityConsumptionDtoMap.put(productQuantityConsumptionDto.getOrderId()+"-"+productQuantityConsumptionDto.getProductNumber(),productQuantityConsumptionDto);
|
String key=productQuantityConsumptionDto.getOrderId()+"-"+productQuantityConsumptionDto.getProductNumber();
|
||||||
|
if(null!=productQuantityConsumptionDtoMap.get(key)){
|
||||||
|
ProductQuantityConsumptionDto oldProductQuantityConsumptionDto=productQuantityConsumptionDtoMap.get(key);
|
||||||
|
if(productQuantityConsumptionDto.getSaleTime()<oldProductQuantityConsumptionDto.getSaleTime()){
|
||||||
|
productQuantityConsumptionDtoMap.put(key,productQuantityConsumptionDto);
|
||||||
|
}
|
||||||
|
}else {
|
||||||
|
productQuantityConsumptionDtoMap.put(key,productQuantityConsumptionDto);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
sxDataDao.updateStoreData(dataBaseInfo,map,productQuantityConsumptionDtoMap,productQuantityConsumptionDtoList,commentModel);
|
sxDataDao.updateStoreData(dataBaseInfo,map,productQuantityConsumptionDtoMap,productQuantityConsumptionDtoList,commentModel);
|
||||||
}else {
|
}else {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user