|
|
|
@@ -876,7 +876,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, Long memberId, RefundOrderCallback refundOrderCallback) { |
|
|
|
public ResultData ttCallBackCreateRefundOrder(TenantEntity tenantEntity, RefundOrderCallback refundOrderCallback) { |
|
|
|
|
|
|
|
String outOrderNo = refundOrderCallback.getOutOrderNo(); |
|
|
|
Long compseOrderId = Long.parseLong(outOrderNo); |
|
|
|
@@ -978,17 +978,17 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { |
|
|
|
} |
|
|
|
|
|
|
|
// 卡退款,把卡余额设为0 |
|
|
|
if (wxCouponOrder.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { |
|
|
|
WxCardInfo updateCardInfo = new WxCardInfo(); |
|
|
|
updateCardInfo.setId(wxCouponOrder.getId()); |
|
|
|
updateCardInfo.setRemainingAmount(0); |
|
|
|
try { |
|
|
|
wxCardInfoMapper.updateById(updateCardInfo); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("db failed: wxCardInfo-" + wxCouponOrder.getId() + ", e:" + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
// if (wxCouponOrder.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { |
|
|
|
// WxCardInfo updateCardInfo = new WxCardInfo(); |
|
|
|
// updateCardInfo.setId(wxCouponOrder.getId()); |
|
|
|
// updateCardInfo.setRemainingAmount(0); |
|
|
|
// try { |
|
|
|
// wxCardInfoMapper.updateById(updateCardInfo); |
|
|
|
// } catch (Exception e) { |
|
|
|
// logger.error("db failed: wxCardInfo-" + wxCouponOrder.getId() + ", e:" + e.getMessage()); |
|
|
|
// throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
// } |
|
|
|
// } |
|
|
|
} |
|
|
|
|
|
|
|
// WxPayOrder payOrderQ = new WxPayOrder(); |
|
|
|
@@ -1033,7 +1033,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { |
|
|
|
record.setUpdateTime(currentDate); |
|
|
|
// 微信内部订单号 |
|
|
|
record.setTransactionId(refundOrderCallback.getOrderId()); |
|
|
|
record.setCUserId(memberId); |
|
|
|
record.setCUserId(wxOrder.getCUserId()); |
|
|
|
record.setTotalFee(wxOrder.getPayment()); |
|
|
|
record.setRefundFee(refundOrderCallback.getRefundTotalAmount()); |
|
|
|
record.setRefundTimeStart(new Date(refundOrderCallback.getCreateRefundTime())); |
|
|
|
|