Skip to content

M
my-yaf-project
Commit cf12fe8d authored by christ's avatar christ
Browse files
Options

shoporders

parent b8645c6d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
application/models/Business/Store/ShopkeeperService.php
View file @ cf12fe8d
...@@ -312,7 +312,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -312,7 +312,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
// $value['orderAmount'] = $value['orderAmount']; // $value['orderAmount'] = $value['orderAmount'];
$value['reciverInfo'] = unserialize($value['reciverInfo']); $value['reciverInfo'] = unserialize($value['reciverInfo']);
$value['reciverInfo'] =$orderCommonDao->getReciverInfo( $value['reciverInfo'] ); $value['reciverInfo'] =$orderCommonDao->getReciverInfo( $value['reciverInfo'] );
$value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin)); $value['dlyoPickupCode'] = substr($value['orderSn'], ApiConst::positionPickupCodeBegin);
$value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius; $value['deliveryTimeEnd'] = $value['deliveryTime'] + ApiConst::arriveTimeRadius;
if ($value['diliverymanId']) { if ($value['diliverymanId']) {
$diliverymanDao = DiliverymanModel::getInstance(); $diliverymanDao = DiliverymanModel::getInstance();
...@@ -352,7 +352,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -352,7 +352,8 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
} }
$res1['must'][0] = $query1; $res1['must'][0] = $query1;
$query2[] = array('match' => array('goodsName' => $keyword)); $query2[] = array('match' => array('goodsName' => $keyword));
$query2[] = array('wildcard' => array('orderSn' => "*{$keyword}*")); $query2[] = array('match' => array('orderSn' => "{$keyword}"));
//$query2[] = array('wildcard' => array('orderSn' => "*{$keyword}*"));
$res1['must'][1]['bool']['should'] = $query2; $res1['must'][1]['bool']['should'] = $query2;
$allQuery['bool'] = $res1; $allQuery['bool'] = $res1;
$elasticTool = \Elastics\ElasticsToolModel::getInstance(NameConst::ordersIndex); $elasticTool = \Elastics\ElasticsToolModel::getInstance(NameConst::ordersIndex);
...@@ -502,7 +503,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -502,7 +503,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$returnData['couponAmount'] = ($returnData['goodsAmount'] + $returnData['shippingFee']) - $returnData['orderAmount'];//优惠券金额 $returnData['couponAmount'] = ($returnData['goodsAmount'] + $returnData['shippingFee']) - $returnData['orderAmount'];//优惠券金额
$returnData['receiveAmount'] = $returnData['goodsAmount'] - $returnData['couponAmount']; $returnData['receiveAmount'] = $returnData['goodsAmount'] - $returnData['couponAmount'];
$returnData['orderAmount'] = $returnData['orderAmount'] + $returnData['couponAmount']; $returnData['orderAmount'] = $returnData['orderAmount'] + $returnData['couponAmount'];
$returnData['dlyoPickupCode'] = intval(substr($returnData['orderSn'], ApiConst::positionPickupCodeBegin)); $returnData['dlyoPickupCode'] = substr($returnData['orderSn'], ApiConst::positionPickupCodeBegin);
$returnData['deliveryTimeEnd'] = $returnData['deliveryTime'] + ApiConst::arriveTimeRadius; $returnData['deliveryTimeEnd'] = $returnData['deliveryTime'] + ApiConst::arriveTimeRadius;
} else { } else {
unset($returnData['reciverInfo']); unset($returnData['reciverInfo']);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment