优惠券修改

watero-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/TempOrderDto.java

@@ -38,7 +38,7 @@ public class TempOrderDto implements java.io.Serializable{
 	
 	private int balancePayAmount ; //账户余额支付额度
 
-	private int exchangeColorId ; //需要兑换的颜色id
+	private String exchangeColorId ; //需要兑换的颜色id
 
 	public String getOrderAddressInfo() {
 		return orderAddressInfo;
@@ -112,11 +112,11 @@ public class TempOrderDto implements java.io.Serializable{
 		this.balancePayAmount = balancePayAmount;
 	}
 
-	public int getExchangeColorId() {
+	public String getExchangeColorId() {
 		return exchangeColorId;
 	}
 
-	public void setExchangeColorId(int exchangeColorId) {
+	public void setExchangeColorId(String exchangeColorId) {
 		this.exchangeColorId = exchangeColorId;
 	}
 

watero-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -238,16 +238,10 @@ public class OrderHandler {
 							}
 						}
 					}
-					if(fl){
-						cid.setIsCanUsed(1);
-//						couponItemDtoList.add(cid);
-					}else{
+					if(!fl){
 						cid.setIsCanUsed(2);
 					}
 				}
-			}else{
-				cid.setIsCanUsed(1);
-//				couponItemDtoList.add(cid);
 			}
 			couponItemDtoList.add(cid);
 		}
@@ -342,8 +336,8 @@ public class OrderHandler {
 			return msg;
 		}
 
-		if(Integer.valueOf(temp.getExchangeColorId()) != null && Integer.valueOf(temp.getExchangeColorId())!=0){
-			ProductColor productColor = productColorService.selectProductColorById(temp.getExchangeColorId());
+		if(temp.getExchangeColorId() != null && !"".equals(temp.getExchangeColorId())){
+			ProductColor productColor = productColorService.selectProductColorById(Integer.valueOf(temp.getExchangeColorId()));
 			CartDto cartDto = new CartDto();
 			cartDto.setCartProductId(productColor.getColorProductId());
 			cartDto.setCartColorId(productColor.getColorId());