|
|
|
@@ -2007,11 +2007,10 @@ public class PosServiceImpl implements PosService { |
|
|
|
WxMerchantBUser merchantBUser, |
|
|
|
WxOrder order, Long memId, |
|
|
|
Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime) { |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long payOrderId = idWorker.nextId(); |
|
|
|
WxPayOrder payOrder = new WxPayOrder() {{ |
|
|
|
Date curDate = new Date(); |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long id = idWorker.nextId(); |
|
|
|
setId(id); |
|
|
|
setTenantId(merchantBUser.getTenantId()); |
|
|
|
setCUserId(memId); |
|
|
|
setOrderId(order.getId()); |
|
|
|
@@ -2053,11 +2052,11 @@ public class PosServiceImpl implements PosService { |
|
|
|
Long memId, Integer sceneType, |
|
|
|
Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String posPayOrderNo) { |
|
|
|
// 1. insert into PayOrder |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long payOrderId = idWorker.nextId(); |
|
|
|
WxPayOrder payOrder = new WxPayOrder() {{ |
|
|
|
Date curDate = new Date(); |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long id = idWorker.nextId(); |
|
|
|
setId(id); |
|
|
|
setId(payOrderId); |
|
|
|
setTenantId(merchantBUser.getTenantId()); |
|
|
|
setCUserId(memId); |
|
|
|
setBUserId(merchantBUser.getId()); |
|
|
|
@@ -2066,7 +2065,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
setUpdateTime(curDate); |
|
|
|
setPayTimeStart(curDate); |
|
|
|
setPayTimeEnd(curDate); |
|
|
|
setPayOrderNo(String.valueOf(id)); |
|
|
|
setPayOrderNo(String.valueOf(payOrderId)); |
|
|
|
setPayAmount(neuPaymentAmount); |
|
|
|
setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); |
|
|
|
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
@@ -2138,11 +2137,11 @@ public class PosServiceImpl implements PosService { |
|
|
|
WxOrder order, Long memId, |
|
|
|
Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String posPayOrderNo) { |
|
|
|
// 1. insert into PayOrder |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long payOrderId = idWorker.nextId(); |
|
|
|
WxPayOrder payOrder = new WxPayOrder() {{ |
|
|
|
Date curDate = new Date(); |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long id = idWorker.nextId(); |
|
|
|
setId(id); |
|
|
|
setId(payOrderId); |
|
|
|
setTenantId(buUser.getTenantId()); |
|
|
|
setCUserId(memId); |
|
|
|
setBUserId(buUser.getId()); |
|
|
|
@@ -2151,7 +2150,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
setUpdateTime(curDate); |
|
|
|
setPayTimeStart(curDate); |
|
|
|
setPayTimeEnd(curDate); |
|
|
|
setPayOrderNo(String.valueOf(id)); |
|
|
|
setPayOrderNo(String.valueOf(payOrderId)); |
|
|
|
setPayAmount(neuPaymentAmount); |
|
|
|
setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); |
|
|
|
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
@@ -2201,11 +2200,11 @@ public class PosServiceImpl implements PosService { |
|
|
|
WxMerchant merchant, WxMerchantBUser buUser, WxOrder order, Long memId, |
|
|
|
Integer neuPayOrderType, Long neuPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String neuPayThirdNo) { |
|
|
|
// 1. insert into PayOrder |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long payOrderId = idWorker.nextId(); |
|
|
|
WxPayOrder payOrder = new WxPayOrder() {{ |
|
|
|
Date curDate = new Date(); |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long id = idWorker.nextId(); |
|
|
|
setId(id); |
|
|
|
setId(payOrderId); |
|
|
|
setTenantId(buUser.getTenantId()); |
|
|
|
setCUserId(memId); |
|
|
|
setOrderId(order.getId()); |
|
|
|
@@ -2213,7 +2212,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
setUpdateTime(curDate); |
|
|
|
setPayTimeStart(curDate); |
|
|
|
setPayTimeEnd(curDate); |
|
|
|
setPayOrderNo(String.valueOf(id)); |
|
|
|
setPayOrderNo(String.valueOf(payOrderId)); |
|
|
|
setPayAmount(neuPaymentAmount); |
|
|
|
setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); |
|
|
|
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
@@ -2286,12 +2285,12 @@ public class PosServiceImpl implements PosService { |
|
|
|
throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND); |
|
|
|
} |
|
|
|
// 2. insert into refund order |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long refundId = idWorker.nextId(); |
|
|
|
WxRefundOrder refundPayOrder = new WxRefundOrder() {{ |
|
|
|
Date curDate = new Date(); |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long id = idWorker.nextId(); |
|
|
|
setId(id); |
|
|
|
setRefundId(String.valueOf(id)); |
|
|
|
setId(refundId); |
|
|
|
setRefundId(String.valueOf(refundId)); |
|
|
|
setTenantId(buUser.getTenantId()); |
|
|
|
setCUserId(memId); |
|
|
|
setOrderId(refundOrder.getId()); |
|
|
|
@@ -2353,12 +2352,11 @@ public class PosServiceImpl implements PosService { |
|
|
|
logger.error(ErrorCode.POS_ORDER_HAD_SYNCED.getMessage()); |
|
|
|
throw new MallinkException(ErrorCode.POS_ORDER_HAD_SYNCED); |
|
|
|
} |
|
|
|
|
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long orderId = idWorker.nextId(); |
|
|
|
WxOrder order = new WxOrder() {{ |
|
|
|
Date curr = new Date(); |
|
|
|
String bodyStr = "POS支付, 金额: " + posAmount; |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long orderId = idWorker.nextId(); |
|
|
|
setId(orderId); |
|
|
|
setTenantId(merchantBUser.getTenantId()); |
|
|
|
setOrderNumber(orderId); |
|
|
|
@@ -2433,11 +2431,11 @@ public class PosServiceImpl implements PosService { |
|
|
|
} |
|
|
|
|
|
|
|
// 3. 创建退款订单 |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long orderId = idWorker.nextId(); |
|
|
|
WxOrder order = new WxOrder() {{ |
|
|
|
Date curr = new Date(); |
|
|
|
String bodyStr = "POS退款, 金额: " + orderAmount; |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
Long orderId = idWorker.nextId(); |
|
|
|
setId(orderId); |
|
|
|
setTenantId(buUser.getTenantId()); |
|
|
|
setType(EnumOrderType.POSPAY.getCode()); |
|
|
|
|