|
|
@@ -184,7 +184,14 @@ public class TradeOrderInfoServiceImpl implements TradeOrderInfoService {
|
|
|
for (GoodsLoadingParam goodsLoading : loading) {
|
|
|
//差值
|
|
|
BigDecimal differenceAmount = goodsLoading.getLoadAmount().subtract(goodsLoading.getAmount());
|
|
|
- BigDecimal totalEntrustAmount = NumberConstant.ZERO_TWO.compareTo(order.getEntrustAmount()) == 0 ? differenceAmount.abs() : differenceAmount.add(order.getEntrustAmount());
|
|
|
+// BigDecimal totalEntrustAmount = Objects.isNull(order.getEntrustAmount()) ? differenceAmount : differenceAmount.add(order.getEntrustAmount());
|
|
|
+ BigDecimal totalEntrustAmount = NumberConstant.ZERO_TWO.compareTo(order.getEntrustAmount()) == 0 ? differenceAmount : differenceAmount.add(order.getEntrustAmount());
|
|
|
+// BigDecimal totalEntrustAmount = new BigDecimal("0.00");
|
|
|
+// if (NumberConstant.ZERO_TWO.compareTo(order.getEntrustAmount()) == 0) {
|
|
|
+// totalEntrustAmount = differenceAmount;
|
|
|
+// } else {
|
|
|
+// totalEntrustAmount = differenceAmount.add(order.getEntrustAmount());
|
|
|
+// }
|
|
|
if (goodsLoading.getUnit().equals(order.getUnit())) {
|
|
|
order.setEntrustAmount(totalEntrustAmount).setUpdateBy(updateBy);
|
|
|
kwoTradeOrderService.updateById(order);
|