Skip to content

M
my-yaf-project
Commit 31afbbc5 authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

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

parents 12fa3995 e4f05735
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 112 deletions
application/models/DAO/Member.php
View file @ 31afbbc5
...@@ -536,7 +536,6 @@ class MemberModel extends \DAO\AbstractModel ...@@ -536,7 +536,6 @@ class MemberModel extends \DAO\AbstractModel
case ApiConst::orderStateWaitPay: case ApiConst::orderStateWaitPay:
$type = NameConst::waitPay; $type = NameConst::waitPay;
break; break;
case ApiConst::orderStateWaitConfirm:
case ApiConst::orderStateWaitSend: case ApiConst::orderStateWaitSend:
$type = NameConst::waitShipments; $type = NameConst::waitShipments;
break; break;
......
application/models/DAO/Order/Order.php
View file @ 31afbbc5
...@@ -846,6 +846,7 @@ class OrderModel extends \DAO\AbstractModel ...@@ -846,6 +846,7 @@ class OrderModel extends \DAO\AbstractModel
$favoritesStoreDao->deleteGetFavoritesCountByStoreId($stroeId); $favoritesStoreDao->deleteGetFavoritesCountByStoreId($stroeId);
} }
$this->deleteGetListByMemberId($stroeId);
$orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName); $orderGoodsDao = \DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
$orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId,$stroeId); $orderGoodsDao->deleteOrderGoodsCache($memberId, $orderId,$stroeId);
} }
......
public/test/shopkeeper/orders.php 100755 → 100644
View file @ 31afbbc5
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br /> 用户登录状态key:<input name="data[key]" value="ceb72deab920ac0edb7272b2ed9dfa1e"/><br />
订单状态id:<input name="data[orderState]" value=""/><br /> 订单状态id:<input name="data[orderState]" value=""/><br />
订单号:<input name="data[keyword]" value="400"/><br /> keyword:<input name="data[keyword]" value="400"/><br />
<p id="img_area"></p> <p id="img_area"></p>
<input type="submit" value="提交"> <input type="submit" value="提交">
</form> </form>
......
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