Skip to content

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

clientorder

parent aa5be9eb
Show whitespace changes
Inline Side-by-side
Showing with 165 additions and 1 deletion
application/models/Business/Store/ShopkeeperService.php
View file @ 39eaa762
...@@ -308,6 +308,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -308,6 +308,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
if ($this->clientType && $this->clientType == NameConst::pcClient) { if ($this->clientType && $this->clientType == NameConst::pcClient) {
$value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额 $value['couponAmount'] = ($value['goodsAmount'] + $value['shippingFee']) - $value['orderAmount'];//优惠券金额
$value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount']; $value['receiveAmount'] = $value['goodsAmount']+$value['shippingFee'] - $value['couponAmount'];
// $value['orderAmount'] = $value['orderAmount']; // $value['orderAmount'] = $value['orderAmount'];
$value['reciverInfo'] = unserialize($value['reciverInfo']); $value['reciverInfo'] = unserialize($value['reciverInfo']);
$value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin)); $value['dlyoPickupCode'] = intval(substr($value['orderSn'], ApiConst::positionPickupCodeBegin));
...@@ -468,6 +469,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel ...@@ -468,6 +469,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
} }
$fields = $orderDao->getFields(); $fields = $orderDao->getFields();
$this->order = $orderDao->getConvertOrder($order, $fields); $this->order = $orderDao->getConvertOrder($order, $fields);
//收货人地址 //收货人地址
//收货人信息 //收货人信息
$this->orderCommon = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond); $this->orderCommon = \Our\RedisHelper::cachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$orderCommonDao, 'findByOrderId'), array($orderId, $orderCommonDao->orderCommonField), \Our\ApiConst::oneDaySecond);
......
application/models/DAO/Order/Order.php
View file @ 39eaa762
...@@ -45,7 +45,7 @@ class OrderModel extends \DAO\AbstractModel ...@@ -45,7 +45,7 @@ class OrderModel extends \DAO\AbstractModel
public function getOrderDetailField() public function getOrderDetailField()
{ {
return 'order_id as orderId,coupon_id as couponId,refund_amount as refundAmount,order_sn as orderSn,pay_sn as paySn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,payment_time as paymentTime,finnshed_time as finnshedTime,need_shipping_fee as needShippingFee,payment_code as paymentCode,buyer_id as buyerId,buyer_name as buyerName,refund_condition as refundCondition,delay_time as delayTime,gmt_update as gmtUpdate,diliveryman_id as diliverymanId,shipping_arrival_time as shippingArrivalTime,delivery_time as deliveryTime'; return 'order_id as orderId,coupon_id as couponId,refund_amount as refundAmount,order_sn as orderSn,pay_sn as paySn,store_name as storeName,add_time as addTime,store_id as storeId,goods_amount as goodsAmount,shipping_fee as shippingFee,order_amount as orderAmount,shipping_type as shippingType,payment_type as paymentType,order_state as orderState,shipping_fee as shippingFee,refund_state as refundState,order_type as orderType,is_receive_payment as isReceivePayment,payment_time as paymentTime,finnshed_time as finnshedTime,need_shipping_fee as needShippingFee,payment_code as paymentCode,buyer_id as buyerId,buyer_name as buyerName,refund_condition as refundCondition,delay_time as delayTime,gmt_update as gmtUpdate,diliveryman_id as diliverymanId,shipping_arrival_time as shippingArrivalTime,delivery_time as deliveryTime,order_note as orderNote';
} }
public function getOrderShippingField() public function getOrderShippingField()
...@@ -1035,6 +1035,7 @@ class OrderModel extends \DAO\AbstractModel ...@@ -1035,6 +1035,7 @@ class OrderModel extends \DAO\AbstractModel
'buyerId' => 'buyer_id', 'buyerId' => 'buyer_id',
'deliveryTime' => 'delivery_time', 'deliveryTime' => 'delivery_time',
'evaluationState'=>'evaluation_state', 'evaluationState'=>'evaluation_state',
'orderNote'=>'order_note'
); );
} }
......
application/views/qa/test.html 0 → 100644
View file @ 39eaa762
<table class="" style="test-align:center">
<tbody>
<tr>
<td> 订单状态(orderState)</td>
<td> 配送类型(shippingType)</td>
<td> 支付状态（isReceivePayment）</td>
<td><span style="color: rgb(51, 51, 51); font-family: " arial="" negreta",="" arial;="" font-size:="" 13px;=""
font-weight:="" 700;="" text-align:="" center;="" white-space:="" normal;"="">订单状态（列表文案）</span> </td>
<td> 商品额外文案</td>
<td> 状态/倒计时</td>
<td> 店家操作</td>
</tr>
<tr>
<td> 20</td>
<td></td>
<td> 1541568512（大于0的时间戳）</td>
<td> 待接单</td>
<td></td>
<td> 请尽快确认订单<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
剩余关闭时间：5分 23秒</p></td>
<td> 接单</td>
</tr>
<tr>
<td> 20</td>
<td></td>
<td> 0</td>
<td> 待接单</td>
<td></td>
<td> 请尽快确认订单<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
剩余关闭时间：5分 23秒</p></td>
<td> 修改价格<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
确认收款</p>
<p style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
接单</p></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 待付款</td>
<td></td>
<td> 待线上付款</td>
<td> 修改价格</td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 待配送</td>
<td> {售后状态}<span
style="font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal; color: rgb(0, 0, 0);">（可能存在）</span>
</td>
<td> 待配送</td>
<td> 选择配送人员<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
打印订单</p></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 待配送</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 待配送</td>
<td> 修改价格<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
确认收款</p>
<p style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
<span style="color: rgb(0, 0, 0);">选择配送人员</span></p>
<p style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
<span style="color: rgb(0, 0, 0);">打印订单</span></p></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 待自提</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 待到店自取</td>
<td> 修改价格<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
确认收款</p></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 待自提</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 待到店自取</td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 已完成</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 订单已完成</td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 已取消</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 已取消<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
{取消原因}（orderNote）</p></td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td> 已关闭</td>
<td> {售后状态}<span
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span>
</td>
<td> 已关闭<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: &quot;kern&quot;; font-kerning: normal; color: rgb(51, 51, 51); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; text-align: center; white-space: normal;">
{关闭原因}(orderNodte)</p></td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table><p><br></p>
\ No newline at end of file
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