客户修改

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/StoreInfoServiceImpl.java

@@ -93,4 +93,9 @@ public class StoreInfoServiceImpl implements StoreInfoService {
         }
         return flag;
     }
+
+//    @Override
+//    public List<StoreInfo> listStore(StoreInfo storeInfo) {
+//        return storeInfoMapper.listStore(storeInfo);
+//    }
 }

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

@@ -1469,7 +1469,7 @@
           pt.proc_type_id procTypeId,
           ddc.deal_channel_name AS dealChannelName,
           dd.dealer_name AS dealerName,
-          SUM(oi.item_cost_total) AS cost_total,
+          xxnewsoi.cost_total AS cost_total,
           ifnull(dco.claim_order_id,0) AS orderIscostTotal
         from tb_rst_sales_order_info
         LEFT JOIN tb_rst_store_info si ON  tb_rst_sales_order_info.sales_store_id = si.store_id
@@ -1483,6 +1483,14 @@
         LEFT JOIN tb_rst_cm_proc_type pt ON pt.proc_type_id = pm.proc_type_id
         LEFT JOIN tb_rst_sys_admin sa ON tb_rst_sales_order_info.sales_admin_id = sa.admin_id
         LEFT JOIN tb_rst_dm_claim_order dco on oi.item_id=dco.item_id
+        LEFT JOIN (
+            SELECT
+            xxsoi.sales_id,
+            SUM(xxoi.item_cost_total) AS cost_total
+            FROM tb_rst_sales_order_info xxsoi
+            LEFT JOIN tb_rst_sales_order_item xxoi ON xxsoi.sales_id = xxoi.item_order_id
+            GROUP BY xxsoi.sales_id
+        )xxnewsoi ON tb_rst_sales_order_info.sales_id = xxnewsoi.sales_id
         <where>
             <if test="salesShippingStatus !=null">
                 AND sales_shipping_status = #{salesShippingStatus}

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/dm_order_statistics.ftl

@@ -102,12 +102,12 @@
                     <option <#if (salesOrder.orderIscostTotal)??><#if salesOrder.orderIscostTotal == 2>selected="selected"</#if></#if> value ="2" >未认领</option>
                 </select>
 
-                <select class="select" name="colorId" id="colorId"  style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
-                    <option value="">产品名称(颜色)</option>
-                    <#list productColorList as productColor>
-                        <option <#if (salesOrder.colorId)??><#if salesOrder.colorId == productColor.colorId>selected="selected"</#if></#if> value="${productColor.colorId}">${productColor.productName}(${productColor.colorName})</option>
-                    </#list>
-                </select>
+                <#--<select class="select" name="colorId" id="colorId"  style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">-->
+                    <#--<option value="">产品名称(颜色)</option>-->
+                    <#--<#list productColorList as productColor>-->
+                        <#--<option <#if (salesOrder.colorId)??><#if salesOrder.colorId == productColor.colorId>selected="selected"</#if></#if> value="${productColor.colorId}">${productColor.productName}(${productColor.colorName})</option>-->
+                    <#--</#list>-->
+                <#--</select>-->
 
                         <select class="chosenColorId "name="colorId" id="colorId"  >
                             <option value="">产品名称(颜色)</option>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/select_order_list.ftl

@@ -249,6 +249,7 @@
                 salesAddressTel : salesAddressTel,
                 colorId : colorId,
                 orderIscostTotal : orderIscostTotal,
+                orderIscostTotal : 1,
                 startDate : startDate,
                 endDate : endDate,
                 orderDateType : 1,