需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -21,6 +21,7 @@ import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
+import lombok.extern.log4j.Log4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.remoting.RemoteAccessException;
@@ -37,6 +38,7 @@ import java.util.Date;
 import java.util.List;
 
 @Service
+@Log4j
 public class PolicyOrderLogic {
 
 
@@ -176,6 +178,8 @@ public class PolicyOrderLogic {
                     .one();
 
 
+            log.info("打印导入数据:"+row.toString());
+
             if (websitUser==null)
                 throw new RemoteServiceException(errPrefix + "未找到该师傅");
 

mall-server-api/src/main/resources/mapper/WebsitSalesCMapper.xml

@@ -173,6 +173,29 @@
     </select>
 
     <select id="pgOrderList" resultType="com.gree.mall.manager.bean.worker.SettlementPgOrderVO">
-
+        SELECT
+        	d.belong_company,
+        	d.belong_company_code,
+        	d.websit_id,
+        	d.`name`,
+        	d.link_name,
+        	d.link_mobile,
+        	a.worker_name,
+        	a.worker_number,
+        	a.worker_mobile,
+        	b.order_small_type_text,
+        	COUNT(b.id) as zgds,
+        	SUM(b.total_num) as sbzts
+        FROM
+          pg_order_worker a
+        	JOIN admin_websit d on  a.websit_id = d.websit_id
+          JOIN pg_order_base b ON a.order_base_id = b.id     and b.order_status in ("YWG","GCSZX","WDWG","YWGO","YJS","LRCD")
+          LEFT JOIN settlement_order c ON a.worker_number = c.worker_number
+          AND a.create_time > DATE_FORMAT( CURDATE( ), '%Y-%m-%d 00:00:00' )
+        <if test="overTime != null and overTime !=''">
+            AND a.create_time > DATE_FORMAT( CURDATE( ), '%Y-%m-%d 00:00:00' )
+        </if>
+        GROUP BY
+          a.worker_number,b.order_small_type,a.websit_id
     </select>
 </mapper>