王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 2ffd046d7eec41e9208e65cb71a6faa765e0818f 1 个父辈 f7ff8744
1 个管道 的构建 通过 耗费 0 秒

提现

内嵌 并排对比
正在显示 2 个修改的文件 包含 32 行增加 和 123 行删除
@@ -3,9 +3,7 @@ @@ -3,9 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> 4 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/application/admin/controller/PayView.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/PayView.php" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" afterDir="false" />
9 </list> 7 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -52,8 +50,8 @@ @@ -52,8 +50,8 @@
52 <file leaf-file-name="UserMoneyLogAudit.php" pinned="false" current-in-tab="true"> 50 <file leaf-file-name="UserMoneyLogAudit.php" pinned="false" current-in-tab="true">
53 <entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php"> 51 <entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
54 <provider selected="true" editor-type-id="text-editor"> 52 <provider selected="true" editor-type-id="text-editor">
55 - <state relative-caret-position="589">  
56 - <caret line="128" column="27" selection-start-line="128" selection-start-column="27" selection-end-line="128" selection-end-column="27" /> 53 + <state relative-caret-position="419">
  54 + <caret line="117" column="65" selection-start-line="117" selection-start-column="65" selection-end-line="117" selection-end-column="65" />
57 <folding> 55 <folding>
58 <element signature="e#40#74#0#PHP" expanded="true" /> 56 <element signature="e#40#74#0#PHP" expanded="true" />
59 </folding> 57 </folding>
@@ -269,124 +267,13 @@ @@ -269,124 +267,13 @@
269 <path> 267 <path>
270 <item name="advertising" type="b2602c69:ProjectViewProjectNode" /> 268 <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
271 <item name="advertising" type="462c0819:PsiDirectoryNode" /> 269 <item name="advertising" type="462c0819:PsiDirectoryNode" />
272 - <item name="application" type="462c0819:PsiDirectoryNode" />  
273 - </path>  
274 - <path>  
275 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
276 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
277 - <item name="application" type="462c0819:PsiDirectoryNode" />  
278 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
279 - </path>  
280 - <path>  
281 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
282 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
283 - <item name="application" type="462c0819:PsiDirectoryNode" />  
284 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
285 - <item name="controller" type="462c0819:PsiDirectoryNode" />  
286 - </path>  
287 - <path>  
288 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
289 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
290 - <item name="application" type="462c0819:PsiDirectoryNode" />  
291 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
292 - <item name="library" type="462c0819:PsiDirectoryNode" />  
293 - </path>  
294 - <path>  
295 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
296 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
297 - <item name="application" type="462c0819:PsiDirectoryNode" />  
298 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
299 - <item name="library" type="462c0819:PsiDirectoryNode" />  
300 - <item name="traits" type="462c0819:PsiDirectoryNode" />  
301 - </path>  
302 - <path>  
303 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
304 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
305 - <item name="application" type="462c0819:PsiDirectoryNode" />  
306 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
307 - <item name="view" type="462c0819:PsiDirectoryNode" />  
308 - </path>  
309 - <path>  
310 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
311 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
312 - <item name="application" type="462c0819:PsiDirectoryNode" />  
313 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
314 - <item name="view" type="462c0819:PsiDirectoryNode" />  
315 - <item name="merchant_audit" type="462c0819:PsiDirectoryNode" />  
316 - </path>  
317 - <path>  
318 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
319 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
320 - <item name="application" type="462c0819:PsiDirectoryNode" />  
321 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
322 - <item name="view" type="462c0819:PsiDirectoryNode" />  
323 - <item name="user_money_log" type="462c0819:PsiDirectoryNode" />  
324 - </path>  
325 - <path>  
326 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
327 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
328 - <item name="application" type="462c0819:PsiDirectoryNode" />  
329 - <item name="admin" type="462c0819:PsiDirectoryNode" />  
330 - <item name="view" type="462c0819:PsiDirectoryNode" />  
331 - <item name="user_money_log_audit" type="462c0819:PsiDirectoryNode" />  
332 - </path>  
333 - <path>  
334 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
335 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
336 - <item name="application" type="462c0819:PsiDirectoryNode" />  
337 - <item name="extra" type="462c0819:PsiDirectoryNode" />  
338 - </path>  
339 - <path>  
340 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
341 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
342 - <item name="application" type="462c0819:PsiDirectoryNode" />  
343 - <item name="home" type="462c0819:PsiDirectoryNode" />  
344 - </path>  
345 - <path>  
346 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
347 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
348 - <item name="application" type="462c0819:PsiDirectoryNode" />  
349 - <item name="home" type="462c0819:PsiDirectoryNode" />  
350 - <item name="controller" type="462c0819:PsiDirectoryNode" />  
351 - </path>  
352 - <path>  
353 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
354 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
355 <item name="public" type="462c0819:PsiDirectoryNode" /> 270 <item name="public" type="462c0819:PsiDirectoryNode" />
356 </path> 271 </path>
357 <path> 272 <path>
358 <item name="advertising" type="b2602c69:ProjectViewProjectNode" /> 273 <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
359 <item name="advertising" type="462c0819:PsiDirectoryNode" /> 274 <item name="advertising" type="462c0819:PsiDirectoryNode" />
360 <item name="public" type="462c0819:PsiDirectoryNode" /> 275 <item name="public" type="462c0819:PsiDirectoryNode" />
361 - <item name="assets" type="462c0819:PsiDirectoryNode" />  
362 - </path>  
363 - <path>  
364 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
365 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
366 - <item name="public" type="462c0819:PsiDirectoryNode" />  
367 - <item name="assets" type="462c0819:PsiDirectoryNode" />  
368 - <item name="js" type="462c0819:PsiDirectoryNode" />  
369 - </path>  
370 - <path>  
371 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
372 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
373 - <item name="public" type="462c0819:PsiDirectoryNode" />  
374 - <item name="assets" type="462c0819:PsiDirectoryNode" />  
375 - <item name="js" type="462c0819:PsiDirectoryNode" />  
376 - <item name="backend" type="462c0819:PsiDirectoryNode" />  
377 - </path>  
378 - <path>  
379 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
380 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
381 - <item name="public" type="462c0819:PsiDirectoryNode" />  
382 - <item name="wechat" type="462c0819:PsiDirectoryNode" />  
383 - </path>  
384 - <path>  
385 - <item name="advertising" type="b2602c69:ProjectViewProjectNode" />  
386 - <item name="advertising" type="462c0819:PsiDirectoryNode" />  
387 - <item name="public" type="462c0819:PsiDirectoryNode" />  
388 <item name="wechat" type="462c0819:PsiDirectoryNode" /> 276 <item name="wechat" type="462c0819:PsiDirectoryNode" />
389 - <item name="cert" type="462c0819:PsiDirectoryNode" />  
390 </path> 277 </path>
391 </expand> 278 </expand>
392 <select /> 279 <select />
@@ -450,7 +337,7 @@ @@ -450,7 +337,7 @@
450 <workItem from="1572087949120" duration="1641000" /> 337 <workItem from="1572087949120" duration="1641000" />
451 <workItem from="1572223206994" duration="28857000" /> 338 <workItem from="1572223206994" duration="28857000" />
452 <workItem from="1572309778506" duration="26117000" /> 339 <workItem from="1572309778506" duration="26117000" />
453 - <workItem from="1572395935540" duration="9055000" /> 340 + <workItem from="1572395935540" duration="9581000" />
454 </task> 341 </task>
455 <task id="LOCAL-00001" summary="数据库配置"> 342 <task id="LOCAL-00001" summary="数据库配置">
456 <created>1571972429395</created> 343 <created>1571972429395</created>
@@ -606,11 +493,32 @@ @@ -606,11 +493,32 @@
606 <option name="project" value="LOCAL" /> 493 <option name="project" value="LOCAL" />
607 <updated>1572337980656</updated> 494 <updated>1572337980656</updated>
608 </task> 495 </task>
609 - <option name="localTasksCounter" value="23" /> 496 + <task id="LOCAL-00023" summary="提现">
  497 + <created>1572415319100</created>
  498 + <option name="number" value="00023" />
  499 + <option name="presentableId" value="LOCAL-00023" />
  500 + <option name="project" value="LOCAL" />
  501 + <updated>1572415319100</updated>
  502 + </task>
  503 + <task id="LOCAL-00024" summary="提现">
  504 + <created>1572415401060</created>
  505 + <option name="number" value="00024" />
  506 + <option name="presentableId" value="LOCAL-00024" />
  507 + <option name="project" value="LOCAL" />
  508 + <updated>1572415401060</updated>
  509 + </task>
  510 + <task id="LOCAL-00025" summary="提现">
  511 + <created>1572415609581</created>
  512 + <option name="number" value="00025" />
  513 + <option name="presentableId" value="LOCAL-00025" />
  514 + <option name="project" value="LOCAL" />
  515 + <updated>1572415609581</updated>
  516 + </task>
  517 + <option name="localTasksCounter" value="26" />
