Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/approvalOrderMapper.xml

@@ -126,7 +126,7 @@
 
   <select id="listApprovalOrderItem" parameterType="Integer" resultType="ApprovalOrderItem">
     SELECT
-    <!--<include refid="Base_Column_List" />-->
+    <include refid="order_item_column_List" />
     FROM tb_rst_approval_order_item
     WHERE approval_id = #{approvalId}
   </select>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -85,9 +85,6 @@
       <if test="salesOrderStatus !=null">
         AND sales_order_status = #{salesOrderStatus}
       </if>
-      <if test="salesDeliver !=null">
-        AND sales_deliver = #{salesDeliver}
-      </if>
       <if test="salesStoreId !=null and salesStoreId !=''">
         AND sales_store_id = #{salesStoreId}
       </if>
@@ -140,94 +137,9 @@
         </foreach >
       </if>
     </where>
-    GROUP BY tb_rst_sales_order_info.sales_id
     ORDER BY sales_create_time DESC
   </select>
 
-    <!-- 订单数量 -->
-    <select id="listSalesOrderNum" resultType="Integer" parameterType="SalesOrder" >
-    SELECT COUNT(0)
-    FROM (
-        select
-          tb_rst_sales_order_info.sales_id
-        from tb_rst_sales_order_info
-        LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
-        LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
-        LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
-        LEFT JOIN tb_rst_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
-        LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
-        <where>
-                <if test="salesIsDownload !=null and salesIsDownload !=''">AND sales_is_download = #{salesIsDownload}
-                </if>
-                <if test="
-            salesShippingStatus !=null">
-                    AND sales_shipping_status = #{salesShippingStatus}
-                </if>
-                <if test="salesDeliver !=null">
-                    AND sales_deliver = #{salesDeliver}
-                </if>
-                <if test="salesStatus !=null">
-                    AND sales_status = #{salesStatus}
-                </if>
-                <if test="salesOrderStatus !=null">
-                    AND sales_order_status = #{salesOrderStatus}
-                </if>
-                <if test="salesStoreId !=null and salesStoreId !=''">
-                    AND sales_store_id = #{salesStoreId}
-                </if>
-                <if test="salesPostFirm !=null and salesPostFirm !=''">
-                    AND sales_post_firm = #{salesPostFirm}
-                </if>
-                <if test="salesCompanyId !=null and salesCompanyId !=''">
-                    AND sales_company_id = #{salesCompanyId}
-                </if>
-                <if test="salesId !=null">
-                    AND sales_id = #{salesId}
-                </if>
-                <if test="salesOrderId !=null and salesOrderId !=''">
-                    AND sales_orderId = #{salesOrderId}
-                </if>
-                <if test="salesDealCode !=null and salesDealCode !=''">
-                    AND sales_deal_code = #{salesDealCode}
-                </if>
-                <if test="salesAddressTel !=null and salesAddressTel !=''">
-                    AND sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
-                </if>
-                <if test="salesAddressName !=null and salesAddressName !=''">
-                    AND sales_address_name like CONCAT('%',#{salesAddressName},'%')
-                </if>
-                <if test="salesBatchId !=null and salesBatchId !=''">
-                    AND sales_batch_id = #{salesBatchId}
-                </if>
-                <if test="salesAddressInfo !=null and salesAddressInfo !=''">
-                    AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
-                </if>
-                <if test="itemProductName !=null and itemProductName !=''">
-                    AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
-                </if>
-                <if test="startDate != null and startDate != ''">
-                    AND sales_create_time <![CDATA[>=]]> #{startDate}
-                </if>
-                <if test="endDate != null and endDate != ''">
-                    AND sales_create_time <![CDATA[<=]]> #{endDate}
-                </if>
-                <if test="salesAdminId != null ">
-                    AND sales_admin_id = #{salesAdminId}
-                </if>
-                <if test="salesAddType != null ">
-                    AND sales_add_type = #{salesAddType}
-                </if>
-                <if test="salesIds != null and salesIds != ''">
-                    AND sales_id IN
-                    <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
-                        #{node}
-                    </foreach >
-                </if>
-            </where>
-            GROUP BY tb_rst_sales_order_info.sales_id
-        )xx
-    </select>
-
   <!-- 订单项集合 -->
   <select id="listSalesOrderItem" resultType="SalesOrderItem" parameterType="SalesOrderItem" >
         SELECT
@@ -275,9 +187,6 @@
       <if test="salesShippingStatus !=null ">
         AND sales_shipping_status = #{salesShippingStatus}
       </if>
-        <if test="salesDeliver !=null">
-            AND sales_deliver = #{salesDeliver}
-        </if>
       <if test="salesStoreId !=null">
         AND sales_store_id = #{salesStoreId}
       </if>
@@ -333,9 +242,6 @@
         <if test="salesShippingStatus !=null">
           AND sales_shipping_status = #{salesShippingStatus}
         </if>
-          <if test="salesDeliver !=null">
-              AND sales_deliver = #{salesDeliver}
-          </if>
         <if test="salesStoreId !=null and salesStoreId !=''">
           AND sales_store_id = #{salesStoreId}
         </if>
@@ -844,105 +750,16 @@
       WHERE t.sales_batch_id = #{salesBatchId}
   </select>
 
-
-    <!-- 按照批次查询订单项，并下载，订单列表主要按照订单项来排列 -->
-    <select id="listSalesOrderAndItemNum" parameterType="SalesOrder" resultType="Integer">
-        SELECT
-          COUNT(soi.item_id)
-        FROM
-        tb_rst_sales_order_info t
-        LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
-        LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
-        <where>
-            <if test="salesIsDownload !=null ">
-                AND t.sales_is_download = #{salesIsDownload}
-            </if>
-            <if test="salesStatus !=null ">
-                AND t.sales_status = #{salesStatus}
-            </if>
-            <if test="salesShippingStatus !=null">
-                AND t.sales_shipping_status = #{salesShippingStatus}
-            </if>
-            <if test="salesDeliver !=null">
-                AND sales_deliver = #{salesDeliver}
-            </if>
-            <if test="salesStoreId !=null and salesStoreId !=''">
-                AND t.sales_store_id = #{salesStoreId}
-            </if>
-            <if test="salesId !=null">
-                AND t.sales_id = #{salesId}
-            </if>
-            <if test="salesOrderId !=null and salesOrderId !=''">
-                AND t.sales_orderId = #{salesOrderId}
-            </if>
-            <if test="salesDealCode !=null and salesDealCode !=''">
-                AND t.sales_deal_code = #{salesDealCode}
-            </if>
-            <if test="salesAddressTel !=null and salesAddressTel !=''">
-                AND t.sales_address_tel = #{salesAddressTel}
-            </if>
-            <if test="salesAddressName !=null and salesAddressName !=''">
-                AND t.sales_address_name = #{salesAddressName}
-            </if>
-            <if test="salesBatchId !=null and salesBatchId !=''">
-                AND t.sales_batch_id = #{salesBatchId}
-            </if>
-            <if test="startDate != null and startDate != ''">
-                AND t.sales_create_time <![CDATA[>=]]> #{startDate}
-            </if>
-            <if test="endDate != null and endDate != ''">
-                AND t.sales_create_time <![CDATA[<=]]> #{endDate}
-            </if>
-        </where>
-    </select>
-
   <!-- 按照批次查询订单项，并下载，订单列表主要按照订单项来排列 -->
   <select id="listSalesOrderAndItem" parameterType="SalesOrder" resultType="SalesOrder">
-        SELECT
-            t.*,
-            soi.*
-        FROM
-            tb_rst_sales_order_info t
-        LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
-        LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
-      <where>
-          <if test="salesIsDownload !=null ">
-              AND t.sales_is_download = #{salesIsDownload}
-          </if>
-          <if test="salesStatus !=null ">
-              AND t.sales_status = #{salesStatus}
-          </if>
-          <if test="salesShippingStatus !=null">
-              AND t.sales_shipping_status = #{salesShippingStatus}
-          </if>
-          <if test="salesStoreId !=null and salesStoreId !=''">
-              AND t.sales_store_id = #{salesStoreId}
-          </if>
-          <if test="salesId !=null">
-              AND t.sales_id = #{salesId}
-          </if>
-          <if test="salesOrderId !=null and salesOrderId !=''">
-              AND t.sales_orderId = #{salesOrderId}
-          </if>
-          <if test="salesDealCode !=null and salesDealCode !=''">
-              AND t.sales_deal_code = #{salesDealCode}
-          </if>
-          <if test="salesAddressTel !=null and salesAddressTel !=''">
-              AND t.sales_address_tel = #{salesAddressTel}
-          </if>
-          <if test="salesAddressName !=null and salesAddressName !=''">
-              AND t.sales_address_name = #{salesAddressName}
-          </if>
-          <if test="salesBatchId !=null and salesBatchId !=''">
-              AND t.sales_batch_id = #{salesBatchId}
-          </if>
-          <if test="startDate != null and startDate != ''">
-              AND t.sales_create_time <![CDATA[>=]]> #{startDate}
-          </if>
-          <if test="endDate != null and endDate != ''">
-              AND t.sales_create_time <![CDATA[<=]]> #{endDate}
-          </if>
-      </where>
+    SELECT
+        t.*,
+        soi.*
+    FROM
+        tb_rst_sales_order_info t
+    LEFT JOIN tb_rst_store_info si ON t.sales_store_id = si.store_id
+    LEFT JOIN tb_rst_sales_order_item soi ON t.sales_id = soi.item_order_id
+    WHERE t.sales_batch_id = #{salesBatchId}
   </select>
 
   <!-- 按照批次查询订单项，并下载，订单列表主要按照订单项来排列 -->
@@ -1020,31 +837,4 @@
             </if>
         </where>
     </update>
-
-
-    <select id="getSalesOrderByPostNum" resultType="SalesOrder" parameterType="String" >
-        select
-             sales_id,
-             sales_orderId,
-             sales_openId,
-             sales_send_type,
-             sales_shipping_status,
-             sales_status,
-             sales_post_num,
-             ifnull(sales_deliver,0) AS  sales_deliver
-        from tb_rst_sales_order_info t
-        where sales_post_num = #{postNum}
-    </select>
-
-    <!-- 出库 -->
-    <update id="updateDeliver" parameterType="SalesOrder" >
-        update tb_rst_sales_order_info
-        SET
-          sales_deliver = 2
-        WHERE
-          sales_post_num = #{salesPostNum}
-        AND sales_id = #{salesId}
-        AND sales_shipping_status = 1
-    </update>
-
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -769,6 +769,8 @@ public class AdminOrderController {
         titles.add("商品名称");
         titles.add("商品颜色");
         titles.add("商品数量");
+        titles.add("销售公司名称");
+        titles.add("店铺名称");
         model.put("titles", titles);
         PtsBatch ptsBatch = new PtsBatch();
         List<List<Object>> countexts = new ArrayList<List<Object>>();
@@ -796,6 +798,8 @@ public class AdminOrderController {
                 row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName());
                 row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
                 row.add(salesOrder.getItemNum() == null ? null:salesOrder.getItemNum());
+                row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
+                row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
                 countexts.add(row);
             }
         }
@@ -909,6 +913,12 @@ public class AdminOrderController {
             case "longbanwuliu":
                 name= "龙邦快递";
                 break;
+            case "YZPY":
+                name= "省外EMS";
+                break;
+            case "EYB":
+                name= "省外EMS";
+                break;
             default:
                 break;
         }