|
@@ -335,14 +335,14 @@ public class OrderServiceImpl implements OrderService {
|
|
|
if (null == productNum || productNum == 0) return wxJsonModel.error("-1", "商品购买数量异常");
|
|
|
Product cmProduct = organizeProductsMapper.selectCmProductById(cmOrganizeProducts.getProductID());
|
|
|
Double retailPrice = cmOrganizeProducts.getRetailPrice();//售价
|
|
|
- Integer classifyID = cmOrganizeProducts.getClassifyID();
|
|
|
+// Integer classifyID = cmOrganizeProducts.getClassifyID();
|
|
|
double productFee = retailPrice * productNum;//单个商品的金额
|
|
|
//统计商品总金额
|
|
|
productTotalFee += productFee;
|
|
|
- if (classifyID == 3 && !isIncludedInstruments) {//判断是否存在仪器
|
|
|
+ if (cmOrganizeProducts.getClassifyID() == 1 && !isIncludedInstruments) {//判断是否存在仪器
|
|
|
isIncludedInstruments = true;
|
|
|
}
|
|
|
- if (classifyID != 3 && !isIncludedProduct) {//判断是否存在商品
|
|
|
+ if (cmOrganizeProducts.getClassifyID() != 1 && !isIncludedProduct) {//判断是否存在商品
|
|
|
isIncludedProduct = true;
|
|
|
}
|
|
|
|