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
ce4c1b75
Commit
ce4c1b75
authored
Dec 13, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clientorderbug
parent
3476b542
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
RefundService.php
application/models/Business/Order/RefundService.php
+3
-0
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+3
-2
No files found.
application/models/Business/Order/RefundService.php
View file @
ce4c1b75
...
@@ -721,6 +721,8 @@ class RefundServiceModel extends \Business\AbstractModel
...
@@ -721,6 +721,8 @@ class RefundServiceModel extends \Business\AbstractModel
$diliveryWhere
[
'order_type'
]
=
ApiConst
::
orderTypeRefund
;
$diliveryWhere
[
'order_type'
]
=
ApiConst
::
orderTypeRefund
;
$orderWhere
[
'order_id'
]
=
array
(
'in'
,
$orderIds
);
$orderWhere
[
'order_id'
]
=
array
(
'in'
,
$orderIds
);
$orders
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'getList'
),
array
(
$orderWhere
,
$orderDao
->
getOrderDetailField
(),
ApiConst
::
zero
,
$pageSize
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$storeId
));
$orders
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$orderDao
,
'getList'
),
array
(
$orderWhere
,
$orderDao
->
getOrderDetailField
(),
ApiConst
::
zero
,
$pageSize
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$storeId
));
$orderConvert
=
$orderDao
->
convertOrder
(
$orders
[
'list'
],
'orderId'
);
$qmDeliveryManLogWhere
[
'order_id'
]
=
array
(
'in'
,
$refundIds
);
$qmDeliveryManLogWhere
[
'order_id'
]
=
array
(
'in'
,
$refundIds
);
$qmDeliveryManLogWhere
[
'order_type'
]
=
ApiConst
::
orderTypeRefund
;
$qmDeliveryManLogWhere
[
'order_type'
]
=
ApiConst
::
orderTypeRefund
;
$qmDeliveryManLogs
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$qmDeliveryManLogDao
,
'getList'
),
array
(
$qmDeliveryManLogWhere
,
$qmDeliveryManLogDao
->
fieldDetail
,
ApiConst
::
zero
,
$pageSize
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$storeId
));
$qmDeliveryManLogs
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$qmDeliveryManLogDao
,
'getList'
),
array
(
$qmDeliveryManLogWhere
,
$qmDeliveryManLogDao
->
fieldDetail
,
ApiConst
::
zero
,
$pageSize
),
\Our\ApiConst
::
oneDaySecond
,
array
(
$storeId
));
...
@@ -781,6 +783,7 @@ class RefundServiceModel extends \Business\AbstractModel
...
@@ -781,6 +783,7 @@ class RefundServiceModel extends \Business\AbstractModel
}
else
{
}
else
{
$value
[
'markRefundButton'
]
=
ApiConst
::
zero
;;
$value
[
'markRefundButton'
]
=
ApiConst
::
zero
;;
}
}
$value
[
'addTime'
]
=
$orderConvert
[
$value
[
'orderId'
]][
'addTime'
];
unset
(
$value
[
'goodsSpec'
]);
unset
(
$value
[
'goodsSpec'
]);
// unset($value['picInfo']);
// unset($value['picInfo']);
}
}
...
...
application/models/Business/Store/ShopkeeperService.php
View file @
ce4c1b75
...
@@ -328,7 +328,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -328,7 +328,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$ordersOrderCommons
=
Common
::
intergrateOneToOne
(
$orders
,
$qmDeliveryManLogs
[
'list'
],
'orderId'
,
'orderId'
);
$ordersOrderCommons
=
Common
::
intergrateOneToOne
(
$orders
,
$qmDeliveryManLogs
[
'list'
],
'orderId'
,
'orderId'
);
$ordersOrderCommons
=
Common
::
intergrateOneToOne
(
$ordersOrderCommons
,
$orderCommons
,
'orderId'
,
'orderId'
);
$ordersOrderCommons
=
Common
::
intergrateOneToOne
(
$ordersOrderCommons
,
$orderCommons
,
'orderId'
,
'orderId'
);
$orderMerge
=
\Our\Common
::
intergrateOneToMany
(
$ordersOrderCommons
,
$orderGoods
,
'orderId'
,
'orderId'
,
'orderGoods'
);
$orderMerge
=
\Our\Common
::
intergrateOneToMany
(
$ordersOrderCommons
,
$orderGoods
,
'orderId'
,
'orderId'
,
'orderGoods'
);
$orderConvert
=
$orderDao
->
convertOrder
(
$orders
,
'orderId'
);
foreach
(
$orderMerge
as
&
$value
)
{
foreach
(
$orderMerge
as
&
$value
)
{
$value
[
'orderStateName'
]
=
$orderDao
->
getStatusText
(
$value
);
$value
[
'orderStateName'
]
=
$orderDao
->
getStatusText
(
$value
);
$value
[
'orderText'
]
=
$orderDao
->
getText
(
$value
,
ApiConst
::
orderListDescribe
);
$value
[
'orderText'
]
=
$orderDao
->
getText
(
$value
,
ApiConst
::
orderListDescribe
);
...
@@ -365,7 +366,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -365,7 +366,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
}
else
{
}
else
{
unset
(
$value
[
'reciverInfo'
]);
unset
(
$value
[
'reciverInfo'
]);
}
}
$value
[
'addTime'
]
=
$orderConvert
[
$value
[
'orderId'
]][
'addTime'
];
unset
(
$value
[
'couponId'
]);
unset
(
$value
[
'couponId'
]);
unset
(
$value
[
'refundAmount'
]);
unset
(
$value
[
'refundAmount'
]);
unset
(
$value
[
'distributionFee'
]);
unset
(
$value
[
'distributionFee'
]);
...
...
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