Browse Source

bug修改

limin 7 years ago
parent
commit
8520f41765

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

@@ -150,7 +150,7 @@ public class ExportExcelUtil {
 					switch (comment[i]) {
 					case "平台流水编号": o = ob.getBillNo(); break;
 					case "平台流水时间": o = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(ob.getCreateTime()); break;
-					case "交易金额": o = ob.getTransactionAmount().toString(); break;
+					case "交易金额": o = ob.getTransactionAmount().toString() + "万元"; break;
 					case "付款方": o = ob.getPayerName(); break;
 					case "收款方": o = ob.getPayeeName(); break;
 					case "流水科目": 

+ 16 - 9
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -9,6 +9,9 @@ import java.util.Date;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -269,12 +272,19 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	 */
 	 @RequestMapping(value="/exportBillData", method = RequestMethod.GET)
 	 public Result exportBillData(TOrderBillNew billNew,HttpServletResponse response) throws IOException{
+		 OutputStream out = response.getOutputStream();
 		 Result res = new Result();
 		 HSSFWorkbook wb = orderBillServiceImpl.exportBillData(billNew);
 		 if(null == wb){
-			 res.getError().add(buildError("", "没有流水记录!"));
-			 return res;
+			 wb = new HSSFWorkbook();
+			HSSFSheet sheet = wb.createSheet("没有流水记录");
+			HSSFRow row = sheet.createRow(0);
+			HSSFCell cell = row.createCell(0);
+			cell.setCellValue("没有流水记录");
 		 }
+		 String fileName = "部门流水" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
+		 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));  
+		 response.setContentType("application/octet-stream;charset=utf-8");  
 		 /*String fileName = "部门流水" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
 		 ExportExcelUtil.download(path,response,fileName);
 		 res.setData(path);
@@ -284,20 +294,17 @@ public class FundManagerOrderApiController extends CertifyApiController {
 			 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);
+			wb.write(out); 
 			out.flush();
 			out.close();
 		} finally {
-			out.flush();
-			out.close();
+			out.flush(); 
+			out.close(); 
 		}
 		return res;
 	 }
 	 
+	 
 }

+ 11 - 0
src/main/java/com/goafanti/order/controller/OrderBonusStatisticsApiController.java

@@ -65,4 +65,15 @@ public class OrderBonusStatisticsApiController extends CertifyApiController {
 		 return res;
 	 }
 	 
+	 /**
+	  * 
+	  * @param orderNewBo
+	  * @return
+	  */
+	 @RequestMapping(value="/technicianBonusStatistics", method = RequestMethod.GET)
+	 public Result technicianBonusStatistics(TOrderNewBo orderNewBo){
+		 Result res = new Result();
+		 return res;
+	 }
+	 
 }

+ 1 - 2
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -169,7 +169,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		bonus.setId(UUID.randomUUID().toString());
 		bonus.setOrderNo(billNew.getOrderNo());
 		bonus.setGrantBy(TokenManager.getAdminId());
-		bonus.setGrantTarget(billNew.getSaleId());
+		bonus.setGrantTarget(o.getSalesmanId());
 		int lstaus = 0;//如果订单流水小于首付 lstaus 0
 		
 		// 0 相等
@@ -308,6 +308,5 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		orderNew.setProofAid(TokenManager.getAdminId());
 		return tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 	}
-
 	
 }