|
|
@@ -677,9 +677,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
|
|
|
stockOne.setBalanceQuantity(stockOne.getBalanceQuantity().add(item.getSendNum()));
|
|
|
stockOne.setStoreInventory(stockOne.getBalanceQuantity());
|
|
|
|
|
|
+ //库存金额
|
|
|
BigDecimal inventoryAmount = item.getSendNum().multiply(item.getPrice());
|
|
|
stockOne.setInventoryAmount(stockOne.getInventoryAmount().add(inventoryAmount));
|
|
|
|
|
|
+ //库存成本价
|
|
|
stockOne.setInventoryCostPrice(stockOne.getInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
|
|
|
stockDescMapper.updateById(stockOne);
|
|
|
}
|
|
|
@@ -720,6 +722,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
|
|
|
//生成历史记录
|
|
|
saveHistory(order.getId(), "已退款");
|
|
|
|
|
|
+ /** ----------------------调用退款接口---------------------- */
|
|
|
+
|
|
|
+ /** ----------------------调用退款接口---------------------- */
|
|
|
+
|
|
|
if (OrderTypeEnum.WEB.getType().equals(order.getBusinessSource())){
|
|
|
order.setStatus("已取消");
|
|
|
}else {
|
|
|
@@ -795,7 +801,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
|
|
|
* 生成工单历史记录
|
|
|
*/
|
|
|
public void saveHistory(Long pid, String status){
|
|
|
- //生成出库工单历史记录
|
|
|
+ //生成工单历史记录
|
|
|
PjHistory history = new PjHistory();
|
|
|
history.setTenantId(AuthUtil.getTenantId());
|
|
|
history.setCreateUser(AuthUtil.getUserId());
|
wangzhuo