|
@@ -1577,50 +1577,49 @@ class Buy
|
|
|
if ($audit > 1 && $info && $info['status'] == 2) {
|
|
|
|
|
|
$shop = Dever::db('shop/info')->find($info['type_id']);
|
|
|
- if (strstr($info['order_num'], '_')) {
|
|
|
- $temp = explode('_', $info['order_num']);
|
|
|
- $info['order_num'] = $temp[0];
|
|
|
- $info['order_index'] = $temp[1];
|
|
|
- } else {
|
|
|
- $info['order_index'] = 0;
|
|
|
- }
|
|
|
- $goods = explode(',', $goods);
|
|
|
- $data = $other = array();
|
|
|
- foreach ($goods as $k => $v) {
|
|
|
- list($source_type, $source_id, $name, $goods_id) = explode('_', $v);
|
|
|
- $gv = Dever::db('shop/buy_order_goods')->find($goods_id);
|
|
|
- if ($source_id > 0) {
|
|
|
- $key = $source_type . '_' . $source_id;
|
|
|
- $data[$key][] = array
|
|
|
- (
|
|
|
- 'area' => $shop['area'],
|
|
|
- 'order_id' => $info['id'],
|
|
|
- 'order_type' => $info['type'],
|
|
|
- 'order_num' => $info['order_num'],
|
|
|
- 'order_index' => $info['order_index'],
|
|
|
- 'type' => 1,
|
|
|
- 'type_id' => $shop['id'],
|
|
|
- 'source_type' => $source_type,
|
|
|
- 'source_id' => $source_id,
|
|
|
- 'order_goods_id' => $gv['id'],
|
|
|
- 'goods_id' => $gv['goods_id'],
|
|
|
- 'sku_id' => $gv['sku_id'],
|
|
|
- 'price' => $gv['price'],
|
|
|
- 'p_price' => $gv['price'],
|
|
|
- 'num' => $gv['num'],
|
|
|
- );
|
|
|
- } else {
|
|
|
- $other[] = $gv;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- $this->audit_action($data, $other, $info, $shop, '未选择供货商');
|
|
|
+
|
|
|
|
|
|
Dever::db('shop/buy_order')->update(array('where_id' => $info['id'], 'audit' => $audit, 'audit_desc' => $audit_text));
|
|
|
if ($audit == 2) {
|
|
|
|
|
|
- Dever::setInput('order_id', $id);
|
|
|
- Dever::load('mshop/lib/buy.audit_commit');
|
|
|
+ if (strstr($info['order_num'], '_')) {
|
|
|
+ $temp = explode('_', $info['order_num']);
|
|
|
+ $info['order_num'] = $temp[0];
|
|
|
+ $info['order_index'] = $temp[1];
|
|
|
+ } else {
|
|
|
+ $info['order_index'] = 0;
|
|
|
+ }
|
|
|
+ $goods = explode(',', $goods);
|
|
|
+ $data = $other = array();
|
|
|
+ foreach ($goods as $k => $v) {
|
|
|
+ list($source_type, $source_id, $name, $goods_id) = explode('_', $v);
|
|
|
+ $gv = Dever::db('shop/buy_order_goods')->find($goods_id);
|
|
|
+ if ($source_id > 0) {
|
|
|
+ $key = $source_type . '_' . $source_id;
|
|
|
+ $data[$key][] = array
|
|
|
+ (
|
|
|
+ 'area' => $shop['area'],
|
|
|
+ 'order_id' => $info['id'],
|
|
|
+ 'order_type' => $info['type'],
|
|
|
+ 'order_num' => $info['order_num'],
|
|
|
+ 'order_index' => $info['order_index'],
|
|
|
+ 'type' => 1,
|
|
|
+ 'type_id' => $shop['id'],
|
|
|
+ 'source_type' => $source_type,
|
|
|
+ 'source_id' => $source_id,
|
|
|
+ 'order_goods_id' => $gv['id'],
|
|
|
+ 'goods_id' => $gv['goods_id'],
|
|
|
+ 'sku_id' => $gv['sku_id'],
|
|
|
+ 'price' => $gv['price'],
|
|
|
+ 'p_price' => $gv['price'],
|
|
|
+ 'num' => $gv['num'],
|
|
|
+ );
|
|
|
+ } else {
|
|
|
+ $other[] = $gv;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ $this->audit_action($data, $other, $info, $shop, '未选择供货商');
|
|
|
} else {
|
|
|
|
|
|
$shop = Dever::db('shop/info')->find($info['type_id']);
|