|
@@ -339,10 +339,10 @@ public class OrderServiceImpl implements OrderService {
|
|
double productFee = retailPrice * productNum;//单个商品的金额
|
|
double productFee = retailPrice * productNum;//单个商品的金额
|
|
//统计商品总金额
|
|
//统计商品总金额
|
|
productTotalFee += productFee;
|
|
productTotalFee += productFee;
|
|
- if (cmOrganizeProducts.getClassifyID() == 1 && !isIncludedInstruments) {//判断是否存在仪器
|
|
|
|
|
|
+ if ( StringUtils.equals("1",cmOrganizeProducts.getPostageToPay()) && !isIncludedInstruments) {//判断是否存在仪器
|
|
isIncludedInstruments = true;
|
|
isIncludedInstruments = true;
|
|
}
|
|
}
|
|
- if (cmOrganizeProducts.getClassifyID() != 1 && !isIncludedProduct) {//判断是否存在商品
|
|
|
|
|
|
+ if (!StringUtils.equals("1",cmOrganizeProducts.getPostageToPay()) && !isIncludedProduct) {//判断是否存在商品
|
|
isIncludedProduct = true;
|
|
isIncludedProduct = true;
|
|
}
|
|
}
|
|
|
|
|