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
1a3fe69c
Commit
1a3fe69c
authored
Sep 12, 2018
by
zhz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
goods
parent
b99a4f69
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
GoodsCommonService.php
application/models/Business/Goods/GoodsCommonService.php
+2
-1
No files found.
application/models/Business/Goods/GoodsCommonService.php
100755 → 100644
View file @
1a3fe69c
...
@@ -870,13 +870,14 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
...
@@ -870,13 +870,14 @@ class GoodsCommonServiceModel extends \Business\AbstractModel
$saleOrder
=
\DAO\SaleOrderModel
::
getInstance
()
->
find
(
array
(
'order_goods_id'
=>
$orderGoods
[
'rec_id'
]),
'id'
);
$saleOrder
=
\DAO\SaleOrderModel
::
getInstance
()
->
find
(
array
(
'order_goods_id'
=>
$orderGoods
[
'rec_id'
]),
'id'
);
$insert
=
[];
$insert
=
[];
$update
=
[];
$update
=
[];
$order
=
\DAO\Order\OrderModel
::
getInstance
()
->
findByOrderId
(
$orderGoods
[
'order_id'
],
'order_state,order_sn,buyer_id'
);
$order
=
\DAO\Order\OrderModel
::
getInstance
()
->
findByOrderId
(
$orderGoods
[
'order_id'
],
'order_state,order_sn,buyer_id
,store_id
'
);
if
(
$saleOrder
){
if
(
$saleOrder
){
$update
[
'is_refund'
]
=
$orderGoods
[
'is_refund'
];
$update
[
'is_refund'
]
=
$orderGoods
[
'is_refund'
];
$update
[
'order_state'
]
=
$order
[
'order_state'
];
$update
[
'order_state'
]
=
$order
[
'order_state'
];
}
else
{
}
else
{
$member
=
\DAO\MemberModel
::
getInstance
()
->
getInfo
(
$order
[
'buyer_id'
]);
$member
=
\DAO\MemberModel
::
getInstance
()
->
getInfo
(
$order
[
'buyer_id'
]);
$insert
[
'member_name'
]
=
$member
[
'memberName'
];
$insert
[
'member_name'
]
=
$member
[
'memberName'
];
$insert
[
'store_id'
]
=
$member
[
'store_id'
];
$insert
[
'member_avatar'
]
=
$member
[
'memberAvatarUrl'
];
$insert
[
'member_avatar'
]
=
$member
[
'memberAvatarUrl'
];
$insert
[
'order_goods_id'
]
=
$orderGoods
[
'rec_id'
];
$insert
[
'order_goods_id'
]
=
$orderGoods
[
'rec_id'
];
$insert
[
'sale_act_id'
]
=
$orderGoods
[
'sale_act_id'
];
$insert
[
'sale_act_id'
]
=
$orderGoods
[
'sale_act_id'
];
...
...
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