modified:   src/main/java/com/flyhz/framework/lang/RedisRepository.java
	modified:   src/main/java/com/flyhz/framework/lang/SolrData.java
	modified:   src/main/java/com/flyhz/shop/build/solr/SolrDataImpl.java
	modified:   src/main/java/com/flyhz/shop/dto/OrderDto.java
	modified:   src/main/java/com/flyhz/shop/dto/OrderSimpleDto.java
	modified:   src/main/java/com/flyhz/shop/persistence/RedisRepositoryImpl.java
	modified:   src/main/java/com/flyhz/shop/persistence/TaobaoDataImpl.java
	modified:   src/main/java/com/flyhz/shop/persistence/dao/OrderDao.java
	modified:   src/main/java/com/flyhz/shop/persistence/entity/OrderModel.java
	modified:   src/main/java/com/flyhz/shop/service/common/OrderStatusService.java
	modified:   src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/service/impl/OrderStatusServiceImpl.java
	modified:   src/main/resources/mybatis/sqlmap/DiscountMapper.xml
	modified:   src/main/resources/mybatis/sqlmap/OrderMapper.xml
	modified:   ../smile_android/src/com/holding/smile/activity/ImageViewActivity.java