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