From 4ea48ee6d71a4877aa2644ecf3c4758e26a91149 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 09 九月 2019 14:56:17 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java index 53be87c..182cd0c 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java @@ -5,6 +5,7 @@ import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.entity.jd.JDOrder; +import com.yeshi.fanli.entity.order.CommonOrder; import com.yeshi.fanli.entity.pdd.PDDOrder; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder; @@ -97,15 +98,24 @@ /** * 澶勭悊鎷煎澶氳鍗� + * * @param pddOrder */ public void processPDDOrder(PDDOrder pddOrder); - - + /** * 鏍规嵁娣樺疂璁㈠崟鐨勬帓搴忓�间慨澶嶅父瑙勮鍗曠殑鎺掑簭鍊� + * * @param orderId */ public void repairCommonOrderByByTaoBaoOrder(String orderId); + /** + * 鏄惁鏄垎浜禋璁㈠崟 + * + * @param commonOrder + * @return + */ + public boolean isShareOrder(CommonOrder commonOrder); + } -- Gitblit v1.8.0