|
|
@@ -250,6 +250,11 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
|
|
|
lifeUserOrder.setFinishTime(new Date());
|
|
|
lifeUserOrder.setCreatedTime(new Date());
|
|
|
lifeUserOrderMapper.updateById(lifeUserOrder);
|
|
|
+
|
|
|
+ //发放好友优惠券
|
|
|
+ LifeDiscountCouponStoreFriendDto lifeDiscountCouponStoreFriendDto = new LifeDiscountCouponStoreFriendDto();
|
|
|
+ lifeDiscountCouponStoreFriendDto.setOrderId(Integer.parseInt(lifeUserOrder.getId()));
|
|
|
+ lifeDiscountCouponStoreFriendService.issueFriendCoupon(lifeDiscountCouponStoreFriendDto);
|
|
|
}
|
|
|
// TODO 订单状态 -> 变已完成 筛选出未完成的状态
|
|
|
List<OrderCouponMiddle> collect = couponMiddleList.stream().filter(x -> x.getId() != orderCouponMiddle.getId())
|
|
|
@@ -260,6 +265,11 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
|
|
|
lifeUserOrder.setFinishTime(new Date());
|
|
|
lifeUserOrder.setCreatedTime(new Date());
|
|
|
lifeUserOrderMapper.updateById(lifeUserOrder);
|
|
|
+
|
|
|
+ //发放好友优惠券
|
|
|
+ LifeDiscountCouponStoreFriendDto lifeDiscountCouponStoreFriendDto = new LifeDiscountCouponStoreFriendDto();
|
|
|
+ lifeDiscountCouponStoreFriendDto.setOrderId(Integer.parseInt(lifeUserOrder.getId()));
|
|
|
+ lifeDiscountCouponStoreFriendService.issueFriendCoupon(lifeDiscountCouponStoreFriendDto);
|
|
|
}
|
|
|
// 计算总退款金额(orderCouponMiddle金额按实际的存)
|
|
|
BigDecimal refundAmount = couponMiddleList.stream().filter(x -> x.getStatus() == OrderStatusEnum.REFUND.getStatus()).map(x -> x.getPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
@@ -288,6 +298,7 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
|
|
|
updateWrapper.eq("delete_flag", 0);
|
|
|
updateWrapper.setSql("money = money + " + money);
|
|
|
storeUserMapper.update(null, updateWrapper);
|
|
|
+
|
|
|
resultMap.put("code", "true");
|
|
|
resultMap.put("message", "核销成功");
|
|
|
} else {
|