Skip to content

M
my-yaf-project
Commit ac1d3fe3 authored by zhz's avatar zhz
Browse files
Options

Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev

parents 5e495338 d9fdb9c7
Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 96 deletions
application/library/Our/ApiConst.php
View file @ ac1d3fe3
...@@ -147,7 +147,9 @@ class ApiConst ...@@ -147,7 +147,9 @@ class ApiConst
const orderStateWaitPay = 10;//待付款 const orderStateWaitPay = 10;//待付款
const orderStateWaitConfirm = 20;//待接单 const orderStateWaitConfirm = 20;//待接单
const orderStateWaitSend = 25;//待发货 const orderStateWaitSend = 25;//待发货
const orderStateWaitSendOne = 26;//待发货
const orderStateWaitRecieve = 30;//待收货 const orderStateWaitRecieve = 30;//待收货
const orderStateWaitRecieveOne = 31;//待收货
const orderStateComplete = 40;//已完成 const orderStateComplete = 40;//已完成
const orderStateClose = -1;//关闭定单 const orderStateClose = -1;//关闭定单
const receivePayment = 1;//商家收到货款了 const receivePayment = 1;//商家收到货款了
......
application/library/Our/OrderConst.php
View file @ ac1d3fe3
...@@ -13,7 +13,7 @@ class OrderConst { ...@@ -13,7 +13,7 @@ class OrderConst {
const waitRecieve="待收货"; const waitRecieve="待收货";
const waitPay="待付款"; const waitPay="待付款";
const waitYouPay="等待您付款"; const waitYouPay="等待您付款";
const waitSend="待发货"; const waitSend="配送中";
const waitSellerSend="等待卖家发货"; const waitSellerSend="等待卖家发货";
const sellerSended="商家已发货"; const sellerSended="商家已发货";
const waitGetFromShop="待到店自取"; const waitGetFromShop="待到店自取";
......
application/models/Business/Order/OrderService.php
View file @ ac1d3fe3
...@@ -123,15 +123,15 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -123,15 +123,15 @@ class OrderServiceModel extends \Business\AbstractModel
if($orderState==ApiConst::orderStateComplete){ if($orderState==ApiConst::orderStateComplete){
$where['evaluation_state']=ApiConst::waitEvaluation; $where['evaluation_state']=ApiConst::waitEvaluation;
} }
// if($orderState==ApiConst::orderStateWaitRecieve){ if($orderState==ApiConst::orderStateWaitRecieveOne){
// $where['shipping_type']=array('eq',ApiConst::bySeller); $where['shipping_type']=array('eq',ApiConst::bySeller);
// $where['order_state'] =array('in',array(ApiConst::orderStateWaitSend,ApiConst::orderStateWaitRecieve)); $where['order_state'] =array('in',array(ApiConst::orderStateWaitSend,ApiConst::orderStateWaitRecieve));
// } }
// if($orderState==ApiConst::orderStateWaitSend){ if($orderState==ApiConst::orderStateWaitSendOne){
// $where['shipping_type']=array('eq',ApiConst::bySelf); $where['shipping_type']=array('eq',ApiConst::bySelf);
// $where['order_state']=array('eq',ApiConst::orderStateWaitRecieve); $where['order_state']=array('eq',ApiConst::orderStateWaitRecieve);
// } }
$where['order_state'] = array('in', explode(',', $orderState)); // $where['order_state'] = array('in', explode(',', $orderState));
} }
} }
......
application/models/DAO/Order/Order.php
View file @ ac1d3fe3
...@@ -436,9 +436,9 @@ class OrderModel extends \DAO\AbstractModel ...@@ -436,9 +436,9 @@ class OrderModel extends \DAO\AbstractModel
$orderText = ''; $orderText = '';
if ($order['orderState'] == ApiConst::orderStateWaitRecieve) { if ($order['orderState'] == ApiConst::orderStateWaitRecieve) {
$orderText = OrderConst::getOnShop;//默认到店自取 $orderText = OrderConst::getOnShop;//默认到店自取
if ($order['shippingType'] == ApiConst::express) { // if ($order['shippingType'] == ApiConst::express) {
$orderText = OrderConst::waitRecieve; // $orderText = OrderConst::waitRecieve;
} // }
if ($order['shippingType'] == ApiConst::bySeller) { if ($order['shippingType'] == ApiConst::bySeller) {
$orderText = OrderConst::sendding; $orderText = OrderConst::sendding;
} }
......
application/views/qa/test.html
View file @ ac1d3fe3
<table class="" style="test-align:center"> <p>更新备注</p><p>请求参数</p><p>orderState:订单状态（多个用英文逗号分割），全部时不用传此参数为:待付款:10:待自提，26，待收货：31，待评价：40 旧版弃用 的状态待发货,25：待收货 30</p><p>
返回的文案参考列表</p>
<table class="">
<tbody> <tbody>
<tr> <tr>
<td> 订单状态(orderState)</td> <td> 订单状态
<td> 配送类型(shippingType)</td> orderState
<td> 支付状态（isReceivePayment）</td> </td>
<td><span style="color: rgb(51, 51, 51); font-family: " arial="" negreta",="" arial;="" font-size:="" 13px;="" <td> 配送类型
font-weight:="" 700;="" text-align:="" center;="" white-space:="" normal;"="">订单状态（列表文案）</span> </td> shippingType
</td>
<td> 支付状态
isReceivePayment
</td>
<td> 订单下单时间<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: "
kern";="" font-kerning:="" normal;="" color:="" rgb(51,="" 51,="" 51);="" font-family:="" "arial=""
negreta",="" arial;="" font-size:="" 13px;="" font-weight:="" 700;="" text-align:="" center;=""
white-space:="" normal;"="">（跟当前时间对比）</p></td>
<td> 删除订单</td>
<td> 订单状态（列表文案）</td>
<td> 商品额外文案</td> <td> 商品额外文案</td>
<td> 状态/倒计时</td> <td> 商品额外操作</td>
<td> 用户文案</td>
<td> 用户操作（按钮）</td>
<td> 店家文案</td>
<td> 店家操作</td> <td> 店家操作</td>
</tr> </tr>
<tr> <tr>
<td> 20</td> <td>-1/ 0/40</td>
<td></td>
<td></td>
<td> &lt;10分钟</td>
<td></td>
<td><br></td>
<td></td>
<td></td>
<td></td>
<td><span style="color: rgb(51, 51, 51); font-family: " arial="" normal",="" arial;="" font-size:="" 13px;=""
text-align:="" center;="" white-space:="" normal;"="">取消订单</span></td>
<td></td>
<td></td>
</tr>
<tr>
<td> 10</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td> 待付款</td>
<td> 10分钟内未付款订单将自动关闭</td>
<td></td>
<td> 等待您付款<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: "
kern";="" font-kerning:="" normal;="" color:="" rgb(51,="" 51,="" 51);="" font-family:="" "arial=""
normal",="" 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: "
kern";="" font-kerning:="" normal;="" color:="" rgb(51,="" 51,="" 51);="" font-family:="" "arial=""
normal",="" arial;="" font-size:="" 13px;="" text-align:="" center;="" white-space:="" normal;"="">取消订单</p>
</td>
<td></td> <td></td>
<td> 1541568512（大于0的时间戳）</td>
<td> 待接单</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>
<tr> <tr>
<td> 20</td> <td> 20</td>
<td></td> <td></td>
<td> 0</td> <td></td>
<td> 待接单</td> <td></td>
<td></td> <td></td>
<td> 请尽快确认订单<p <td>待接单<br></td>
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;"> <td></td>
剩余关闭时间：5分 23秒</p></td> <td></td>
<td> 修改价格<p <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;"> style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: "
确认收款</p> kern";="" font-kerning:="" normal;="" color:="" rgb(51,="" 51,="" 51);="" font-family:="" "arial=""
<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;"> normal",="" arial;="" font-size:="" 13px;="" text-align:="" center;="" white-space:="" normal;"="">剩余关闭时间：5分
接单</p></td> 23秒</p></td>
<td> 取消订单</td>
<td></td>
<td></td>
</tr> </tr>
<tr> <tr>
<td> 25</td>
<td></td> <td></td>
<td> 大于0的时间戳</td>
<td></td> <td></td>
<td></td> <td></td>
<td> 待付款</td> <td>配送中<br></td>
<td></td>
<td> 退款<span style="font-family: " arial="" normal",="" arial;="" font-size:="" 13px;="" text-align:=""
center;="" white-space:="" normal;="" color:="" rgb(255,="" 0,="" 0);"="">（退款规则）</span></td>
<td> 等待卖家发货</td>
<td> 提醒发货（调用店家IM界面）</td>
<td></td>
<td></td> <td></td>
<td> 待线上付款</td>
<td> 修改价格</td>
</tr> </tr>
<tr> <tr>
<td> 25</td>
<td></td> <td></td>
<td> 0</td>
<td></td>
<td></td>
<td> 配送中</td>
<td></td>
<td></td>
<td> 等待卖家发货</td>
<td> 提醒发货（调用店家IM界面）</td>
<td></td> <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>
<tr> <tr>
<td> 30</td>
<td> 1</td>
<td> 大于0的时间戳<br></td>
<td></td> <td></td>
<td></td> <td></td>
<td> 配送中</td>
<td></td>
<td> 退款<br></td>
<td> 配送中</td>
<td> 确认收货</td>
<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>
<tr> <tr>
<td> 30</td>
<td> 1</td>
<td> 0</td>
<td></td> <td></td>
<td></td> <td></td>
<td> 配送中</td>
<td></td> <td></td>
<td> 待自提</td> <td><br></td>
<td> {售后状态}<span <td> 配送中</td>
style="color: rgb(0, 0, 0); font-family: &quot;Arial Normal&quot;, Arial; font-size: 13px; white-space: normal; text-align: center;">（可能存在）</span> <td> 确认收货<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: "
kern";="" font-kerning:="" normal;="" color:="" rgb(51,="" 51,="" 51);="" font-family:="" "arial=""
normal",="" arial;="" font-size:="" 13px;="" text-align:="" center;="" white-space:="" normal;"="">取消订单</p>
</td> </td>
<td></td>
<td></td>
</tr>
<tr>
<td> 30</td>
<td> 0</td>
<td> 大于0的时间戳</td>
<td></td>
<td></td>
<td> 到店自提</td>
<td></td>
<td> 退款</td>
<td> 待到店自取</td> <td> 待到店自取</td>
<td> 修改价格<p <td> 确认收货</td>
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;"> <td></td>
确认收款</p></td> <td></td>
</tr> </tr>
<tr> <tr>
<td> 30</td>
<td> 0</td>
<td> 0</td>
<td></td> <td></td>
<td></td> <td></td>
<td> 到店自提</td>
<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>
<td><p style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: "
kern";="" font-kerning:="" normal;="" color:="" rgb(51,="" 51,="" 51);="" font-family:="" "arial=""
normal",="" arial;="" font-size:="" 13px;="" text-align:="" center;="" white-space:="" normal;"="">确认收货</p>
<span style="color: rgb(51, 51, 51); font-family: " arial="" normal",="" arial;="" font-size:="" 13px;=""
text-align:="" center;="" white-space:="" normal;"="">取消订单</span> </td>
<td></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td> 40</td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td> 可以</td>
<td> 已完成</td> <td> 已完成</td>
<td> {售后状态}<span <td></td>
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> <td> 订单已完成</td>
<td> 未收到货（调用店家IM界面）<p
style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: "
kern";="" font-kerning:="" normal;="" color:="" rgb(51,="" 51,="" 51);="" font-family:="" "arial=""
normal",="" arial;="" font-size:="" 13px;="" text-align:="" center;="" white-space:="" normal;"="">去评价</p>
</td>
<td></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td> 0</td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td> 可以</td>
<td> 已取消</td> <td> 已取消</td>
<td> {售后状态}<span <td></td>
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 <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;"> style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: "
{取消原因}（orderNote）</p></td> kern";="" font-kerning:="" normal;="" color:="" rgb(51,="" 51,="" 51);="" font-family:="" "arial=""
normal",="" arial;="" font-size:="" 13px;="" text-align:="" center;="" white-space:=""
normal;"="">{取消原因}</p></td>
<td></td>
<td></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td> -1</td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td> 可以</td>
<td> 已关闭</td> <td> 已关闭</td>
<td> {售后状态}<span <td></td>
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 <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;"> style="margin-top: 0px; margin-bottom: 0px; text-rendering: optimizeLegibility; font-feature-settings: "
{关闭原因}(orderNodte)</p></td> kern";="" font-kerning:="" normal;="" color:="" rgb(51,="" 51,="" 51);="" font-family:="" "arial=""
normal",="" arial;="" font-size:="" 13px;="" text-align:="" center;="" white-space:=""
normal;"="">{关闭原因}</p></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td></td> <td></td>
...@@ -155,7 +250,11 @@ ...@@ -155,7 +250,11 @@
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table><p><br></p> </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