From 31a142ac391b474faa04d82971105cc608a0f973 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 17 五月 2020 19:29:44 +0800
Subject: [PATCH] 新版饿了么相关接口添加
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 433fb55..f4e4a9c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -220,7 +220,7 @@
List<TaoBaoOrder> list = orders.get(orderId);
String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),
list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());
- if ("楗夸簡涔�".equalsIgnoreCase(list.get(0).getOrderType())) {
+ if ("楗夸簡涔�".equalsIgnoreCase(list.get(0).getOrderType())&&!pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT)) {
// 楗夸簡涔堣鍗曞紑濮嬪綊鍏ュ埌娣樺疂璁㈠崟
if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(),
"yyyy-MM-dd HH:mm:ss") >= Constant.NEW_ORDER_FANLI_RULE_TIME) {
@@ -1301,7 +1301,7 @@
// 鏌ヨ涓荤孩鍖�
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null) {
- if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_BUKELINGQU) {
+ if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_BUKELINGQU || hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_SHIXIAO) {
// 璁㈠崟澶辨晥,璧犻�侀噾甯�
try {
invalidHongBaoV2AndGiveGodenCorn(hongBaoOrder.getHongBaoV2().getId(), hongBaoOrder.getHongBaoV2().getUserInfo().getId(), commonOrder.getOrderNo(), commonOrder.getSourceType(), "璁㈠崟鎴愬姛锛屽晢瀹舵湭鎵撴");
--
Gitblit v1.8.0