610 <servers /> 518 <servers />
611 </component> 519 </component>
612 <component name="TimeTrackingManager"> 520 <component name="TimeTrackingManager">
613 - <option name="totallyTimeSpent" value="194280000" /> 521 + <option name="totallyTimeSpent" value="194806000" />
614 </component> 522 </component>
615 <component name="ToolWindowManager"> 523 <component name="ToolWindowManager">
616 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 524 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -675,7 +583,8 @@ @@ -675,7 +583,8 @@
675 <MESSAGE value="调试授权" /> 583 <MESSAGE value="调试授权" />
676 <MESSAGE value="证书" /> 584 <MESSAGE value="证书" />
677 <MESSAGE value="支付" /> 585 <MESSAGE value="支付" />
678 - <option name="LAST_COMMIT_MESSAGE" value="支付" /> 586 + <MESSAGE value="提现" />
  587 + <option name="LAST_COMMIT_MESSAGE" value="提现" />
679 </component> 588 </component>
680 <component name="editorHistoryManager"> 589 <component name="editorHistoryManager">
681 <entry file="file://$PROJECT_DIR$/application/admin/model/Question.php"> 590 <entry file="file://$PROJECT_DIR$/application/admin/model/Question.php">
@@ -1022,8 +931,8 @@ @@ -1022,8 +931,8 @@
1022 </entry> 931 </entry>
1023 <entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php"> 932 <entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
1024 <provider selected="true" editor-type-id="text-editor"> 933 <provider selected="true" editor-type-id="text-editor">
1025 - <state relative-caret-position="589">  
1026 - <caret line="128" column="27" selection-start-line="128" selection-start-column="27" selection-end-line="128" selection-end-column="27" /> 934 + <state relative-caret-position="419">
  935 + <caret line="117" column="65" selection-start-line="117" selection-start-column="65" selection-end-line="117" selection-end-column="65" />
1027 <folding> 936 <folding>
1028 <element signature="e#40#74#0#PHP" expanded="true" /> 937 <element signature="e#40#74#0#PHP" expanded="true" />
1029 </folding> 938 </folding>
@@ -115,7 +115,7 @@ class UserMoneyLogAudit extends Backend @@ -115,7 +115,7 @@ class UserMoneyLogAudit extends Backend
115 if($params['type'] == 2){ 115 if($params['type'] == 2){
116 //审核通过 116 //审核通过
117 $user = Db::name('user')->where(['id'=>$row['user_id']])->find(); 117 $user = Db::name('user')->where(['id'=>$row['user_id']])->find();
118 - $third = Db::name('third')->where(['id'=>$row['user_id']])->find(); 118 + $third = Db::name('third')->where(['user_id'=>$row['user_id']])->find();
119 //红包券充值比例 119 //红包券充值比例
120 $exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find(); 120 $exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
121 $withdraw = $this->merchantPay($third['openid'],$user['nickname'],$row['money']*$exp_ratio['ratio']*0.01,'商户提现'); 121 $withdraw = $this->merchantPay($third['openid'],$user['nickname'],$row['money']*$exp_ratio['ratio']*0.01,'商户提现');