Merge remote-tracking branch 'origin/div' into div

admin

2019-11-25 e65037e672ecab852e2a6c5b242cdadfd1a58b33

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderProcessService.java

@@ -118,4 +118,20 @@
    */

   public boolean isShareOrder(CommonOrder commonOrder);



   /**

    * 处理淘宝商家未付款的情况

    */

   public void doTaoBaoSellerNotPaid(TaoBaoOrder order);



   /**

    * 获取可以返利的饿了么红包

    * @return

    */

   public List<HongBaoV2> getCanBalanceElmeFanliHongBao();



   /**

    * 饿了么返利

    * @param hongBaoId

    */

   public void elmeFanli(Long hongBaoId);

}