|
|
|
@@ -279,6 +279,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
String filename = "券订单"; |
|
|
|
List<WxCouponOrderBVo> list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); |
|
|
|
list.parallelStream().forEach(c -> { |
|
|
|
if (c.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())) { |
|
|
|
c.setUpdateDate(null); |
|
|
|
} |
|
|
|
if (!c.getMerchantId().equals(0L)) { |
|
|
|
List<WxMerchantVo> merchantVoList = c.getMerchantVoList(); |
|
|
|
if (!merchantVoList.isEmpty()) { |
|
|
|
@@ -635,28 +638,30 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
// 6. get payOrder info |
|
|
|
int formType = EnumMsgLimitType.WEAPP_FORMID.getCode(); |
|
|
|
if(StringUtils.isBlank(order.getFormId()) || order.getFormId().equalsIgnoreCase("undefined")) { |
|
|
|
// formId为空,获取prepayId |
|
|
|
WxPayOrder payOrder = null; |
|
|
|
WxPayOrder payOrderQ = new WxPayOrder(); |
|
|
|
payOrderQ.setTenantId(couponOrder.getTenantId()); |
|
|
|
payOrderQ.setOrderId(order.getId()); |
|
|
|
payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
List<WxPayOrder> payList = wxPayOrderMapper.select(payOrderQ); |
|
|
|
if (payList.size() > 0) { |
|
|
|
payOrder = payList.get(0); |
|
|
|
} |
|
|
|
if (payOrder == null) { |
|
|
|
logger.error("找不到payOrder信息"); |
|
|
|
throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND); |
|
|
|
} |
|
|
|
if (payOrder.getPrepayId() == null) { |
|
|
|
logger.error("payOrder信息中,prepay_id为空"); |
|
|
|
throw new MallinkException(ErrorCode.PREPAY_ID_IS_EMPTY); |
|
|
|
} |
|
|
|
dateAfter7Day = DateUtils.getHourTimeAfter(7, payOrder.getCreateTime()); |
|
|
|
if(curDate.before(dateAfter7Day)) { |
|
|
|
formId = payOrder.getPrepayId(); |
|
|
|
formType = EnumMsgLimitType.WEAPP_PREPAYID.getCode(); |
|
|
|
if(order.getPayment() > 0) { |
|
|
|
// formId为空,获取prepayId |
|
|
|
WxPayOrder payOrder = null; |
|
|
|
WxPayOrder payOrderQ = new WxPayOrder(); |
|
|
|
payOrderQ.setTenantId(couponOrder.getTenantId()); |
|
|
|
payOrderQ.setOrderId(order.getId()); |
|
|
|
payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
List<WxPayOrder> payList = wxPayOrderMapper.select(payOrderQ); |
|
|
|
if (payList.size() > 0) { |
|
|
|
payOrder = payList.get(0); |
|
|
|
} |
|
|
|
if (payOrder == null) { |
|
|
|
logger.error("找不到payOrder信息"); |
|
|
|
throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND); |
|
|
|
} |
|
|
|
if (payOrder.getPrepayId() == null) { |
|
|
|
logger.error("payOrder信息中,prepay_id为空"); |
|
|
|
throw new MallinkException(ErrorCode.PREPAY_ID_IS_EMPTY); |
|
|
|
} |
|
|
|
dateAfter7Day = DateUtils.getHourTimeAfter(7, payOrder.getCreateTime()); |
|
|
|
if (curDate.before(dateAfter7Day)) { |
|
|
|
formId = payOrder.getPrepayId(); |
|
|
|
formType = EnumMsgLimitType.WEAPP_PREPAYID.getCode(); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|