tj

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -178,9 +178,6 @@ class OrderInfoService extends ServiceBase {
     if (!actionBody.deliveryData || Object.keys(actionBody.deliveryData).length == 0) {
     if (!actionBody.deliveryData || Object.keys(actionBody.deliveryData).length == 0) {
       return system.getResult(null, "交付数据不能为空，20135");
       return system.getResult(null, "交付数据不能为空，20135");
     }
     }
-    if (Number(actionBody.totalSum) < 300) {
-      return system.getResult(null, "总价有误，总价不能小于300，20140");
-    }
     var deliveryData = actionBody.deliveryData;
     var deliveryData = actionBody.deliveryData;
     if (!deliveryData.nclones) {
     if (!deliveryData.nclones) {
       return system.getResult(null, "商品/服务项不能为空，20150");
       return system.getResult(null, "商品/服务项不能为空，20150");
@@ -272,10 +269,16 @@ class OrderInfoService extends ServiceBase {
         return system.getResult(null, "没有查询到附加购买项目信息，20336");
         return system.getResult(null, "没有查询到附加购买项目信息，20336");
       }
       }
       //重新计算尼斯官费
       //重新计算尼斯官费
+      var totalNclPublicExpense = 0;
       for (let g = 0; g < deliveryData.nclones.length; g++) {
       for (let g = 0; g < deliveryData.nclones.length; g++) {
         const nclThree = deliveryData.nclones[g].nclThree;
         const nclThree = deliveryData.nclones[g].nclThree;
-        deliveryData.nclones[g].nclPublicExpense = Number(deliveryData.nclones[g].nclPublicExpense) + (nclThree.length - 10) * Number(actionBody.product_info.price_additions_item.public_expense);
+        var tmpNclPublicExpense = Number(deliveryData.nclones[g].nclPublicExpense) + (nclThree.length - 10) * Number(actionBody.product_info.price_additions_item.public_expense);
+        totalNclPublicExpense = totalNclPublicExpense + tmpNclPublicExpense;
+        deliveryData.nclones[g].nclPublicExpense = tmpNclPublicExpense;
+      }
     }
     }
+    if (Number(actionBody.totalSum) < Number(totalNclPublicExpense)) {
+      return system.getResult(null, "总价有误，总价不能小于" + totalNclPublicExpense + "，20140");
     }
     }
     pobj.actionBody.deliveryData.deliveryStatus = deliveryStatus;
     pobj.actionBody.deliveryData.deliveryStatus = deliveryStatus;
     pobj.actionBody.deliveryData.deliveryStatusName = deliveryStatusName;
     pobj.actionBody.deliveryData.deliveryStatusName = deliveryStatusName;
@@ -743,7 +746,7 @@ class OrderInfoService extends ServiceBase {
   async getPayOrderInfo(pobj, actionBody) {
   async getPayOrderInfo(pobj, actionBody) {
     var productItem = await this.orderproductDao.getItemByOrderNo(actionBody.orderNo, pobj.appInfo.uapp_id);
     var productItem = await this.orderproductDao.getItemByOrderNo(actionBody.orderNo, pobj.appInfo.uapp_id);
     if (!productItem) {
     if (!productItem) {
-      return system.getResult(null, "订单产品数据异常，30090");
+      return system.getResult(null, "订单产品数据为空，30090");
     }
     }
     var item = await this.orderReceiptVoucherDao.getItemByOrderNo(actionBody.orderNo, pobj.appInfo.uapp_id);
     var item = await this.orderReceiptVoucherDao.getItemByOrderNo(actionBody.orderNo, pobj.appInfo.uapp_id);
     if (!item) {
     if (!item) {