From 146dbd5ed24c1fe63766aa45e0ce602caa39748e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 八月 2022 17:53:10 +0800
Subject: [PATCH] 商品ID字符串化

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 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 4744788..9d206de 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
@@ -209,8 +209,8 @@
 
     //鑾峰彇鎺ㄥ箍浣嶇被鍨�
     private SystemPIDInfo.PidType getPidType(int sourceType, String pid) {
-        List<SystemPIDInfo> pidInfoList = pidManager.listPidInfoByPidCache(pid, Constant.SOURCE_TYPE_TAOBAO);
-        if (pidInfoList == null || pidInfoList.size() == 0) {
+        List<SystemPIDInfo> pidInfoList = pidManager.listPidInfoByPidCache(pid, sourceType);
+        if ((pidInfoList == null || pidInfoList.size() == 0) && sourceType == Constant.SOURCE_TYPE_TAOBAO) {
             pidInfoList = pidManager.listPidInfoByPidCache(pid, Constant.SOURCE_TYPE_ELME);
         }
 
@@ -1774,14 +1774,22 @@
             else
                 result = hongBaoV2AddManager.addHongBao(coList, hongBaoType);
         } catch (HongBaoException e) {
-            try {
-                LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + orderId);
-            } catch (Exception e1) {
-                e1.printStackTrace();
+            if (e.getCode() != HongBaoException.CODE_ORDER_WEIQUAN) {
+                try {
+                    LogHelper.errorDetailInfo(e, "addJDOrder鎴朼ddHongBao鍑洪敊", "璁㈠崟鍙�:" + orderId);
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
             }
+
         } catch (UserAccountException e) {
 
         }
+        if (result == null) {
+            return;
+        }
+
+
         if (!Constant.IS_TEST)
             if (result.getResultCode() == HongBaoAddResult.CODE_ADD) {// 鍙彂閫佹柊澧炴秷鎭�
                 OrderMQMsg mqMsg = new OrderMQMsg(orderId, sourceType, uid, OrderMQMsg.HANDLE_TYPE_ADD,

--
Gitblit v1.8.0