|
@ -34,6 +34,7 @@ import org.springframework.util.CollectionUtils; |
|
|
import javax.annotation.Resource; |
|
|
import javax.annotation.Resource; |
|
|
import java.math.BigDecimal; |
|
|
import java.math.BigDecimal; |
|
|
import java.sql.Date; |
|
|
import java.sql.Date; |
|
|
|
|
|
import java.time.LocalDateTime; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@ -74,6 +75,8 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder |
|
|
private WechatPayCertificateDiagnostic certificateDiagnostic; |
|
|
private WechatPayCertificateDiagnostic certificateDiagnostic; |
|
|
@Resource |
|
|
@Resource |
|
|
private ShopOrderUpdate10550Service shopOrderUpdate10550Service; |
|
|
private ShopOrderUpdate10550Service shopOrderUpdate10550Service; |
|
|
|
|
|
@Resource |
|
|
|
|
|
private ShopUserCouponService shopUserCouponService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
@ -249,6 +252,18 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder |
|
|
@Override |
|
|
@Override |
|
|
public void updateByOutTradeNo(ShopOrder order) { |
|
|
public void updateByOutTradeNo(ShopOrder order) { |
|
|
baseMapper.updateByOutTradeNo(order); |
|
|
baseMapper.updateByOutTradeNo(order); |
|
|
|
|
|
// 使用优惠券
|
|
|
|
|
|
if (order.getCouponId() != null && order.getCouponId() > 0) { |
|
|
|
|
|
ShopUserCoupon coupon = shopUserCouponService.getById(order.getCouponId()); |
|
|
|
|
|
if (coupon != null) { |
|
|
|
|
|
coupon.setStatus(1); |
|
|
|
|
|
coupon.setIsUse(1); |
|
|
|
|
|
coupon.setUseTime(LocalDateTime.now()); |
|
|
|
|
|
coupon.setOrderId(order.getOrderId()); |
|
|
|
|
|
coupon.setOrderNo(order.getOrderNo()); |
|
|
|
|
|
shopUserCouponService.updateById(coupon); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
if (order.getTenantId().equals(10550)) { |
|
|
if (order.getTenantId().equals(10550)) { |
|
|
shopOrderUpdate10550Service.update(order); |
|
|
shopOrderUpdate10550Service.update(order); |
|
|
} |
|
|
} |
|
|