|
|
|
@ -562,6 +562,14 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
|
|
|
|
|
batch.setLastModifyUserId(userInfo.getUserId());
|
|
|
|
|
batch.setLastModifyTime(LocalDateTime.now());
|
|
|
|
|
int update = deliveryOrderMapper.auditBatch(batch);
|
|
|
|
|
batch.getIds().forEach(id -> {
|
|
|
|
|
RecycleDeliveryOrderEntity entity = this.getById(id);
|
|
|
|
|
BigDecimal price = entity.getAdjustPrice();
|
|
|
|
|
String orderNo = entity.getOrderNo();
|
|
|
|
|
String companyId = entity.getCompanyId();
|
|
|
|
|
String clientId = entity.getDeliverId();
|
|
|
|
|
addBalance(clientId, orderNo, price, companyId);
|
|
|
|
|
});
|
|
|
|
|
return update;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -574,8 +582,9 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
|
|
|
|
|
* @param companyId 商户id
|
|
|
|
|
*/
|
|
|
|
|
private void addBalance(String clientId, String orderNo, BigDecimal amount, String companyId) {
|
|
|
|
|
if (amount.compareTo(BigDecimal.ZERO) == 0) {
|
|
|
|
|
if (amount.compareTo(BigDecimal.ZERO) <= 0) {
|
|
|
|
|
log.error("结算金额为0,订单号:{},结算金额:{},结算商户:{},结算散户:{}", orderNo, amount, companyId, clientId);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
Date now = new Date();
|
|
|
|
|
CompanyEntity company = companyService.getById(companyId);
|
|
|
|
|