Browse Source

上朵修复渠道购买价格出现异常的情况

wangxiaoming 5 years ago
parent
commit
fe9ad75016

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

@@ -218,11 +218,7 @@ public class OrderHandler {
 				msg.setMessage(ResultInfo.cartNoNumError);
 				msg.setMessage(ResultInfo.cartNoNumError);
 				return msg;
 				return msg;
 			}
 			}
-			if (cd.getProductStatus() != null && cd.getProductStatus().intValue() == 1) {
-				total += cd.getCartNum() * cd.getProductPrice();
-				sum++;
-				tempCarts.add(cd);
-			}else{
+			if (cd.getProductStatus() == null || cd.getProductStatus().intValue() != 1) {
 				msg.setMessage(ResultInfo.cartNoStatusError);
 				msg.setMessage(ResultInfo.cartNoStatusError);
 				return msg;
 				return msg;
 			}
 			}
@@ -240,6 +236,10 @@ public class OrderHandler {
 				}
 				}
 			}
 			}
 
 
+			total += cd.getCartNum() * cd.getProductPrice();
+			sum++;
+			tempCarts.add(cd);
+
 			switch (cd.getColorToothType()){
 			switch (cd.getColorToothType()){
 				//牙刷分类
 				//牙刷分类
 				case 1:	//1:赠品(非牙刷,非刷头)
 				case 1:	//1:赠品(非牙刷,非刷头)