|
@@ -17,7 +17,8 @@ class refillControl extends merchantControl
|
|
{
|
|
{
|
|
$goods_list = refill\RefillFactory::instance()->goods();
|
|
$goods_list = refill\RefillFactory::instance()->goods();
|
|
|
|
|
|
- $sorter = function (array $items) {
|
|
|
|
|
|
+ $sorter = function (array $items)
|
|
|
|
+ {
|
|
$ret = [];
|
|
$ret = [];
|
|
foreach ($items as $key => $val) {
|
|
foreach ($items as $key => $val) {
|
|
sort($val);
|
|
sort($val);
|
|
@@ -517,8 +518,17 @@ class refillControl extends merchantControl
|
|
|
|
|
|
if(empty($refill_info))
|
|
if(empty($refill_info))
|
|
{
|
|
{
|
|
- Log::record("query_state in db no order mchid={$mchid} mch_order={$order_sn}" ,Log::DEBUG);
|
|
|
|
- return self::outerr(202, "无此订单");
|
|
|
|
|
|
+ $items = $mod_refill->getOrderInfo(['mch_order' => $order_sn,'mchid' => $mchid]);
|
|
|
|
+ if (empty($items)) {
|
|
|
|
+ Log::record("query_state in db no order mchid={$mchid} mch_order={$order_sn}", Log::DEBUG);
|
|
|
|
+ return self::outerr(202, "无此订单");
|
|
|
|
+ } else {
|
|
|
|
+ Log::record("query_state in db mchid={$mchid} mch_order={$order_sn} order_state not completed.", Log::DEBUG);
|
|
|
|
+ $result['mchid'] = $mchid;
|
|
|
|
+ $result['order_sn'] = $order_sn;
|
|
|
|
+ $result['order_state'] = ORDER_STATE_SEND;
|
|
|
|
+ return self::outsuccess($result);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|