Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/OrderController.php

@@ -2342,6 +2342,16 @@ class OrderController extends BaseController
                                         $freight = bcadd($freight, $amount, 2);
                                     }
                                 }
+                                if ($mainId == 8164) {
+                                    $remainNum = bcsub($num, $refundNum);
+                                    $amount = bcmul($remainNum, $unitPrice, 2);
+                                    if ($classId == 90497) {
+                                        $carton = bcadd($carton, $amount, 2);
+                                    }
+                                    if ($classId == 90501) {
+                                        $freight = bcadd($freight, $amount, 2);
+                                    }
+                                }
                             }
                         }
                     }