bugfix

src/main/java/com/caimei/modules/order/service/CmPayShopService.java

@@ -251,6 +251,9 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 so.setDiscountTotalFee(newOrder.getDiscountFee());
                 //机构运费
                 so.setFreight(newOrder.getFreight());
+                if("0".equals(newOrder.getFreePostFlag())||"-1".equals(newOrder.getFreePostFlag())||"-2".equals(newOrder.getFreePostFlag())){
+                    so.setFreight(Double.valueOf(newOrder.getFreePostFlag()));
+                }
                 //机构运费是否已退
                 Integer returnedFreightNum = newOrderProductDao.countReturnedFreightProduct(so.getOrderID());
                 Boolean returnedFreightFlag = returnedFreightNum == null ? false : returnedFreightNum > 0 ? true : false;
@@ -334,6 +337,9 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
                 so.setDiscountTotalFee(newOrder.getDiscountFee());
                 //机构运费
                 so.setFreight(newOrder.getFreight());
+                if("0".equals(newOrder.getFreePostFlag())||"-1".equals(newOrder.getFreePostFlag())||"-2".equals(newOrder.getFreePostFlag())){
+                    so.setFreight(Double.valueOf(newOrder.getFreePostFlag()));
+                }
                 //机构运费是否已退
                 Integer returnedFreightNum = newOrderProductDao.countReturnedFreightProduct(so.getOrderID());
                 Boolean returnedFreightFlag = returnedFreightNum == null ? false : returnedFreightNum > 0 ? true : false;

src/main/java/com/caimei/modules/order/service/NewShopOrderService.java

@@ -11,6 +11,7 @@ import com.caimei.modules.product.dao.CmPromotionDao;
 import com.caimei.modules.product.dao.ProductDao;
 import com.caimei.modules.product.entity.CmPromotion;
 import com.caimei.utils.MathUtil;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.service.CrudService;
 import com.thinkgem.jeesite.common.utils.StringUtils;
@@ -412,6 +413,9 @@ public class NewShopOrderService extends CrudService<NewShopOrderDao, NewShopOrd
             shopOrder.setDiscountTotalFee(newOrder.getDiscountFee());
             //机构运费
             shopOrder.setFreight(newOrder.getFreight());
+            if("0".equals(newOrder.getFreePostFlag())||"-1".equals(newOrder.getFreePostFlag())||"-2".equals(newOrder.getFreePostFlag())){
+                shopOrder.setFreight(Double.valueOf(newOrder.getFreePostFlag()));
+            }
             //机构运费是否已退
             Integer returnedFreightNum = newOrderProductDao.countReturnedFreightProduct(shopOrder.getOrderID());
             Boolean returnedFreightFlag = returnedFreightNum == null ? false : returnedFreightNum > 0 ? true : false;