|
|
|
@@ -154,7 +154,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public WxCouponOrder getById(Long id,String tenantId) { |
|
|
|
return wxCouponOrderMapper.selectById(id); |
|
|
|
return wxCouponOrderMapper.selectById(id,tenantId); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -1451,10 +1451,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
updateCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); |
|
|
|
updateCouponOrder.setUpdateDate(new Date()); |
|
|
|
updateCouponOrder.setPayVendor(payWay.getCode()); |
|
|
|
updateCouponOrder.updateTenantInfo(bUser); |
|
|
|
// 核销状态更新 |
|
|
|
int num = wxCouponOrderMapper.updateById(updateCouponOrder); |
|
|
|
if (num == 1) { |
|
|
|
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId); |
|
|
|
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId,updateCouponOrder.getTenantId()); |
|
|
|
WxCoupon coupon = wxCouponMapper.selectById(couponOrder.getCouponId(),bUser.getTenantId()); |
|
|
|
doAfterVerify(couponOrder, bUser, coupon); |
|
|
|
} |
|
|
|
@@ -1463,15 +1464,16 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public Integer shangAnVerify(Long couponOrderId) { |
|
|
|
public Integer shangAnVerify(Long couponOrderId,TenantEntity tenantinfo) { |
|
|
|
WxCouponOrder updateCouponOrder = new WxCouponOrder(); |
|
|
|
updateCouponOrder.setId(couponOrderId); |
|
|
|
updateCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); |
|
|
|
updateCouponOrder.setUpdateDate(new Date()); |
|
|
|
updateCouponOrder.updateTenantInfo(tenantinfo); |
|
|
|
// 核销状态更新 |
|
|
|
int num = wxCouponOrderMapper.updateById(updateCouponOrder); |
|
|
|
if (num == 1) { |
|
|
|
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId); |
|
|
|
WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId,tenantinfo.getTenantId()); |
|
|
|
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(couponOrder.getcUserId(),couponOrder.getFinalTenantId()); |
|
|
|
WxCoupon coupon = wxCouponMapper.selectById(couponOrder.getCouponId(),couponOrder.getTenantId()); |
|
|
|
doAfterVerify(couponOrder, coupon, wxCUserBasicInfo); |
|
|
|
|