试用期店铺考核

application/library/Store/StoreUtil.php

@@ -133,7 +133,7 @@ class StoreUtil {
         $addKey=\Our\Common::getConfig('password.key');
         $payLogList = array();
         $newChargeList = array();
-        foreach($list as $class){
+            foreach($list as $class){
             $paySn = date('YmdHis').$this->createncode(18);
             $storeId = $class['store_id'];
             $payLog = array();
@@ -160,9 +160,9 @@ class StoreUtil {
             $payLog['pay_amount'] = 0;
             $chargeLog['gmt_create'] = $currentTime;
             $chargeLog['gmt_update'] = $currentTime;
-            $chargeLog['service_fee_sign'] = md5($currentTime,$chargeLog['service_fee'],$addKey);
+            $chargeLog['service_fee_sign'] = md5($currentTime.$chargeLog['service_fee'].$addKey);
             $newChargeList[] = $chargeLog;
-            $resultClass = $qmStoreClassModel->update(array('deadline'=>$chargeLog['new_end_time'],'deadline_sign'=>md5($class['gmt_create'],$chargeLog['new_end_time'],$addKey),'gmt_update'=>$currentTime),array('gc_id'=>$chargeLog['gc_id'],'store_id'=>$chargeLog['store_id']));
+            $resultClass = $qmStoreClassModel->update(array('deadline'=>$chargeLog['new_end_time'],'deadline_sign'=>md5($class['gmt_create'].$chargeLog['new_end_time'].$addKey),'gmt_update'=>$currentTime),array('gc_id'=>$chargeLog['gc_id'],'store_id'=>$chargeLog['store_id']));
             if($resultClass===false){
                 $qmStoreClassModel->db->doRollback();
             }

application/models/Business/Store/StoreService.php

@@ -1344,10 +1344,10 @@ class StoreServiceModel extends \Business\AbstractModel{
             foreach ($stores as $store) {
                 if($store['amount'] >= 400) {
                     //自动免费续费 当前签约分类租金2个月
-                    $storeUtil->calcChargeMoney(array('month'=>2,'store_end_time'=>$store['store_end_time'],'contract_time'=>$store['contract_time']));
+                    $storeUtil->calcChargeMoney(array($store['store_id']=>array('month'=>2,'store_end_time'=>$store['store_end_time'],'contract_time'=>$store['contract_time'])));
                 }elseif ($store['amount'] >= 300) {
                     //自动免费续费 当前签约分类租金1个月
-                    $storeUtil->calcChargeMoney(array('month'=>1,'store_end_time'=>$store['store_end_time'],'contract_time'=>$store['contract_time']));
+                    $storeUtil->calcChargeMoney(array($store['store_id']=>array('month'=>1,'store_end_time'=>$store['store_end_time'],'contract_time'=>$store['contract_time'])));
                 }
 //                elseif ($store['amount'] < 30) {
 //                    //查看是否有签约分类续费记录