【新增】天猫超市商品下载同步

【修复】天猫超市发货问题
【修复】采购单单号因含特殊字符导致入库或取消失败
【修复】售后批量操作设置显示不正确

app/ome/controller/admin/order.php

@@ -4294,7 +4294,13 @@ class ome_ctl_admin_order extends desktop_controller{
                         $tmp = array();
                         $tmp = $o['items'];
                         unset($o['items']);
-
+                        
+                        // 更新pay_status状态值
+                        //@todo：解决手工批量删除赠品，又手工编辑订单进行恢复，导致pay_status='5'退款状态，无法审核订单;
+                        if($o['delete'] == 'false' && $o['price'] == '0'){
+                            $o['pay_status'] = '0';
+                        }
+                        
                         $oOrderObj->save($o);
                         foreach ($tmp as $oo){
 

app/ome/controller/admin/order/lack.php

@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 /**
  * 缺货列表
  */
@@ -28,11 +29,10 @@ class ome_ctl_admin_order_lack extends desktop_controller {
     }
     /**
      * 缺货搜索
-     * 
+     *
      * @param void
      * @return void
      */
-
     function index() {
 
         $params = array(
@@ -349,7 +349,7 @@ class ome_ctl_admin_order_lack extends desktop_controller {
 
     /**
      * 缺货订单列表
-     * 
+     *
      * @return void
      * @author
      */
@@ -383,10 +383,6 @@ class ome_ctl_admin_order_lack extends desktop_controller {
         $this->finder('ome_mdl_orders',$params);
     }
 
-    /**
-     * routerAgain
-     * @return mixed 返回值
-     */
     public function routerAgain() {
 
         $batchLogModel = app::get('ome')->model('batch_log');
@@ -429,10 +425,6 @@ class ome_ctl_admin_order_lack extends desktop_controller {
         return $params;
     }
 
-    /**
-     * routerSpilt
-     * @return mixed 返回值
-     */
     public function routerSpilt() {
 //        $key = 'ome-order-lack-router';
 //        cachecore::store($key, time(), 360);
@@ -457,10 +449,6 @@ class ome_ctl_admin_order_lack extends desktop_controller {
         echo json_encode($retArr);
     }
 
-    /**
-     * apply
-     * @return mixed 返回值
-     */
     public function apply() {
         $order_id = (int) $_GET['order_id'];
         $order = app::get('ome')->model('orders')->db_dump($order_id, 'shop_type, order_source');
@@ -480,7 +468,7 @@ class ome_ctl_admin_order_lack extends desktop_controller {
             exit;
         }
         $bmIds = array_column($order_items, 'product_id');
-        $branch_id = current($appointBranch)['branch_id'];
+        $branch_id = current($appointBranch);
         $branch_product = app::get('ome')->model('branch_product')->getList('product_id, store, store_freeze', 
             ['branch_id'=>$branch_id, 'product_id'=>$bmIds]);
         $branch_product = array_column($branch_product, null, 'product_id');
@@ -509,10 +497,6 @@ class ome_ctl_admin_order_lack extends desktop_controller {
         $this->singlepage('admin/order/lack/apply.html');
     }
 
-    /**
-     * dealApply
-     * @return mixed 返回值
-     */
     public function dealApply() {
         $order_id = (int) $_POST['order_id'];
         $out_stock = $_POST['out_stock'];

app/ome/controller/admin/return/batch.php

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 class ome_ctl_admin_return_batch extends desktop_controller {
 
     var $workground = "setting_tools";
@@ -54,6 +53,7 @@ class ome_ctl_admin_return_batch extends desktop_controller {
             }
         }
         $oReturn_batch = $this->app->model('return_batch');
+        $return_batch = array();
         if ($batch_id) {
             $return_batch = $oReturn_batch->dump($batch_id);
         }
@@ -119,4 +119,4 @@ class ome_ctl_admin_return_batch extends desktop_controller {
    
 }
 
-?>
+?>

app/ome/controller/admin/return/rchange.php

@@ -16,7 +16,6 @@
  */
 class ome_ctl_admin_return_rchange extends desktop_controller
 {
-
     public $name       = "退换货单";
     public $workground = "aftersale_center";
 
@@ -522,7 +521,6 @@ class ome_ctl_admin_return_rchange extends desktop_controller
             $is_auto_approve = app::get('ome')->getConf('return.auto_approve');
             if ($is_auto_approve == 'on') {
                 $reshipLib = kernel::single('ome_reship');
-
                 $result = $reshipLib->batch_reship_queue($reship[0]['reship_id']);
             }
         }
@@ -538,6 +536,7 @@ class ome_ctl_admin_return_rchange extends desktop_controller
 
     /**
      * 根据order_bn快速获取订单信息（售后申请、退换货单2处加载订单信息）
+     *
      * @author yangminsheng
      **/
     public function getOrderinfo()
@@ -640,7 +639,7 @@ class ome_ctl_admin_return_rchange extends desktop_controller
             $branchLib = kernel::single('ome_branch');
             $store_id  = $branchLib->isStoreBranch($order["branch_id"]);
             if ($store_id) {
-//是门店仓
+                //是门店仓
                 $order["branch_list"] = kernel::single('o2o_return')->get_aftersale_o2o_branch($order["branch_id"]);
                 //售后设置->退货仓库设置 类型选择：发货仓库的
                 $branchtype = app::get('wms')->getConf('wms.branchset.type');
@@ -659,7 +658,7 @@ class ome_ctl_admin_return_rchange extends desktop_controller
                     }
                 }
             } else {
-//是电商仓
+                //是电商仓
                 $order["branch_list"] = app::get('ome')->model('branch')->getlist('branch_id,name', array('disabled' => 'false', 'b_type' => 1));
             }
             $order['member_uname']       = $member['account']['uname'];
@@ -4167,7 +4166,6 @@ class ome_ctl_admin_return_rchange extends desktop_controller
         }
     }
     
-    
     /**
      * 验证页面配置项
      */