BA报单修改

frontendApi/modules/v1/controllers/ShopController.php

@@ -1173,8 +1173,8 @@ ORDER;
             ->where($condition, $params)
             ->select('DO.*,O.STATUS,U.USER_NAME USER_NAME,U.REAL_NAME REAL_NAME,RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME,OG.SKU_CODE,OG.GOODS_TITLE,OG.BUY_NUMS,OG.REAL_PRICE,OG.REAL_PV,OG.TAX_RATE')
             ->join('LEFT JOIN', BaUser::tableName() . ' AS U', 'DO.TO_USER_ID=U.ID')
-            ->join('LEFT JOIN', BaUser::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID')
-            ->join('LEFT JOIN', BaUser::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID')
+            ->join('LEFT JOIN', User::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID')
+            ->join('LEFT JOIN', User::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID')
             ->join('LEFT JOIN', BaOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=DO.ORDER_SN')
             ->join('LEFT JOIN', BaOrder::tableName() . ' AS O', 'O.SN=DO.ORDER_SN')
             ->orderBy('DO.CREATED_AT DESC');
@@ -1187,8 +1187,8 @@ ORDER;
             ->where($condition . ' AND (O.STATUS = :NOT_PAID OR O.STATUS = :FAIL_PAID)', $params)
             ->select('DO.*,O.STATUS,U.USER_NAME USER_NAME,U.REAL_NAME REAL_NAME,RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME,OG.SKU_CODE,OG.GOODS_TITLE,OG.BUY_NUMS,OG.REAL_PRICE,OG.REAL_PV,OG.TAX_RATE')
             ->join('LEFT JOIN', BaUser::tableName() . ' AS U', 'DO.TO_USER_ID=U.ID')
-            ->join('LEFT JOIN', BaUser::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID')
-            ->join('LEFT JOIN', BaUser::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID')
+            ->join('LEFT JOIN', User::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID')
+            ->join('LEFT JOIN', User::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID')
             ->join('LEFT JOIN', BaApproachOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=DO.ORDER_SN')
             ->join('LEFT JOIN', BaApproachOrder::tableName() . ' AS O', 'O.SN=DO.ORDER_SN')
             ->orderBy('DO.CREATED_AT DESC');
@@ -1240,8 +1240,8 @@ ORDER;
             'from' => BaDecOrder::tableName() . ' AS DO',
             'join' => [
                 ['LEFT JOIN', BaUser::tableName() . ' AS U', 'DO.TO_USER_ID=U.ID'],
-                ['LEFT JOIN', BaUser::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID'],
-                ['LEFT JOIN', BaUser::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID'],
+                ['LEFT JOIN', User::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID'],
+                ['LEFT JOIN', User::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID'],
                 ['LEFT JOIN', BaOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=DO.ORDER_SN'],
                 ['LEFT JOIN', BaOrder::tableName() . ' AS OD', 'OD.SN=DO.ORDER_SN'],
             ],
@@ -1254,8 +1254,8 @@ ORDER;
                 'from' => BaApproachDecOrder::tableName() . ' AS DO',
                 'join' => [
                     ['LEFT JOIN', BaUser::tableName() . ' AS U', 'DO.TO_USER_ID=U.ID'],
-                    ['LEFT JOIN', BaUser::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID'],
-                    ['LEFT JOIN', BaUser::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID'],
+                    ['LEFT JOIN', User::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID'],
+                    ['LEFT JOIN', User::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID'],
                     ['LEFT JOIN', BaApproachOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=DO.ORDER_SN'],
                     ['LEFT JOIN', BaApproachOrder::tableName() . ' AS OD', 'OD.SN=DO.ORDER_SN'],
                 ],

frontendEle/src/views/shop/ba-dec-order-list.vue

@@ -15,7 +15,6 @@
         <el-table-column width="120" label="Member code" prop="USER_NAME"></el-table-column><!--会员编号-->
         <el-table-column width="120" label="Member name" prop="REAL_NAME"></el-table-column><!--会员姓名-->
         <el-table-column width="150" label="Shipping Address" prop="ADDRESS"></el-table-column><!--收货地址-->
-        <el-table-column width="120" label="Sponsor code" prop="CON_USER_NAME"></el-table-column><!--接点人编号-->
         <el-table-column width="120" label="Status" prop="STATUS"></el-table-column><!--状态-->
         <el-table-column width="150" label="Created time" prop="CREATED_AT"></el-table-column >
         <el-table-column width="120" label="Action"><!--操作-->