Przeglądaj źródła

Merge branch 'test' of
ssh://git@git.jishutao.com:55555/jishutao/kede-server.git into test

anderx 7 lat temu
rodzic
commit
1b57814c71

+ 6 - 0
pom.xml

@@ -362,6 +362,12 @@
 			<artifactId>gson</artifactId>
 			<version>2.3</version>
 		</dependency>
+		<!-- javaMail -->
+		<dependency>
+		    <groupId>javax.mail</groupId>
+		    <artifactId>mail</artifactId>
+		    <version>1.4.7</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<resources>

+ 2 - 1
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -176,7 +176,8 @@ public interface AdminMapper {
 	List<AdminListBo> getListDefaultPassword(String id);
 
 	int getCountById(String id);
+	AdminListBo getDeptNameByAid(String id);
 
 	List<Admin> getAdminRoleList(String roleName);
 
-}
+}

+ 1 - 1
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -123,6 +123,6 @@ public interface TOrderNewMapper {
     TOrderNewBo getOrderNewDetail(String orderNo); 
     int getCountByIdAndStatus(TOrderNew orderNew);
     
-    String getSaleIdByOno(String ono);
+    TOrderNewBo getSaleIdByOno(String ono);
 
 }

+ 7 - 2
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -960,10 +960,15 @@
    	inner join user_role ur on a.id=ur.uid
    	where a.id= #{_parameter,jdbcType=VARCHAR} and ( a.status != '注销' or a.status is null)
   </select>
-   <select id="getAdminRoleList" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="getAdminRoleList" parameterType="java.lang.String" resultMap="BaseResultMap">
 		select a.id, a.name from admin a left join user_role b on a.id=b.uid
 	left join `role` c on b.rid=c.id
 	where c.role_name  = #{name,jdbcType=VARCHAR}
   </select>
-  
+  <!-- 获得当前登录人的名字和部门名 -->
+  <select id="getDeptNameByAid" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
+  	select a.name, d.name as departmentName from admin a
+  		left join department d on a.department_id = d.id
+  		where a.id = #{_parameter,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 14 - 14
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml

@@ -455,10 +455,10 @@
   	b.payee_id as payeeId, b.payer_id as payerId, b.transaction_amount as transactionAmount, 
     b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel,  
     b.remarks, b.confirm_sign confirmSign, b.delete_sign deleteSign, b.financial_pay_no as financialPayNo, 
-    b.financial_pay_time as financialPayTimes, u.nickname as payerName, a.name as payeeName
+    b.financial_pay_time as financialPayTimes, u.nickname as payerName, a.nickname as payeeName
      from t_order_bill_new b 
   	left join `user` u on b.payer_id = u.id
-  	left join admin a on b.payee_id = a.id
+  	left join `user` a on b.payee_id = a.id
   	where b.delete_sign = 0 and bill_no = #{_parameter,jdbcType=VARCHAR}
   </select>
   <!-- 根据订单编号查看该订单相关的所有流水 -->
@@ -468,23 +468,23 @@
   	b.payee_id as payeeId, b.payer_id as payerId, b.transaction_amount as transactionAmount, 
     b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel,  
     b.remarks, b.confirm_sign confirmSign, b.delete_sign deleteSign, b.financial_pay_no as financialPayNo, 
-    b.financial_pay_time as financialPayTimes, u.nickname as payerName, a.name as payeeName
+    b.financial_pay_time as financialPayTimes, u.nickname as payerName, a.nickname as payeeName
      from t_order_bill_new b 
   	left join `user` u on b.payer_id = u.id
-  	left join admin a on b.payee_id = a.id
+  	left join `user` a on b.payee_id = a.id
   	where b.delete_sign = 0 and order_no = #{_parameter,jdbcType=VARCHAR}
   </select>
   <!-- 查看自己创建的流水数据 -->
   <select id="myBillList" parameterType="Map" resultType="com.goafanti.common.model.TOrderBillNew">
   select 
   	b.bill_no as billNo, b.order_no as orderNo, b.transaction_amount as transactionAmount,
-  	b.payer_id as payerId, b.payee_id as payeeId, u.nickname as payerName, a.name as payeeName, 
+  	b.payer_id as payerId, b.payee_id as payeeId, u.nickname as payerName, a.nickname as payeeName, 
   	b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel, 
   	b.financial_pay_time as financialPayTimes,b.financial_pay_no as financialPayNo,
   	b.creater, ad.name as createrName, o.salesman_id as saleId, oa.name as saleName
   	from t_order_bill_new b
   	left join `user` u on b.payer_id = u.id
