modified:   smile/src/main/java/com/flyhz/framework/util/StringUtil.java
	modified:   smile/src/main/java/com/flyhz/shop/dto/CartItemDto.java
	new file:   smile/src/main/java/com/flyhz/shop/dto/DiscountDto.java
	modified:   smile/src/main/java/com/flyhz/shop/dto/OrderItem.java
	new file:   smile/src/main/java/com/flyhz/shop/persistence/dao/DiscountDao.java
	modified:   smile/src/main/java/com/flyhz/shop/persistence/entity/CartitemModel.java
	new file:   smile/src/main/java/com/flyhz/shop/persistence/entity/DiscountModel.java
	new file:   smile/src/main/java/com/flyhz/shop/service/DiscountService.java
	modified:   smile/src/main/java/com/flyhz/shop/service/ShoppingCartService.java
	new file:   smile/src/main/java/com/flyhz/shop/service/impl/DiscountServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
	modified:   smile/src/main/java/com/flyhz/shop/web/controller/ShoppingCartController.java
	modified:   smile/src/main/resources/mybatis/sqlMapConfig.xml
	modified:   smile/src/main/resources/mybatis/sqlmap/CartItemMapper.xml
	new file:   smile/src/main/resources/mybatis/sqlmap/DiscountMapper.xml
	modified:   smile/src/main/resources/spring/applicationContext-dao.xml
	modified:   smile_android/src/com/holding/smile/activity/GoodsDetailActivity.java
	new file:   smile_android/src/com/holding/smile/dto/DiscountDto.java
	modified:   smile_android/src/com/holding/smile/dto/OrderItem.java
	modified:   smile_android/src/com/holding/smile/entity/CartItem.java
	modified:   smile_android/src/com/holding/smile/entity/JGoods.java
	modified:   smile_android/src/com/holding/smile/service/SubmitService.java