chuweiqiang 1 year ago
parent
commit
f74d2b0e2c
2 changed files with 6 additions and 6 deletions
  1. 4 3
      .idea/workspace.xml
  2. 2 3
      application/api/controller/Activity.php

+ 4 - 3
.idea/workspace.xml

@@ -510,7 +510,8 @@
       <workItem from="1703723365491" duration="5844000" />
       <workItem from="1703809864500" duration="19795000" />
       <workItem from="1704155172177" duration="9914000" />
-      <workItem from="1704241807685" duration="19045000" />
+      <workItem from="1704241807685" duration="19341000" />
+      <workItem from="1704328242887" duration="696000" />
     </task>
     <servers />
   </component>
@@ -644,10 +645,10 @@
       <screen x="0" y="0" width="2194" height="1194" />
     </state>
     <state x="999" y="516" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2194.1194@0.0.2194.1194" timestamp="1696929992529" />
-    <state x="394" y="137" width="1206" height="901" key="find.popup" timestamp="1704249426102">
+    <state x="394" y="137" width="1206" height="901" key="find.popup" timestamp="1704328911095">
       <screen x="0" y="0" width="2194" height="1194" />
     </state>
-    <state x="394" y="137" width="1206" height="901" key="find.popup/0.0.2194.1194@0.0.2194.1194" timestamp="1704249426102" />
+    <state x="394" y="137" width="1206" height="901" key="find.popup/0.0.2194.1194@0.0.2194.1194" timestamp="1704328911095" />
     <state x="754" y="279" key="run.anything.popup" timestamp="1702458428181">
       <screen x="0" y="0" width="2194" height="1194" />
     </state>

+ 2 - 3
application/api/controller/Activity.php

@@ -846,11 +846,10 @@ class Activity extends Base
                     $ret_data['config'] = $pay_config['config'];
                     break;
                 case 6 :
-                    if(!$user_info['openid']) $this->exception('请绑定openid');
                     $notify_url = $this->request->root(true) . '/api/we_chat_pay/applyOrderNotify';
-                    $pay_config = WeChatPay::wxPay('订单支付',$order_info['pay_no'],$order_info['money'],$notify_url,'NATIVE',$user_info['openid']);
-                    if($pay_config['code'] != 200) $this->exception($pay_config['msg']);
+                    $pay_config = WeChatPay::wxPay('订单支付',$order_info['pay_no'],$order_info['money'] ,$notify_url,'NATIVE');
                     $ret_data['config'] = $pay_config['config'];
+                    $ret_data['code_url'] = $pay_config['pc_pay_url'];
                     break;
                 case 7 :
                     $notify_url = $this->request->root(true) . '/api/Alipay/applyOrderNotify';