-  	left join admin a on b.payee_id = a.id
+  	left join `user` a on b.payee_id = a.id
   	left join admin ad on b.creater = ad.id
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
@@ -498,7 +498,7 @@
   	</if>
   	<if test='b.payeeName != null and b.payeeName != ""'>
   	<bind name="n" value="'%' + b.payeeName + '%'"/>
-  	and a.name like #{n,jdbcType=VARCHAR}
+  	and a.nickname like #{n,jdbcType=VARCHAR}
   	</if>
   	<if test='b.departmentId != null and b.departmentId != "" '>
   	and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
@@ -517,7 +517,7 @@
   select count(*)
   	from t_order_bill_new b
   	left join `user` u on b.payer_id = u.id
-  	left join admin a on b.payee_id = a.id
+  	left join `user` a on b.payee_id = a.id
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
   	where b.delete_sign = 0 
@@ -530,7 +530,7 @@
   	</if>
   	<if test='b.payeeName != null and b.payeeName != ""'>
   	<bind name="n" value="'%' + b.payeeName + '%'"/>
-  	and a.name like #{n,jdbcType=VARCHAR}
+  	and a.nickname like #{n,jdbcType=VARCHAR}
   	</if>
   	<if test='b.departmentId != null and b.departmentId != "" '>
   	and oa.department_id = #{b.departmentId,jdbcType=VARCHAR}
@@ -547,7 +547,7 @@
 	  	d.id as departmentId, d.name as departmentName
 	  	from t_order_bill_new b
 	  	left join `user` u on b.payer_id = u.id
-	  	left join admin a on b.payee_id = a.id
+	  	left join `user` a on b.payee_id = a.id
 	  	left join t_order_new o on o.order_no = b.order_no
 	  	left join admin oa on oa.id = o.salesman_id 
 	  	left join department d on oa.department_id = d.id
@@ -559,7 +559,7 @@
 	  	</if>
 	  	<if test='payeeName != null and payeeName != ""'>
 	  	<bind name="n" value="'%' + payeeName + '%'"/>
-	  	and a.name like #{n,jdbcType=VARCHAR}
+	  	and a.nickname like #{n,jdbcType=VARCHAR}
 	  	</if>
 	  	<if test='startTime != null and startTime != "" and endTime != null and endTime != ""'>
 	  	<bind name="a" value="startTime + ' 00:00:00'"/>
@@ -571,13 +571,13 @@
   <select id="getBillData" parameterType="com.goafanti.common.model.TOrderBillNew" resultType="com.goafanti.common.model.TOrderBillNew">
   select 
   	b.bill_no as billNo, b.order_no as orderNo, b.transaction_amount as transactionAmount,
-  	u.nickname as payerName, a.name as payeeName, 
+  	u.nickname as payerName, a.nickname as payeeName, 
   	b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel, 
   	b.financial_pay_time as financialPayTimes,b.financial_pay_no as financialPayNo,
   	b.creater, ad.name as createrName, oa.name as saleName, b.create_time as createTime
   	from t_order_bill_new b
   	left join `user` u on b.payer_id = u.id
-  	left join admin a on b.payee_id = a.id
+  	left join `user` a on b.payee_id = a.id
   	left join admin ad on b.creater = ad.id
   	left join t_order_new o on o.order_no = b.order_no
   	left join admin oa on oa.id = o.salesman_id
@@ -588,7 +588,7 @@
   	</if>
   	<if test='payeeName != null and payeeName != ""'>
   	<bind name="n" value="'%' + payeeName + '%'"/>
-  	and a.name like #{n,jdbcType=VARCHAR}
+  	and a.nickname like #{n,jdbcType=VARCHAR}
   	</if>
   	<if test='departmentId != null and departmentId != "" '>
   	and oa.department_id = #{departmentId,jdbcType=VARCHAR}

+ 12 - 8
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -945,10 +945,10 @@
   		and process_status >= 3
   		and (approval = 0 or approval = 2)
 	  	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
-  		<if test='o.liquidation_status != null and o.liquidation_status != ""'>
-	  	and o.liquidation_status = #{o.liquidation_status,jdbcType=VARCHAR}
+  		<if test='o.liquidationStatus != null and o.liquidationStatus != ""'>
+	  	and o.liquidation_status = #{o.liquidationStatus,jdbcType=VARCHAR}
 	  	</if>
-  		<if test='o.liquidation_status == null or o.liquidation_status == ""'>
+  		<if test='o.liquidationStatus == null or o.liquidationStatus == ""'>
 	  	and o.liquidation_status &lt; 2
 	  	</if>
   		<if test='o.orderNo != null and o.orderNo != ""'>
