Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Purchin.php

@@ -970,9 +970,9 @@ class Purchin extends Base
                         GoodLog::LogAdd($this->post['token'],$good_data,'RKD');
 
                     $order = ["order_code"=>$cgdinfo['cgdNo'],"status"=>$cgdinfo['status'],"action_remark"=>'',"action_type"=>"edit"];
-                    $cgdinfo['wsend_num']-=$return['return_num']+$return['reissue_num'];
-                    $cgdinfo['good_num']-=$return['return_num']+$return['reissue_num'];
-                    $cgdinfo['total_fee']=round($cgdinfo['good_num']*$cgdinfo['good_price'],2);
+                    $cgdinfo['wsend_num']-=$return['return_num']-$return['reissue_num'];
+                    $cgdinfo['th_num']+=$return['return_num']-$return['reissue_num'];
+                    $cgdinfo['th_fee']=round(($return['return_num']-$return['reissue_num'])*$cgdinfo['good_price'],2);
                     $cgdinfo['send_status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
                     $cgdinfo['status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
                     $cgdinfo['updatetime']=date("Y-m-d H:i:s");