java/zhihuishenqu.git

			@@ -34,11 +34,11 @@
			IPage<ComShopOrderPageVO> pageOrderList(Page page,@Param("comOrderListDTO") PageComOrderListDTO comOrderListDTO);

			@Select("<script> " +
			"SELECT sr.id, sr.store_id, sr.user_id, sr.order_no, sr.pay_no, \n" +
			"SELECT distinct sr.id, sr.store_id, sr.user_id, su.phone AS userName , sr.order_no, sr.pay_no, \n" +
			" sr.wx_tarde_no, sr.status, sr.pay_status, sr.receiver_id, \n" +
			" sr.total_amount, sr.discount_amount, sr.pay_amount, sr.pay_type, \n" +
			" sr.pay_time, sr.delivery_type, sr.delivery_status, sr.logistics_company, \n" +
			" sr.logistics_no, sr.create_at \n" +
			" sr.logistics_no, sr.create_at, uad.name as receiver_name, uad.phone as receiver_phone, group_concat(og.goods_name) as goodsName \n" +
			" FROM com_shop_order sr LEFT JOIN com_shop_order_goods og ON sr.id = og.order_id \n" +
			" LEFT JOIN com_shop_goods_attr ga ON og.goods_attr_id = ga.id \n" +
			" LEFT JOIN sys_user su ON sr.user_id = su.user_id \n" +
			@@ -75,6 +75,13 @@
			"<if test='pageComShopOrderSearchDTO.storeName != null '>" +
			" AND ss.name like concat('%', #{pageComShopOrderSearchDTO.storeName}, '%') " +
			" </if> " +
			"<if test='pageComShopOrderSearchDTO.storeId != null '>" +
			" AND ss.id = #{pageComShopOrderSearchDTO.storeId} " +
			" </if> " +
			"<if test='pageComShopOrderSearchDTO.storeUserId != null '>" +
			" AND ss.sys_user_id = #{pageComShopOrderSearchDTO.storeUserId} " +
			" </if> " +
			" GROUP BY sr.id " +
			" ORDER BY sr.create_at "+
			"</script>")
			IPage<ComShopOrderSearchVO> pageOrderBy(Page page, @Param("pageComShopOrderSearchDTO") PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
			@@ -101,7 +108,10 @@
			" LEFT JOIN com_shop_store ss ON sr.store_id = ss.id \n" +
			" WHERE sr.delete_status = 1" +
			"<if test='comShopOrderExportDTO.userId != null'>" +
			" AND ss.user_id = #{comShopOrderExportDTO.userId} " +
			" AND sr.user_id = #{comShopOrderExportDTO.userId} " +
			" </if> " +
			"<if test='comShopOrderExportDTO.storeUserId != null '>" +
			" AND ss.sys_user_id = #{comShopOrderExportDTO.storeUserId} " +
			" </if> " +
			"<if test='comShopOrderExportDTO.orderIds != null and comShopOrderExportDTO.orderIds.length>0 '>" +
			" AND sr.id in " +
			@@ -179,7 +189,7 @@
			"SELECT ss.sys_user_id, sum(sr.pay_amount) AS t , DATE_FORMAT(sr.pay_time,'%Y%m%d') days\n" +
			"FROM com_shop_order sr LEFT JOIN com_shop_store ss ON sr.store_id = ss.id\n" +
			"WHERE sr.pay_status = 2 AND DATE_FORMAT(sr.pay_time,'%Y%m%d') = DATE_FORMAT(NOW(),'%Y%m%d')\n" +
			"<if test='userId!=null'>" +
			"<if test='userId!=null and userId!=0L'>" +
			" and ss.sys_user_id = #{userId}\n" +
			"</if>" +
			"GROUP BY days\n" +
			@@ -187,7 +197,7 @@
			"SELECT ss.sys_user_id, sum(sr.pay_amount) AS t, DATE_FORMAT(sr.pay_time,'%Y%u') weeks\n" +
			"FROM com_shop_order sr LEFT JOIN com_shop_store ss ON sr.store_id = ss.id\n" +
			"WHERE sr.pay_status = 2 AND DATE_FORMAT(sr.pay_time,'%Y%u') = DATE_FORMAT(NOW(),'%Y%u')\n" +
			"<if test='userId!=null'>" +
			"<if test='userId!=null and userId!=0L'>" +
			" and ss.sys_user_id = #{userId}\n" +
			"</if>" +
			"GROUP BY weeks\n" +
			@@ -195,7 +205,7 @@
			"SELECT ss.sys_user_id, sum(sr.pay_amount) AS t, DATE_FORMAT(sr.pay_time,'%Y%m') months\n" +
			"FROM com_shop_order sr LEFT JOIN com_shop_store ss ON sr.store_id = ss.id\n" +
			"WHERE sr.pay_status = 2 AND DATE_FORMAT(sr.pay_time,'%Y%m') = DATE_FORMAT(NOW(),'%Y%m')\n" +
			"<if test='userId!=null'>" +
			"<if test='userId!=null and userId!=0L'>" +
			" and ss.sys_user_id = #{userId}\n" +
			"</if>" +
			"GROUP BY months\n" +