|
|
|
@@ -1997,7 +1997,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
Integer iSceneType, |
|
|
|
Long posOrderId, Long memId, Integer orderAmount, Date orderTime, String orderCreateSn) { |
|
|
|
// add to wx_order |
|
|
|
WxOrder refundOrder = createRefundByPos(buUser, memId, posOrderId, orderAmount, orderTime, orderCreateSn); |
|
|
|
WxOrder wxOrder = createRefundByPos(buUser, memId, posOrderId, orderAmount, orderTime, orderCreateSn); |
|
|
|
String refundDetail = params.get(WxPayConstant.NEU_REFUND_DETAIL); |
|
|
|
JSONObject refundDetailObj = JSON.parseObject(refundDetail); |
|
|
|
JSONArray refundDetailList = refundDetailObj.getJSONArray(WxPayConstant.NEU_REFUND_DETAIL_LIST); |
|
|
|
@@ -2033,7 +2033,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), e.getMessage()); |
|
|
|
} |
|
|
|
refundOrderFromPos(buUser, refundOrder, memId, |
|
|
|
refundOrderFromPos(buUser, wxOrder, memId, |
|
|
|
posPayOrderId, posRefundOrderId, posRefundOrderTime, |
|
|
|
neuRefundPayOrderStatus, neuRefundAmount,neuRefundType, |
|
|
|
neuRefundThirdNo); |
|
|
|
@@ -2341,21 +2341,21 @@ public class PosServiceImpl implements PosService { |
|
|
|
/** |
|
|
|
* 退款订单POS |
|
|
|
* @param buUser |
|
|
|
* @param refundOrder |
|
|
|
* @param wxOrder |
|
|
|
* @param memId |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
public WxRefundOrder refundOrderFromPos( |
|
|
|
WxMerchantBUser buUser, WxOrder refundOrder, Long memId, |
|
|
|
WxMerchantBUser buUser, WxOrder wxOrder, Long memId, |
|
|
|
Long posPayOrderId, Long posRefundOrderId, Date posRefundOrderTime, |
|
|
|
Integer posRefundOrderStatus, Integer posRefundAmount, Integer posRefundType, |
|
|
|
String neuRefundThirdNo) { |
|
|
|
// 1. pay order |
|
|
|
// 查找支付订单 |
|
|
|
WxPayOrder payOrderQ = new WxPayOrder(); |
|
|
|
payOrderQ.updateTenantInfo(refundOrder); |
|
|
|
payOrderQ.setCUserId(refundOrder.getCUserId()); |
|
|
|
payOrderQ.setOrderId(refundOrder.getComposeOrderId()); |
|
|
|
payOrderQ.updateTenantInfo(wxOrder); |
|
|
|
payOrderQ.setCUserId(wxOrder.getCUserId()); |
|
|
|
payOrderQ.setOrderId(wxOrder.getComposeOrderId()); |
|
|
|
payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
payOrderQ.setPosPayOrderId(posPayOrderId); |
|
|
|
|
|
|
|
@@ -2371,39 +2371,39 @@ public class PosServiceImpl implements PosService { |
|
|
|
// 2. insert into refund order |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long refundId = idWorker.nextId(); |
|
|
|
WxRefundOrder refundPayOrder = new WxRefundOrder(); |
|
|
|
WxRefundOrder refundOrder = new WxRefundOrder(); |
|
|
|
|
|
|
|
Date curDate = new Date(); |
|
|
|
refundPayOrder.setId(refundId); |
|
|
|
refundPayOrder.setRefundId(String.valueOf(refundId)); |
|
|
|
refundPayOrder.setTenantId(buUser.getTenantId()); |
|
|
|
refundPayOrder.updateTenantInfo(buUser); |
|
|
|
refundPayOrder.setCUserId(memId); |
|
|
|
refundPayOrder.setOrderId(refundOrder.getComposeOrderId()); |
|
|
|
refundPayOrder.setCreateTime(curDate); |
|
|
|
refundPayOrder.setUpdateTime(curDate); |
|
|
|
refundPayOrder.setRefundTimeStart(curDate); |
|
|
|
refundPayOrder.setRefundTimeEnd(curDate); |
|
|
|
refundPayOrder.setTotalFee(posRefundAmount); |
|
|
|
refundPayOrder.setRefundFee(posRefundAmount); |
|
|
|
refundPayOrder.setRefundFrom(EnumPayFrom.POS.getCode()); |
|
|
|
refundPayOrder.setRefundOrderStatus(EnumRefundStatus.REFUND_SUCCESS.getCode()); |
|
|
|
refundPayOrder.setPosPayOrderId(posPayOrderId); |
|
|
|
refundPayOrder.setPosRefundOrderId(posRefundOrderId); |
|
|
|
refundPayOrder.setPosRefundOrderTime(posRefundOrderTime.getTime()); |
|
|
|
refundPayOrder.setPosRefundOrderStatus(posRefundOrderStatus); |
|
|
|
refundPayOrder.setPosRefundType(posRefundType); |
|
|
|
refundPayOrder.setPosRefundDes("POS退款"); |
|
|
|
refundPayOrder.setPosRefundOrderNo(neuRefundThirdNo); |
|
|
|
refundPayOrder.setPayOrderNo(String.valueOf(payOrderQ.getId())); |
|
|
|
|
|
|
|
int sqlRow = refundOrderMapper.insert(refundPayOrder); |
|
|
|
refundOrder.setId(refundId); |
|
|
|
refundOrder.setRefundId(String.valueOf(refundId)); |
|
|
|
refundOrder.setTenantId(buUser.getTenantId()); |
|
|
|
refundOrder.updateTenantInfo(buUser); |
|
|
|
refundOrder.setCUserId(memId); |
|
|
|
refundOrder.setOrderId(wxOrder.getId()); |
|
|
|
refundOrder.setCreateTime(curDate); |
|
|
|
refundOrder.setUpdateTime(curDate); |
|
|
|
refundOrder.setRefundTimeStart(curDate); |
|
|
|
refundOrder.setRefundTimeEnd(curDate); |
|
|
|
refundOrder.setTotalFee(posRefundAmount); |
|
|
|
refundOrder.setRefundFee(posRefundAmount); |
|
|
|
refundOrder.setRefundFrom(EnumPayFrom.POS.getCode()); |
|
|
|
refundOrder.setRefundOrderStatus(EnumRefundStatus.REFUND_SUCCESS.getCode()); |
|
|
|
refundOrder.setPosPayOrderId(posPayOrderId); |
|
|
|
refundOrder.setPosRefundOrderId(posRefundOrderId); |
|
|
|
refundOrder.setPosRefundOrderTime(posRefundOrderTime.getTime()); |
|
|
|
refundOrder.setPosRefundOrderStatus(posRefundOrderStatus); |
|
|
|
refundOrder.setPosRefundType(posRefundType); |
|
|
|
refundOrder.setPosRefundDes("POS退款"); |
|
|
|
refundOrder.setPosRefundOrderNo(neuRefundThirdNo); |
|
|
|
refundOrder.setPayOrderNo(String.valueOf(payOrderQ.getId())); |
|
|
|
|
|
|
|
int sqlRow = refundOrderMapper.insert(refundOrder); |
|
|
|
if (sqlRow != 1) { |
|
|
|
logger.error("refund order insert error: " + refundPayOrder.toString()); |
|
|
|
logger.error("refund order insert error: " + refundOrder.toString()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL); |
|
|
|
} |
|
|
|
|
|
|
|
return refundPayOrder; |
|
|
|
return refundOrder; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|