@@ -979,10 +979,10 @@
   		and process_status >= 3
   		and (approval = 0 or approval = 2)
 	  	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
-	  	<if test='o.liquidation_status != null and o.liquidation_status != ""'>
-	  	and o.liquidation_status = #{o.liquidation_status,jdbcType=VARCHAR}
+	  	<if test='o.liquidationStatus != null and o.liquidationStatus != ""'>
+	  	and o.liquidation_status = #{o.liquidationStatus,jdbcType=VARCHAR}
 	  	</if>
-  		<if test='o.liquidation_status == null or o.liquidation_status == ""'>
+  		<if test='o.liquidationStatus == null or o.liquidationStatus == ""'>
 	  	and o.liquidation_status &lt; 2
 	  	</if>
   		<if test='o.orderNo != null and o.orderNo != ""'>
@@ -999,8 +999,12 @@
 	  	</if>
   </select>
   <!-- 通过订单编号获得订单的负责人(营销员) -->
-  <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="java.lang.String">
-  	select salesman_id from t_order_new where order_no = #{_parameter,jdbcType=VARCHAR}
+  <select id="getSaleIdByOno" parameterType="com.goafanti.order.bo.TOrderNewBo" resultType="java.lang.String">
+  	select salesman_id as salesmanId, a.name as salesmanName, a.email ,u.nickname as userName
+  	from t_order_new o
+  		left join admin a on o.salesman_id = a.id 
+  		left join `user` u on u.id = o.buyer_id
+  		where order_no = #{_parameter,jdbcType=VARCHAR}
   </select>
   <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
   	select 

+ 33 - 17
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -2,6 +2,7 @@ package com.goafanti.common.utils;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -42,18 +43,6 @@ public class ExportExcelUtil {
 		cellStyle.setWrapText(true);
 		return cellStyle;
 	}
