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

admin

2020-06-23 eb58d2d4fcc201dbfb31e96c58e680b7da0a846e

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

@@ -1191,8 +1191,10 @@


   @Override

   public void processVipShopOrder(VipShopOrder order) {

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

         return;

		


      // 根据ext1与subUnionId跟单

      String channelTag = order.getChannelTag();