Explorar el Código

红包系统红包查询条件修改, oms推送条件完善

songjiyuan hace 9 años
padre
commit
77f3d4444f
Se han modificado 2 ficheros con 2 adiciones y 2 borrados
  1. 1 1
      data/model/member.model.php
  2. 1 1
      mobile/control/app_pay.php

+ 1 - 1
data/model/member.model.php

@@ -768,7 +768,7 @@ class memberModel extends Model
         }
 
         // 预存款订单查询条件
-        $condition = 'lg_freeze_amount<>0.0 or lg_av_amount<0.0 and lg_member_id=\'' . $member_info['member_id'] . '\'';
+        $condition = '(lg_freeze_amount<>0.0 or lg_av_amount<0.0) and lg_member_id=\'' . $member_info['member_id'] . '\'';
         
         $model_pd = Model('predeposit');
         $tmp_log_list = array();

+ 1 - 1
mobile/control/app_pay.php

@@ -230,7 +230,7 @@ class app_payControl extends mbMemberControl
         }
 
         // 推送到oms
-        if ($result) {
+        if (isset($result) && $result['state']) {
             $logic_delivery = Logic('delivery');
             $ret = $logic_delivery->putOrder($out_trade_no, $transaction_id);
         }