-	//设置单元格格式
-	private static HSSFCellStyle setCellStyle2(HSSFWorkbook workbook){
-		// 设置字体  
-		HSSFFont font = workbook.createFont();  
-		font.setFontName("微软雅黑");
-		font.setFontHeightInPoints((short) 14);//字体大小  
-		font.setFontHeight((short) 600);
-		// 设置样式  
-		HSSFCellStyle cellStyle = workbook.createCellStyle();  
-		cellStyle.setFont(font);  //字体
-		return cellStyle;
-	}
 	
 	//下载课表
 	public static void download(String path, HttpServletResponse response,String filename) { 
@@ -121,7 +110,7 @@ public class ExportExcelUtil {
 	 * @param comment 表头(列名)
 	 * @param filePath 生成文件路径
 	 */
-	public static void exportDeptBillInfo(Map<String,List<TOrderBillNew>> map,String[] deptnames,String[] comment,String filePath){
+	public static HSSFWorkbook exportDeptBillInfo(Map<String,List<TOrderBillNew>> map,String[] deptnames,String[] comment,String filePath){
 		//map 数据 ,deptnames 部门名称,comment表头 (列名称)
  		//1,创建一个workbook,对应的是一个excel文件
 		HSSFWorkbook wb = new HSSFWorkbook();
@@ -166,8 +155,28 @@ public class ExportExcelUtil {
 					case "交易金额": o = ob.getTransactionAmount().toString(); break;
 					case "付款方": o = ob.getPayerName(); break;
 					case "收款方": o = ob.getPayeeName(); break;
-					case "流水科目": o = ob.getTransactionSubject().toString(); break;
-					case "交易渠道": o = ob.getTransactionChannel().toString(); break;
+					case "流水科目": 
+						if(0 == ob.getTransactionSubject()){
+							o = "代收"; 
+						}else if(1 == ob.getTransactionSubject()){
+							o = "代付"; 
+						}else if(2 == ob.getTransactionSubject()){
+							o = "退款"; 
+						}else{
+							o = "未定义"; 
+						}
+						break;
+					case "交易渠道": 
+						if(0 == ob.getTransactionChannel()){
+							o = "微信"; 
+						}else if(1 == ob.getTransactionChannel()){
+							o = "支付宝"; 
+						}else if(2 == ob.getTransactionChannel()){
+							o = "银联"; 
+						}else{
+							o = "未定义"; 
+						}
+						break;
 					case "交易时间": o = ob.getFinancialPayTimes(); break;
 					case "财务流水号": o = ob.getFinancialPayNo();break;
 					case "订单编号": o = ob.getOrderNo(); break;
@@ -179,7 +188,14 @@ public class ExportExcelUtil {
 				}
 			}
 		}
-		
+		return wb;
+		/*OutputStream os = new ByteArrayOutputStream();
+		try {
+			wb.write(os);
+		} catch (IOException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 		//将表格数据放入文件中
 		try {
 			FileOutputStream fos = new FileOutputStream(filePath);
@@ -189,7 +205,7 @@ public class ExportExcelUtil {
 		} catch (Exception e) {
 			System.out.println("发生了异常");
 			e.printStackTrace();
-		}
+		}*/
 	}
 	
 	

+ 8 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -22,6 +22,7 @@ public class TOrderNewBo extends TOrderNew{
 	private String reason;
 	private String backDate;
 	private String uid;
+	private String email;
 	
 	public String getSignDate() {
 		if (StringUtils.isBlank(signDate)&&super.getSignTime()!=null) {
@@ -146,6 +147,13 @@ public class TOrderNewBo extends TOrderNew{
 		this.backDate = backDate;
 	}
 
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
 	public String getUid() {
 		return uid;
 	}

+ 33 - 7
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -1,5 +1,10 @@
 package com.goafanti.order.controller;
 
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -7,6 +12,7 @@ import java.util.Date;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,7 +31,7 @@ import com.goafanti.order.service.OrderBillService;
 import com.goafanti.order.service.OrderRefundService;
 
 @RestController
-@RequestMapping(value = "/api/admin/financial")
+@RequestMapping(value = "/open/api/admin/financial")
 public class FundManagerOrderApiController extends CertifyApiController {
 	@Resource
 	private FundManageOrderService fundManageOrderServiceImpl;
@@ -263,20 +269,40 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	 * @param billNew
 	 * @param response
 	 * @return
+	 * @throws IOException 
 	 */
 	 @RequestMapping(value="/exportBillData", method = RequestMethod.GET)
-	 public Result exportBillData(TOrderBillNew billNew,HttpServletResponse response){
+	 public Result exportBillData(TOrderBillNew billNew,HttpServletResponse response) throws IOException{
 		 Result res = new Result();
-		 String path = orderBillServiceImpl.exportBillData(billNew);
-		 if("null".equals(path)){
+		 HSSFWorkbook wb = orderBillServiceImpl.exportBillData(billNew);
+		 if(null == wb){
 			 res.getError().add(buildError("", "没有流水记录!"));
 			 return res;
 		 }
-		 String fileName = "部门流水" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
+		 /*String fileName = "部门流水" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
 		 ExportExcelUtil.download(path,response,fileName);
 		 res.setData(path);
-		 return res;
+		 //删除
+		 File f = new File(path);
+		 if(f.exists()){
+			 System.out.println("shanchu----------------------0");
+			 f.delete();
+		 }*/
+		 String fileName = "部门流水" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
+		 OutputStream out=response.getOutputStream();
+		 response.addHeader("Content-Disposition", "attachment;filename="  
+                 + new String(fileName.getBytes(),"iso-8859-1"));  
+         response.setContentType("application/octet-stream;charset=utf-8");  
+		try {
+			// 返回数据流
+			wb.write(out);
+			out.flush();
+			out.close();
+		} finally {
+			out.flush();
+			out.close();
+		}
+		return res;
 	 }
-	 
 	
 }

+ 3 - 1
src/main/java/com/goafanti/order/service/OrderBillService.java

@@ -1,5 +1,7 @@
 package com.goafanti.order.service;
 
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
 import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.core.mybatis.page.Pagination;
 
@@ -19,5 +21,5 @@ public interface OrderBillService {
 	 * @param billNew
 	 * @return
 	 */
-	String exportBillData(TOrderBillNew billNew);
+	HSSFWorkbook exportBillData(TOrderBillNew billNew);
 }

+ 30 - 16
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -1,13 +1,18 @@
 package com.goafanti.order.service.impl;
 
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.mail.MessagingException;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.TOrderBackMapper;
 import com.goafanti.common.dao.TOrderBillNewMapper;
@@ -17,11 +22,14 @@ import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderRefund;
+import com.goafanti.common.utils.SendEmailUtil;
+import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.OrderListBo;
+import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.service.FundManageOrderService;
 
 @Service
@@ -44,19 +52,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Override
 	public Pagination<OrderListBo> allUnassignedOrder(OrderListBo order, Integer pageNo,
 			Integer pageSize,Integer ob) {
-		BigDecimal b1 = new BigDecimal(2);
-		BigDecimal b2 = new BigDecimal(0.2);
-		BigDecimal b3 = new BigDecimal(0.4);
-		BigDecimal b4 = new BigDecimal(0.5);
-		System.out.println("b1 b2 " +b1.compareTo(b2));
-		System.out.println("b2 b1 " +b2.compareTo(b1));
-		System.out.println("b1 b3 " +b1.compareTo(b3));
-		System.out.println("b1+b2 b3 " +b1.add(b2).compareTo(b3));
-		System.out.println("b1+b2 b4 " +b1.add(b2).compareTo(b4));
-		System.out.println(" b4 b1+b2  " +b4.compareTo(b1.add(b2)));
-		System.out.println("b1 b2 b3 b4   " + b1.toString() + "  " + b2.toString() + "  " + b3.toString() + "  "+  b4.toString());
-		
-		 
 		
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("o", order);
@@ -113,22 +108,41 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		if(bd.compareTo(new BigDecimal(0.0)) == 1){
 			return 0;//已经收款不能驳回
 		}
+		TOrderNewBo b = tOrderNewMapper.getSaleIdByOno(back.getOrderNo());//订单和订单负责人相关信息
+		if(null == b || StringUtils.isBlank(b.getSalesmanId())){
+			return -1;
+		}
 		//否 可以处理驳回
 		
 		//修改订单状态
 		TOrderNew orderNew = new  TOrderNew();
 		orderNew.setOrderNo(back.getOrderNo());
+		// TODO
 		orderNew.setOrderStatus(5);
 		int c = tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 		
 		//新增驳回数据
 		if(c>0){
 			back.setBackStatus(0);
-			System.out.println(TokenManager.getUserId());
-			System.out.println(TokenManager.getAdminId());
 			back.setInitiate(TokenManager.getAdminId());//发起人
-			back.setAccept(tOrderNewMapper.getSaleIdByOno(back.getOrderNo()));	//查看该订单的负责人	
+			back.setAccept(b.getSalesmanId());	//查看该订单的负责人	
 			c = backMapper.insertSelective(back);
+			
+			if(StringUtils.isNotBlank(b.getEmail())){ //邮箱不为空发送邮件
+				AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
+				//发送驳回邮件
+				String content = "<div>客户名称: "+ b.getUserName() +"</div><div>订单编号: " + back.getOrderNo() + "</div>";
+				EmailBo bo = new EmailBo("订单驳回", b.getEmail(), b.getSalesmanName(), a.getDepartmentName(), a.getName(), content);
+				try {
+					SendEmailUtil.send(bo);
+				} catch (UnsupportedEncodingException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				} catch (MessagingException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
 		}
 		return c;
 	}

+ 11 - 9
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -38,7 +39,7 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 
 
 	@Override
-	public String exportBillData(TOrderBillNew billNew) {
+	public HSSFWorkbook exportBillData(TOrderBillNew billNew) {
 		// 判断导出是否有部门
 		String deptid = billNew.getDepartmentId();
 		Map<String, List<TOrderBillNew>> map = new HashMap<String, List<TOrderBillNew>>();
@@ -47,7 +48,7 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 			//获得所有有数据的部门
 			List<TOrderBillNew> dlist = billNewMapper.getDeptBySome(billNew);
 			if(null == dlist || dlist.size() == 0){
-				return "null";
+				return null;
 			}
 			deptnames = new String[dlist.size()];
 			for (int i = 0; i < dlist.size(); i++) {
@@ -62,13 +63,14 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 		}
 		String[] comment = {"平台流水编号","平台流水时间","交易金额","付款方","收款方","流水科目","交易渠道","交易时间","财务流水号","订单编号","订单负责人"};
 		String filePath = uploadPath + "/billtemp";
-		File f = new File(filePath);
-		if(!f.exists()){
-			f.mkdirs();
-		}
-		filePath += "/" + System.nanoTime() +".xls";
-		ExportExcelUtil.exportDeptBillInfo(map, deptnames, comment, filePath);
-		return filePath;
+//		File f = new File(filePath);
+//		if(!f.exists()){
+//			f.mkdirs();
+//		}
+		//filePath += "/" + System.nanoTime() +".xls";
+		HSSFWorkbook wb = ExportExcelUtil.exportDeptBillInfo(map, deptnames, comment, filePath);
+		
+		return wb;
 	}
 	
 

+ 2 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1,6 +1,6 @@
 package com.goafanti.order.service.impl;
 
-
+
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -29,7 +29,6 @@ import com.goafanti.common.dao.UserLockReleaseMapper;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.TDunLog;
-import com.goafanti.common.model.TOrder;
 import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
@@ -463,5 +462,5 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 	
 	
-	
+	
 }