|
|
|
@@ -541,34 +541,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
// 5. get app info |
|
|
|
// WxAppinfo appInfo = wxAppinfoService.getByAppId(user.getAppId()); |
|
|
|
|
|
|
|
// 6. get payOrder info |
|
|
|
if(StringUtils.isBlank(order.getFormId())) { |
|
|
|
// 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); |
|
|
|
} |
|
|
|
formId = payOrder.getPrepayId(); |
|
|
|
} |
|
|
|
|
|
|
|
if(StringUtils.isBlank(formId)) { |
|
|
|
logger.error("formId为空"); |
|
|
|
throw new MallinkException(ErrorCode.TEMPLATE_FORMID_NOT_FOUND); |
|
|
|
} |
|
|
|
|
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); |
|
|
|
String couponDetail = ""; |
|
|
|
if (coupon.getType() == EnumCouponType.COUPON_MANJIAN.getCode()) { |
|
|
|
@@ -598,6 +570,34 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
doVerifyAppUniformMsg(couponOrder, coupon, merchant, user, dateFormat, gotopage); |
|
|
|
} |
|
|
|
|
|
|
|
// 6. get payOrder info |
|
|
|
if(StringUtils.isBlank(order.getFormId())) { |
|
|
|
// 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); |
|
|
|
} |
|
|
|
formId = payOrder.getPrepayId(); |
|
|
|
} |
|
|
|
|
|
|
|
if(StringUtils.isBlank(formId)) { |
|
|
|
logger.error("formId为空"); |
|
|
|
throw new MallinkException(ErrorCode.TEMPLATE_FORMID_NOT_FOUND); |
|
|
|
} |
|
|
|
|
|
|
|
// 9. 微信小程序-模板消息 |
|
|
|
SmartAppMsg smartAppMsg; |
|
|
|
if (bUsed) { |
|
|
|
|