|
|
|
@@ -261,54 +261,6 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// final IdWorker idWorker = IdWorker.get(); |
|
|
|
// Long refundOrderId = idWorker.nextId(); |
|
|
|
// |
|
|
|
// Date currentDate = new Date(); |
|
|
|
// |
|
|
|
// WxBatchOrder order =new WxBatchOrder(); |
|
|
|
// order.setId(idWorker.nextId()); |
|
|
|
// order.setCUserId(wxOrder.getCUserId()); |
|
|
|
// order.updateTenantInfo(wxCouponOrder); |
|
|
|
// order.setPayment(wxOrder.getPayment()); |
|
|
|
// order.setPayVendor(wxOrder.getPayVendor()); |
|
|
|
// order.setOrderType(wxOrder.getComposeOrderType()); |
|
|
|
// order.setCreateDate(new Date()); |
|
|
|
// wxBatchOrderMapper.insert(order); |
|
|
|
// // 创建 refund Order |
|
|
|
// WxOrder rOrder = new WxOrder(); |
|
|
|
// rOrder.setId(refundOrderId); |
|
|
|
// rOrder.updateTenantInfo(wxCouponOrder); |
|
|
|
// rOrder.setOrderNumber(wxOrder.getOrderNumber()); // 退款订单填写支付订单orderNumber |
|
|
|
// rOrder.setProductId(wxOrder.getProductId()); |
|
|
|
// rOrder.setType(EnumOrderType.COUPON.getCode()); |
|
|
|
// rOrder.setPayVendor(wxOrder.getPayVendor()); |
|
|
|
// rOrder.setCUserId(wxOrder.getCUserId()); |
|
|
|
// if (payType == EnumPayType.PAY_B_REFUND) { |
|
|
|
// rOrder.setDetail("["+bUser.getId()+"]B端管理员操作退款"); //B端发起退款后存B端用户ID在此 |
|
|
|
// }else if (payType == EnumPayType.PAY_ADMIN_REFUND) { |
|
|
|
// rOrder.setDetail("["+aUserId+"]A端管理员操作退款"); |
|
|
|
// } else if (payType == EnumPayType.PAY_AUTO_REFUND) { |
|
|
|
// rOrder.setDetail("auto端发起退款"); |
|
|
|
// } else { |
|
|
|
// rOrder.setDetail("自己发起退款"); |
|
|
|
// } |
|
|
|
// rOrder.setPaymentType(payType.getCode()); |
|
|
|
// rOrder.setPayment(wxOrder.getPayment()); |
|
|
|
// rOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); |
|
|
|
// rOrder.setCreateDate(currentDate); |
|
|
|
// rOrder.setUpdateDate(currentDate); |
|
|
|
// rOrder.setComposeOrderId(order.getId()); |
|
|
|
// rOrder.setComposeOrderType(wxOrder.getComposeOrderType()); |
|
|
|
// rOrder.setCouponNumber(wxOrder.getCouponNumber()); |
|
|
|
// try { |
|
|
|
// wxOrderMapper.insert(rOrder); |
|
|
|
// } catch (Exception e) { |
|
|
|
// logger.error("退款订单保存出错: " + e.getMessage(),e); |
|
|
|
// throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "退款订单保存出错"); |
|
|
|
// } |
|
|
|
|
|
|
|
for (WxCouponOrder wxCouponOrder:couponOrderList) { |
|
|
|
// 更改 couponOrder 状态 |
|
|
|
if (wxCouponOrder.getCouponType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) { |
|
|
|
|