|
|
|
@@ -1442,9 +1442,14 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
if (null != couponorderlist && couponorderlist.size() > 0 ) { |
|
|
|
couponOrder = couponorderlist.get(0); |
|
|
|
}else { |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
couponOrder = new WxCouponOrder(); |
|
|
|
couponOrder.setId(idWorker.nextId()); |
|
|
|
//如果是实体卡用了之后的兑换,则id要取wxCardInfo的id |
|
|
|
if (isCard && null != couponPassWord && couponPassWord.isDefaultUser()) { |
|
|
|
couponOrder.setId(couponPassWord.getWxCardInfo().getId()); |
|
|
|
}else { |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
couponOrder.setId(idWorker.nextId()); |
|
|
|
} |
|
|
|
couponOrder.updateTenantInfo(order); |
|
|
|
couponOrder.setCouponId(order.getProductId()); |
|
|
|
couponOrder.setCouponType(coupon.getType()); |
|
|
|
|