上朵lips刷头也能使用20000的优惠券

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

@@ -321,7 +321,7 @@ public class OrderHandler {
 							flag = false;
 						}
 					}
-					if(toothKidbrushHeadNum < 1 && toothRPbrushHeadNum < 1){
+					if(toothKidbrushHeadNum < 1 && toothRPbrushHeadNum < 1 && toothLipsbrushHeadNum < 1){
 						flag = false;
 					}
 					break;
@@ -695,7 +695,11 @@ public class OrderHandler {
 							return msg;
 						}
 					}
-					total = total - brushelCouponTotal;
+					if(brushelCouponTotal > 0){
+						total = total - brushelCouponTotal;
+					}else if(brushelLipsCouponTotal > 0){
+						total = total - brushelLipsCouponTotal;
+					}
 					break;
 				case 20004:	//lips刷头抵扣卷
 					if(member.getUserIdentity() != 1){
@@ -804,7 +808,6 @@ public class OrderHandler {
 		boolean flag = false;
 		try {
 			flag = cartService.addOrderAndSaveOrderItem(order, list, cartIds, temp.getIsCustomize());
-			//System.out.println("====插入订单列表信息===="+flag);
 			//修改优惠券状态为临时状态
 			if(hasCoupon){
 				couponItem.setCouponUseStatus(7);