Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-02 4acbc0d027b23ee975604d9355d2d071c3707e6e

Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -317,6 +317,12 @@
            return;

        }



        // 如果是拼多多/京东维权则返回，不需要返利

        if ((hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_PDD

                || hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_JD)

                && hongBaoOrder.getCommonOrder().getState() == CommonOrder.STATE_WQ)

            return;



        if (hongBaoOrder.getCommonOrder() != null

                && hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_TAOBAO) {

            // 维权中的不返利