1

.idea/workspace.xml

@@ -4,6 +4,7 @@
     <list default="true" id="39916099-6c76-4a34-b5a2-40f5b4c0c928" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Order.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/api/controller/Secondary.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Secondary.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -210,7 +211,7 @@
       <workItem from="1664498426748" duration="1828000" />
       <workItem from="1665189424516" duration="5903000" />
       <workItem from="1665206980198" duration="2686000" />
-      <workItem from="1665276340708" duration="2500000" />
+      <workItem from="1665276340708" duration="3393000" />
     </task>
     <task id="LOCAL-00001" summary=".">
       <created>1663731279977</created>
@@ -266,10 +267,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1059" y="598" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1665276628414" />
-    <state x="1401" y="707" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1665192632851">
+    <state x="1401" y="707" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1665279813105">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1401" y="707" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1665192632851" />
+    <state x="1401" y="707" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1665279813105" />
     <state x="1088" y="459" width="912" height="548" key="find.popup" timestamp="1663231311548">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/api/controller/Order.php

@@ -412,7 +412,7 @@ class Order extends Base
             case 'll':
                 $notify_url = 'https://'.$_SERVER['HTTP_HOST'] . '/api/Pay/primaryMarketNotify';
                 $return_url ='https://'.$_SERVER['HTTP_HOST']."/h5/pages/mine/mine?id={$order['c_id']}&orderNo={$order_no}";//回调地址
-                $risk_item= risk_item($user,'余额充值',$source == 1 ? 16 : 10);
+                $risk_item= risk_item($user,'余额支付',$source == 1 ? 16 : 10);
                 $res= LianLianPay::cashierPay($order_no,$total_fee,$this->uid,$notify_url,$return_url,'藏品支付',[[
                     'payee_id'=>OID_PARTNER,
                     'payee_type' => 'MERCHANT',

application/api/controller/Secondary.php

@@ -421,7 +421,7 @@ class Secondary extends Base
                             Db::name('store_order_info_order')->where('order_no',$order_no)->where('mid',$this->uid)->update(['order_no'=>$order_nos]);
                             $notify_url = 'https://'.$_SERVER['HTTP_HOST'] . '/api/Pay/secondaryMarketNotify';
                             $return_url ='https://'.$_SERVER['HTTP_HOST']."/h5/pages/mine/mine?id={$id}&orderNo={$order_nos}";//回调地址
-                            $risk_item= risk_item($user,'余额充值',$from == 'app' ? 10 : 16);
+                            $risk_item= risk_item($user,'余额支付',$from == 'app' ? 10 : 16);
                             $res= LianLianPay::cashierPay($order_nos,$total_fee,$this->uid,$notify_url,$return_url,'二级市场订单支付',[[
                                 'payee_id'=>OID_PARTNER,
                                 'payee_type' => 'MERCHANT',