bugfix

src/main/java/com/caimei/modules/order/web/CmPayShopController.java

@@ -202,7 +202,7 @@ public class CmPayShopController extends BaseController {
          * promotionFullReduction   促销满减优惠(不考虑凑单促销)
          */
         String shopOrderID = newShopOrder.getId();
-        Double freight = newShopOrder.getShopPostFee();
+        Double freight = newShopOrder.getSupplierFreight();
         Double thirdPartyFee = newShopOrder.getShopOtherFee() == null ? 0d : newShopOrder.getShopOtherFee();
         String costType = newShopOrder.getCostType();
         Double proportional = newShopOrder.getProportional();
@@ -220,8 +220,7 @@ public class CmPayShopController extends BaseController {
         double totalCostFee = 0D;
         double totalTaxesFee = 0D;
         NewShopOrder shopOrder = newShopOrderService.get(shopOrderID);
-        // 初始运费
-        Double postFee = null == shopOrder.getShopPostFee() ? 0d : shopOrder.getShopPostFee();
+
         String dbcostType = shopOrder.getCostType();
         String cmChangePayShopRecondId = "0";
         if (StringUtils.isEmpty(dbcostType)) {
@@ -232,7 +231,7 @@ public class CmPayShopController extends BaseController {
             cmChangePayShopRecond1.setOrderId(shopOrder.getOrderID());
             cmChangePayShopRecond1.setShopOrderId(shopOrder.getShopOrderID());
             cmChangePayShopRecond1.setShopOrderTotalAmount(shopOrder.getProductAmount());
-            cmChangePayShopRecond1.setShopPostFee(shopOrder.getShopPostFee());
+            cmChangePayShopRecond1.setShopPostFee(shopOrder.getSupplierFreight());
             cmChangePayShopRecond1.setModifyShouldPayDate(new Date());
             cmChangePayShopRecondService.save(cmChangePayShopRecond1);
             cmChangePayShopRecondId = cmChangePayShopRecond1.getId();
@@ -244,7 +243,7 @@ public class CmPayShopController extends BaseController {
         cmChangePayShopRecond.setOrderId(newShopOrder.getOrderID());
         cmChangePayShopRecond.setShopOrderId(newShopOrder.getShopOrderID());
         cmChangePayShopRecond.setShopOrderTotalAmount(newShopOrder.getProductAmount());
-        cmChangePayShopRecond.setShopPostFee(newShopOrder.getShopPostFee());
+        cmChangePayShopRecond.setShopPostFee(newShopOrder.getSupplierFreight());
         cmChangePayShopRecond.setShopOtherFee(newShopOrder.getShopOtherFee());
         cmChangePayShopRecond.setModifyShouldPayDate(new Date());
         cmChangePayShopRecond.setModifyShouldPayUserId(Integer.parseInt(UserUtils.getUser().getId()));
@@ -521,13 +520,13 @@ public class CmPayShopController extends BaseController {
             }
             newOrderService.updatePayStatus(newOrder);
         }
-        shopOrder.setShopPostFee(freight); //运费
+        shopOrder.setSupplierFreight(freight); //运费
         shopOrder.setShopOtherFee(thirdPartyFee); //付第三方
         shopOrder.setCostType(costType);
         shopOrder.setModifyShouldPayNote(modifyShouldPayNote);  //备注
         shopOrder.setModifyShouldPayUserID(UserUtils.getUser().getId());  //修改人的用户id
         shopOrder.setModifyShouldPayDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));  //修改时间
-        double shouldPayShopAmount = shopOrder.getShopProductAmount() + shopOrder.getShopPostFee(); // + shopOrder.getShopTaxFee();
+        double shouldPayShopAmount = shopOrder.getShopProductAmount() + shopOrder.getSupplierFreight(); // + shopOrder.getShopTaxFee();
         if (shopOrder.getPayedShopAmount() != null && shouldPayShopAmount == shopOrder.getPayedShopAmount()) {
             shopOrder.setPayStatus("3");
         }

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -2421,10 +2421,10 @@
         ownCostPrice.attr('class', 'skuList[' + skuIndex + '].ownCostPrice');
         // 固定成本  机构价 - 供应商 - 集团服务费 - 采美服务费
         var owp = price.val() - costPrice.val() - organizeCostPrice.val() - cmCostPrice.val();
-        ownCostPrice.val("自营利润：￥ " + owp);
+        ownCostPrice.text("自营利润：￥ " + owp);
         // 比例
         var owpi = price.val() - price.val() * shopPercent.val() / 100 - price.val() * organizePercent.val() / 100 - price.val() * cmPercent.val() / 100;
-        ownPrice.val("自营利润：￥ " + owpi);
+        ownPrice.text("自营利润：￥ " + owpi);
         skuIndex++;
     }
 
@@ -2573,6 +2573,11 @@
             ownCostPrice.text("自营利润：￥ " + owp);
             // 比例
             var owpi = price.val() - price.val() * shopPercent.val() / 100 - price.val() * organizePercent.val() / 100 - price.val() * cmPercent.val() / 100;
+            if (owp < 0 || owpi < 0) {
+                alertx("自营利润不能小于0");
+                costPrice.val(0);
+                return false;
+            }
             ownPrice.text("自营利润：￥ " + owpi);
         });
         organizeCostPrice.on('change', function () {
@@ -2581,6 +2586,11 @@
             ownCostPrice.text("自营利润：￥ " + owp);
             // 比例
             var owpi = price.val() - price.val() * shopPercent.val() / 100 - price.val() * organizePercent.val() / 100 - price.val() * cmPercent.val() / 100;
+            if (owp < 0 || owpi < 0) {
+                organizeCostPrice.val(0);
+                alertx("自营利润不能小于0");
+                return false;
+            }
             ownPrice.text("自营利润：￥ " + owpi);
         });
         cmCostPrice.on('change', function () {
@@ -2589,6 +2599,11 @@
             ownCostPrice.text("自营利润：￥ " + owp);
             // 比例
             var owpi = price.val() - price.val() * shopPercent.val() / 100 - price.val() * organizePercent.val() / 100 - price.val() * cmPercent.val() / 100;
+            if (owp < 0 || owpi < 0) {
+                cmCostPrice.val(0);
+                alertx("自营利润不能小于0");
+                return false;
+            }
             ownPrice.text("自营利润：￥ " + owpi);
         });
         price.on('change', function () {
@@ -2597,6 +2612,11 @@
             ownCostPrice.text("自营利润：￥ " + owp);
             // 比例
             var owpi = price.val() - price.val() * shopPercent.val() / 100 - price.val() * organizePercent.val() / 100 - price.val() * cmPercent.val() / 100;
+            if (owp < 0 || owpi < 0) {
+                price.val(0);
+                alertx("自营利润不能小于0");
+                return false;
+            }
             ownPrice.text("自营利润：￥ " + owpi);
         });
         shopPercent.on('change', function () {
@@ -2605,6 +2625,11 @@
             ownCostPrice.text("自营利润：￥ " + owp);
             // 比例
             var owpi = price.val() - price.val() * shopPercent.val() / 100 - price.val() * organizePercent.val() / 100 - price.val() * cmPercent.val() / 100;
+            if (owp < 0 || owpi < 0) {
+                shopPercent.val(0);
+                alertx("自营利润不能小于0");
+                return false;
+            }
             ownPrice.text("自营利润：￥ " + owpi);
         });
         organizePercent.on('change', function () {
@@ -2613,6 +2638,11 @@
             ownCostPrice.text("自营利润：￥ " + owp);
             // 比例
             var owpi = price.val() - price.val() * shopPercent.val() / 100 - price.val() * organizePercent.val() / 100 - price.val() * cmPercent.val() / 100;
+            if (owp < 0 || owpi < 0) {
+                organizePercent.val(0);
+                alertx("自营利润不能小于0");
+                return false;
+            }
             ownPrice.text("自营利润：￥ " + owpi);
         });
         cmPercent.on('change', function () {
@@ -2621,6 +2651,11 @@
             ownCostPrice.text("自营利润：￥ " + owp);
             // 比例
             var owpi = price.val() - price.val() * shopPercent.val() / 100 - price.val() * organizePercent.val() / 100 - price.val() * cmPercent.val() / 100;
+            if (owp < 0 || owpi < 0) {
+                cmPercent.val(0);
+                alertx("自营利润不能小于0");
+                return false;
+            }
             ownPrice.text("自营利润：￥ " + owpi);
         });
     }