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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

 fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderServiceImpl.java

@@ -30,6 +30,7 @@
            order.setUpdateTime(new Date());

         elmeOrderMapper.insertSelective(order);

      } else {

         order.setId(oldOrder.getId());

         // 更新付款金额，计算状态

         ElmeOrder update = new ElmeOrder();

         update.setId(oldOrder.getId());

@@ -39,4 +40,9 @@
         elmeOrderMapper.updateByPrimaryKeySelective(update);

      }

   }



   @Override

   public ElmeOrder selectByPrimaryKey(Long id) {

      return elmeOrderMapper.selectByPrimaryKey(id);

   }

}