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

admin

2020-06-11 d3a5dfe218fdee554decdd58a3c995e03bc1dec1

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

@@ -2109,6 +2109,7 @@
               Integer goodsType = commonGoodsVO.getGoodsType();
               if (goodsType != null & goodsType == Constant.SOURCE_TYPE_ELME) {
                  order.setOrderType(Constant.SOURCE_TYPE_ELME); // 饿了么订单
                  commonGoodsVO.setGoodsId("0");
               }
               
               if (goodsType == Constant.SOURCE_TYPE_SUNING) {