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

admin

2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10

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

@@ -1854,6 +1854,13 @@
      return commonOrderMapper.getByOrderNo(uid, orderNO);
   }

	
   @Override
   public List<CommonOrder> getByOrderNoAndSourceType(Long uid, String orderNO, int sourceType) {
      return commonOrderMapper.getByOrderNoAndSourceType(uid, orderNO, sourceType);
   }

	
   @Override
   public CommonOrder selectLatestValidByUid(Long uid) {
      List<Integer> stateList = new ArrayList<>();
@@ -2109,6 +2116,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) {
@@ -2373,4 +2381,9 @@
      return commonOrderMapper.listByOrderNo(orderNo);
   }

   @Override
   public CommonOrder getFirstOrder(Long uid) {
      return commonOrderMapper.getFirstOrder(uid);
   }

}