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

yujian

2020-06-11 a69ec998d9fe8fa8ea6c40175bebc4e53a227d5b

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

@@ -1191,9 +1191,11 @@


   @Override

   public void processVipShopOrder(VipShopOrder order) {

		
      if (order == null || order.getDetailList() == null || order.getDetailList().size() == 0)

         return;





      // 根据ext1与subUnionId跟单

      String channelTag = order.getChannelTag();