|
|
@ -571,15 +571,16 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
|
|
|
|
.set(RecycleDeliveryOrderEntity::getLastModifyTime, form.getLastModifyTime())
|
|
|
|
.set(RecycleDeliveryOrderEntity::getLastModifyTime, form.getLastModifyTime())
|
|
|
|
.eq(RecycleDeliveryOrderEntity::getId, form.getId());
|
|
|
|
.eq(RecycleDeliveryOrderEntity::getId, form.getId());
|
|
|
|
//如果重量不一致则改为调整通过
|
|
|
|
//如果重量不一致则改为调整通过
|
|
|
|
if (!entity.getReportWeight().equals(form.getAdjustWeight()) && "1".equals(form.getAdjustStatus())) {
|
|
|
|
if (entity.getReportWeight().compareTo(form.getAdjustWeight()) != 0 && "1".equals(form.getAdjustStatus())) {
|
|
|
|
wrapper.lambda().set(RecycleDeliveryOrderEntity::getAdjustStatus, "2");
|
|
|
|
wrapper.lambda().set(RecycleDeliveryOrderEntity::getAdjustStatus, "2");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//如果是拒绝的话 将审核重量以及单价全部改为0
|
|
|
|
//如果是拒绝的话 将审核重量以及单价全部改为0
|
|
|
|
if ("4".equals(form.getAdjustStatus())) {
|
|
|
|
if ("3".equals(form.getAdjustStatus())) {
|
|
|
|
wrapper.lambda().set(RecycleDeliveryOrderEntity::getAdjustWeight, 0)
|
|
|
|
wrapper.lambda().set(RecycleDeliveryOrderEntity::getAdjustWeight, 0)
|
|
|
|
.set(RecycleDeliveryOrderEntity::getAdjustPrice, 0);
|
|
|
|
.set(RecycleDeliveryOrderEntity::getAdjustPrice, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
boolean update = this.update(wrapper);
|
|
|
|
boolean update = this.update(wrapper);
|
|
|
|
|
|
|
|
entity = this.getById(form.getId());
|
|
|
|
if (update) {
|
|
|
|
if (update) {
|
|
|
|
BigDecimal price = entity.getAdjustPrice();
|
|
|
|
BigDecimal price = entity.getAdjustPrice();
|
|
|
|
String orderNo = entity.getOrderNo();
|
|
|
|
String orderNo = entity.getOrderNo();
|
|
|
@ -653,6 +654,7 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
|
|
|
|
enterpriseAccountBillService.save(billEntity);
|
|
|
|
enterpriseAccountBillService.save(billEntity);
|
|
|
|
// 添加散户流水
|
|
|
|
// 添加散户流水
|
|
|
|
ClientAccountDetailEntity clientAccountDetail = new ClientAccountDetailEntity();
|
|
|
|
ClientAccountDetailEntity clientAccountDetail = new ClientAccountDetailEntity();
|
|
|
|
|
|
|
|
clientAccountDetail.setOrderNumber(orderNo);
|
|
|
|
clientAccountDetail.setClientId(client.getId());
|
|
|
|
clientAccountDetail.setClientId(client.getId());
|
|
|
|
clientAccountDetail.setAmount(amount);
|
|
|
|
clientAccountDetail.setAmount(amount);
|
|
|
|
clientAccountDetail.setChangeType("1");
|
|
|
|
clientAccountDetail.setChangeType("1");
|
|
|
|