|
|
@@ -1338,7 +1338,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
}
|
|
|
//旧系统B端网银退款处理
|
|
|
Integer sign = handleEnterpriseRefund(refundPrice, order, bo,orderRefundList.get(0).getType(),orderRefundList);
|
|
|
- orderRefundList.forEach(x -> x.setPeriodStatus(sign==2?4:3));//支付中
|
|
|
+ orderRefundList.forEach(x ->{
|
|
|
+ x.setPeriodStatus(sign==2?4:3);//支付中
|
|
|
+ //待扣分成
|
|
|
+ TopOldOrderGoods orderGoods = topOrderGoodsService.getById(x.getOrderGoodsId());
|
|
|
+ x.setDivideModel(orderGoods.getDivideModel());
|
|
|
+ x.setDivideMoney(orderGoods.getDivideMoney());
|
|
|
+ } );
|
|
|
topOldOrderRefundService.updateBatchById(orderRefundList.stream().map(x -> BeanUtil.toBean(x,TopOldOrderRefund.class)).collect(Collectors.toList()));
|
|
|
update(new LambdaUpdateWrapper<TopOldOrder>()
|
|
|
.set(TopOldOrder::getRefundStatus,sign==2?5:3) // 支付中
|
|
|
@@ -1357,7 +1363,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
}else if (order.getOrderFrom() == 2 && bo.getPayType() == 1){
|
|
|
// 旧系统C端微信退款处理
|
|
|
checkInform(order.getOrderSn(),orderRefundList.get(0).getType(),"",1,1,"已支付");
|
|
|
- orderRefundList.forEach(x -> x.setPeriodStatus(3));//已完成
|
|
|
+ orderRefundList.forEach(x -> {
|
|
|
+ x.setPeriodStatus(3);//已完成
|
|
|
+ //待扣分成
|
|
|
+ TopOldOrderGoods orderGoods = topOrderGoodsService.getById(x.getOrderGoodsId());
|
|
|
+ x.setDivideModel(orderGoods.getDivideModel());
|
|
|
+ x.setDivideMoney(orderGoods.getDivideMoney());
|
|
|
+ });
|
|
|
topOldOrderRefundService.updateBatchById(orderRefundList.stream().map(x -> BeanUtil.toBean(x,TopOldOrderRefund.class)).collect(Collectors.toList()));
|
|
|
topOrderGoodsService.update(new LambdaUpdateWrapper<TopOldOrderGoods>()
|
|
|
.set(TopOldOrderGoods::getRefundStatus,2)//已退款
|