From c0b766b168b907a16ec40f0e899b20861221da46 Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期日, 10 九月 2017 22:41:23 +0800
Subject: [PATCH] 订单撤单二次改造处理
---
OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java b/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java
index 937da1f..729261f 100644
--- a/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java
+++ b/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java
@@ -105,6 +105,7 @@
if(StringUtils.isBlank(olId) || olId.startsWith("-") ){
olId = this.queryPrimaryKey(iPrimaryKeyService,"OL_ID");
orderList.setOlId(olId);
+ orderListTmp.put("olId",olId);
}
//杩欓噷淇濆瓨璐墿杞�
@@ -215,29 +216,20 @@
datasTmp.put(actionTypeCd,dataJsonTmp);
- /*
- try {
- //鍙戝竷浜嬩欢
- AppEventPublishing.multicastEvent(actionTypeCd,orderInfo.toJSONString(), data.toJSONString(),orderListTmp.getString("asyn"));
- }catch (Exception e){
- //杩欓噷琛ュ伩浜嬬墿
- throw e;
- }*/
-
}
//鍒涘缓涓婁笅鏂囧璞�
AppContext context = createApplicationContext();
prepareContext(context, datasTmp);
- try {
+ /* try {*/
//鍙戝竷浜嬩欢
AppEventPublishing.multicastEvent(context,datasTmp,orderListTmp.getString("asyn"));
- }catch (Exception e){
+ /* }catch (Exception e){
//杩欓噷琛ュ伩浜嬬墿,杩欓噷鍙戝竷骞挎挱
compensateTransactional(datasTmp);
throw e;
- }
+ }*/
return ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_SUCCESS,"鎴愬姛",JSONObject.parseObject(JSONObject.toJSONString(orderList)));
}
@@ -419,6 +411,32 @@
}
/**
+ * 鎾ゅ崟澶勭悊 add by wuxw 2017-09-10 22:35
+ * 淇敼浠ュ墠閫昏緫锛屾牴鎹畂lId 鍘荤洰鏍囩郴缁熸煡璇㈤渶瑕佹煡璇㈡挙鍗曡鍗曠粍瑁呮姤鏂�
+ * @param orderInfo
+ * @throws Exception
+ */
+ public void soDeleteOrder(JSONObject orderInfo) throws Exception{
+
+ //1.0 璐墿杞︿俊鎭牎楠屽鐞�,璧拌鍗曞彈鐞嗗繀椤昏鏈夎喘鐗╄溅淇℃伅鍜岃鍗曢」淇℃伅
+ if(!orderInfo.containsKey("orderListInfo") || !orderInfo.containsKey("busiOrder")){
+ return;
+ }
+
+ JSONObject orderListTmp = orderInfo.getJSONObject("orderListInfo");
+
+ OrderList orderList = JSONObject.parseObject(orderListTmp.toJSONString(),OrderList.class);
+
+ String olId = orderList.getOlId();
+ //鐢熸垚olId
+ if(StringUtils.isBlank(olId) || olId.startsWith("-") ){
+ return ;
+ }
+
+
+ }
+
+ /**
* 鏍规嵁 璁㈠崟鍔ㄤ綔 浣滃簾
* @param oldOlId 浣滃簾鐨勮喘鐗╄溅
* @param actionTypeCd busi_order action_type_cd 绫诲瀷鏉ヤ綔搴熻鍗�
--
Gitblit v1.8.0