|
|
|
@@ -1331,27 +1331,14 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { |
|
|
|
public ResultData returnMoney(WxAppinfo appInfo, Long orderId) { |
|
|
|
WxOrder wxOrder = wxOrderMapper.selectByPrimaryKey(orderId); |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long refundOrderId = idWorker.nextId(); |
|
|
|
Date currentDate = new Date(); |
|
|
|
// 创建 refund Order |
|
|
|
WxOrder rOrder = new WxOrder(); |
|
|
|
rOrder.setId(refundOrderId); |
|
|
|
rOrder.setTenantId(appInfo.getTenantId()); |
|
|
|
// 退款订单填写支付订单orderNumber |
|
|
|
rOrder.setOrderNumber(wxOrder.getOrderNumber()); |
|
|
|
rOrder.setProductId(wxOrder.getProductId()); |
|
|
|
rOrder.setType(EnumOrderType.COUPON.getCode()); |
|
|
|
rOrder.setcUserId(wxOrder.getcUserId()); |
|
|
|
rOrder.setPaymentType(EnumPayType.PAY_AUTO_REFUND.getCode()); |
|
|
|
rOrder.setPayment(wxOrder.getPayment()); |
|
|
|
rOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); |
|
|
|
rOrder.setCreateDate(currentDate); |
|
|
|
rOrder.setUpdateDate(currentDate); |
|
|
|
wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); |
|
|
|
wxOrder.setUpdateDate(currentDate); |
|
|
|
try { |
|
|
|
wxOrderMapper.insertSelective(rOrder); |
|
|
|
wxOrderMapper.updateByPrimaryKeySelective(wxOrder); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("退款订单保存出错: " + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "退款订单保存出错"); |
|
|
|
logger.error("订单修改出错: " + e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单修改出错"); |
|
|
|
} |
|
|
|
|
|
|
|
// 查找支付订单 |
|
|
|
@@ -1377,7 +1364,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { |
|
|
|
|
|
|
|
WxRefundOrder record = new WxRefundOrder(); |
|
|
|
record.setPayOrderNo(String.valueOf(payOrder.getId())); |
|
|
|
record.setOrderId(rOrder.getId()); |
|
|
|
record.setOrderId(orderId); |
|
|
|
// 创建退款订单 |
|
|
|
Long refundId = idWorker.nextId(); |
|
|
|
String out_refund_id = String.valueOf(refundId); |
|
|
|
|