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

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -81,7 +81,7 @@ public class SalesOrder implements Serializable {
     private String storeEfast;               //Efast 的店铺id
 
     private Integer orderDateType;   //时间类型  1：创建时间   2：打单时间  3：出库时间
-    private Integer isSelectCustomer;   //是否查询客诉订单 1是 2否
+    private Integer isSelectCustomer;   //是否查询客诉订单 1是 2否  订单关联客诉
 
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")

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

@@ -1610,6 +1610,12 @@
             <if test="orderIscostTotal != null and orderIscostTotal == 2">
                 AND dco.item_id is null
             </if>
+            <if test="isSelectCustomer == 1">
+                AND sales_customer_id is NOT null
+            </if>
+            <if test="isSelectCustomer == 2">
+                AND sales_customer_id is null
+            </if>
         </where>
         GROUP BY tb_rst_sales_order_info.sales_id
         ORDER BY tb_rst_sales_order_info.sales_id DESC

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/DmDealerServiceImpl.java

@@ -7,6 +7,7 @@ import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.dm.DmDealerService;
 import com.iamberry.rst.service.dm.mapper.*;
 import com.iamberry.rst.util.PageUtil;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -363,6 +364,7 @@ public class DmDealerServiceImpl  implements DmDealerService {
     public PagedResult<DmDealer> listDmDealerStatistic(PageRequest<DmDealer> pageRequest) {
         PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
         List<DmDealer> dmDealerList = dmDealerMapper.listDmDealerStatistic(pageRequest.getData());
+        LoggerFactory.getLogger(this.getClass()).info("tttttttttt");
         return PageUtil.getPage(dmDealerList);
     }
 

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmDealerMapper.xml

@@ -237,7 +237,7 @@
         LEFT JOIN tb_rst_sys_admin sa ON sa.admin_id = t.create_id
         LEFT JOIN tb_rst_dm_dealer_channel ddc ON ddc.dealer_id = t.dealer_id
         LEFT JOIN tb_rst_dm_dealer_channel_store dcs ON ddc.deal_channel_id = dcs.deal_channel_id
-        LEFT JOIN tb_rst_sales_order_info soi ON dcs.store_id = soi.sales_store_id
+        LEFT JOIN tb_rst_sales_order_info soi IGNORE INDEX (idx_order_customer_id) ON dcs.store_id = soi.sales_store_id
         LEFT JOIN tb_rst_sales_order_item soix ON soi.sales_id = soix.item_order_id
         LEFT JOIN (
             SELECT
@@ -247,24 +247,30 @@
             LEFT JOIN tb_rst_dm_financial_receipt dfr ON tx.dealer_id = dfr.dealer_id
             LEFT JOIN tb_rst_dm_claim_order dco ON dfr.fr_id = dco.fr_id
             LEFT JOIN tb_rst_sales_order_item soix ON dco.item_id = soix.item_id
-            WHERE 1=1
+            LEFT JOIN tb_rst_sales_order_info soixx ON soixx.sales_id = soix.item_order_id
+            <where>
+                <if test="startDate != null and startDate != ''">
+                    AND soixx.sales_create_time <![CDATA[>=]]> #{startDate}
+                </if>
+                <if test="endDate != null and endDate != ''">
+                    AND soixx.sales_create_time <![CDATA[<=]]> #{endDate}
+                </if>
+            </where>
+            GROUP BY tx.dealer_id
+        )xx ON t.dealer_id = xx.dealer_id
+        <where>
+             soi.sales_batch_id != 'KS00000000000001' AND soi.sales_customer_id IS NULL
             <if test="startDate != null and startDate != ''">
-                AND soix.sales_create_time <![CDATA[>=]]> #{startDate}
+                AND soi.sales_create_time <![CDATA[>=]]> #{startDate}
             </if>
             <if test="endDate != null and endDate != ''">
-                AND soix.sales_create_time <![CDATA[<=]]> #{endDate}
+                AND soi.sales_create_time <![CDATA[<=]]> #{endDate}
             </if>
-            GROUP BY tx.dealer_id
-        )xx ON t.dealer_id = xx.dealer_id
-        WHERE
-             soi.sales_customer_id  is null AND soi.sales_batch_id != 'KS00000000000001'
-        <if test="startDate != null and startDate != ''">
-            AND soi.sales_create_time <![CDATA[>=]]> #{startDate}
-        </if>
-        <if test="endDate != null and endDate != ''">
-            AND soi.sales_create_time <![CDATA[<=]]> #{endDate}
-        </if>
-        GROUP BY dcs.deal_channel_id
+            <if test="dealerName != null and dealerName != ''">
+                AND t.dealer_name  like  CONCAT ('%',#{dealerName},'%')
+            </if >
+        </where>
+        GROUP BY ddc.deal_channel_id
         ORDER BY t.dealer_id DESC
     </select>
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmDealerController.java

@@ -563,6 +563,7 @@ public class DmDealerController {
                                       @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
         ModelAndView mv = new ModelAndView("dm/dealer/dm_order_statistics");
         salesOrder.setIsCustmerAddOrder(2);
+        salesOrder.setIsSelectCustomer(2);
         //分页获取订单信息
         PagedResult<SalesOrder> pagedResult = salesOrderService.salesOrderListAndItemPage(pageNO, pageSize, salesOrder,totalNum == 0);
         if (totalNum != 0) {

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/FinanciaReceController.java

@@ -571,6 +571,9 @@ public class FinanciaReceController {
                 .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")
                 .addNoPro("dealerContactList","dealerChannelList","dealerProductList","cooperationAgreeList")
                 .setModelAndView(dmDealer, mv, "/admin/financial_receipt/fr_statistic", result);
+
+        List<DmDealer> dmDealerList = dmDealerService.getDmDealerList(new DmDealer());
+        mv.addObject("dmDealerList",dmDealerList);
         return mv;
     }
 

watero-rst-web/src/main/resources/log4j.properties

@@ -27,14 +27,6 @@ log4j.appender.errorLog.layout.ConversionPattern=%d %p [%c] - %m %n
 log4j.appender.errorLog.encoding=UTF-8
 
 #\u663E\u793ASQL\u8BED\u53E5\u90E8\u5206
-log4j.logger.com.iamberry.wechat.service=DEBUG
-log4j.logger.java.sql.ResultSet=INFO
-log4j.logger.org.apache=INFO
-log4j.logger.java.sql.Connection=INFO
-log4j.logger.java.sql.Statement=INFO
-log4j.logger.java.sql.PreparedStatement=INFO
-
-#\u663E\u793ASQL\u8BED\u53E5\u90E8\u5206
 log4j.logger.com.iamberry.rst.service=DEBUG
 log4j.logger.java.sql.ResultSet=INFO
 log4j.logger.org.apache=INFO
@@ -43,7 +35,7 @@ log4j.logger.java.sql.Statement=INFO
 log4j.logger.java.sql.PreparedStatement=INFO
 
 # 工作流日志信息
-log4j.logger.org.activiti.engine.impl.persistence.entity=trace
-log4j.appender.ACT=org.apache.log4j.ConsoleAppender
-log4j.appender.ACT.layout=org.apache.log4j.PatternLayout
-log4j.appender.ACT.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %m%n
+#log4j.logger.org.activiti.engine.impl.persistence.entity=trace
+#log4j.appender.ACT=org.apache.log4j.ConsoleAppender
+#log4j.appender.ACT.layout=org.apache.log4j.PatternLayout
+#log4j.appender.ACT.layout.ConversionPattern= %d{hh:mm:ss,SSS} [%t] %-5p %c %x - %m%n

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -158,15 +158,14 @@
                     <td width="16"><input type="checkbox" class="sales_id" value="${order.salesId!''}" ></td>
                     <td width="16">
                         <#if (order.salesCustomerId)??>
-                        <div>
-
-                            <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
-                                <font color=#06c>${order.procTypeName}</font>
-                            </a>
-                        </div>
-                    <#else>
-                        正常
-                    </#if>
+                            <div>
+                                <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                    <font color=#06c>${order.procTypeName!''}</font>
+                                </a>
+                            </div>
+                        <#else>
+                            正常
+                        </#if>
                     </td>
                     <td>${order.salesDealCode!''}</td>
                     <td>${order.salesBatchId!''}</td>