Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
142f17a0
Commit
142f17a0
authored
Sep 02, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
支付小程序支付增加生成新的paySn
parent
009600cd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
Pay.php
application/library/Payment/Pay.php
+5
-0
OrderService.php
application/models/Business/Order/OrderService.php
+9
-6
No files found.
application/library/Payment/Pay.php
View file @
142f17a0
...
@@ -67,6 +67,11 @@ class Pay {
...
@@ -67,6 +67,11 @@ class Pay {
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
emptyOrderAmountForPay
);
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
emptyOrderAmountForPay
);
}
}
$orderInfo
[
'orderAmount'
]
=
$this
->
orderAmount
;
$orderInfo
[
'orderAmount'
]
=
$this
->
orderAmount
;
if
(
$this
->
channel
==
\Our\NameConst
::
wxLiteChannel
){
$orderConfirmUtil
=
\Order\OrderConfirmUtil
::
getInstance
();
$newPaySn
=
$orderConfirmUtil
->
makeNewPaySnForOrderWithOldPaySn
(
$this
->
paySn
,
$this
->
memberId
);
$this
->
paySn
=
$newPaySn
;
}
$orderInfo
[
'paySn'
]
=
$this
->
paySn
;
$orderInfo
[
'paySn'
]
=
$this
->
paySn
;
$orderInfo
[
'orderSns'
]
=
array_column
(
$orderList
,
'order_sn'
);
$orderInfo
[
'orderSns'
]
=
array_column
(
$orderList
,
'order_sn'
);
return
$orderInfo
;
return
$orderInfo
;
...
...
application/models/Business/Order/OrderService.php
View file @
142f17a0
...
@@ -791,12 +791,15 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -791,12 +791,15 @@ class OrderServiceModel extends \Business\AbstractModel
$orderIds
[]
=
$order
[
'order_id'
];
$orderIds
[]
=
$order
[
'order_id'
];
}
}
$return
[
'orderState'
]
=
$orderState
;
$return
[
'orderState'
]
=
$orderState
;
/*$return['paySn'] = $data['paySn'];
if
(
isset
(
$data
[
'wxLitePayFlag'
])
&&
$data
[
'wxLitePayFlag'
]
==
\Our\ApiConst
::
one
){
if(!$orderState){
$return
[
'paySn'
]
=
$data
[
'paySn'
];
$orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
if
(
!
$orderState
){
$paySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($data['paySn'],$memberId);
$orderConfirmUtil
=
\Order\OrderConfirmUtil
::
getInstance
();
$return['paySn'] = $paySn;
$paySn
=
$orderConfirmUtil
->
makeNewPaySnForOrderWithOldPaySn
(
$data
[
'paySn'
],
$memberId
);
}*/
$return
[
'paySn'
]
=
$paySn
;
}
}
$return
[
'orderNos'
]
=
$orderNos
;
$return
[
'orderNos'
]
=
$orderNos
;
$return
[
'totalOrderAmount'
]
=
$totalOrderAmount
;
$return
[
'totalOrderAmount'
]
=
$totalOrderAmount
;
$return
[
'orderTips'
]
=
$orderTips
;
$return
[
'orderTips'
]
=
$orderTips
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment