Ver código fonte

营销管理员查看营销员奖金

limin 7 anos atrás
pai
commit
03db511eb3

+ 23 - 5
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -21,6 +21,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.controller.CertifyApiController;
 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.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -131,7 +132,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 			return res;
 		}
 		//流水时间处理
-		if(StringUtils.isNotEmpty(billNew.getFinancialPayTimes())){
+		//if(StringUtils.isNotEmpty(billNew.getFinancialPayTimes())){
 			try {
 				billNew.setFinancialPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(billNew.getFinancialPayTimes()));
 			} catch (ParseException e) {
@@ -139,7 +140,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 				res.getError().add(buildError("", "财务流水时间有误!"));
 				return res;
 			}
-		}
+		//}
 		Integer i = fundManageOrderServiceImpl.addReceiptsFlow(billNew);
 		if(i>0){
 			res.setData("新增收款记录成功!");
@@ -204,7 +205,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 			res.getError().add(buildError("", "备注长度不能大于255"));
 			return res;
 		}
-		if(StringUtils.isNotEmpty(orderRefund.getFinancialPayTimes())){
+		//if(StringUtils.isNotEmpty(orderRefund.getFinancialPayTimes())){
 			try {
 			orderRefund.setFinancialPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(orderRefund.getFinancialPayTimes()));
 			} catch (ParseException e) {
@@ -212,7 +213,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 				res.getError().add(buildError("", "财务流水时间有误!"));
 				return res;
 			}
-		}
+		//}
 		int r = fundManageOrderServiceImpl.addRefundFlow(orderRefund);
 		if(r>0){
 			res.setData("退款记录新增成功!");
@@ -318,5 +319,22 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		return res;
 	 }
 	 
-	 
+	 /**
+	  * 修改合同编号
+	  * @param orderNew
+	  * @return
+	  */
+	 @RequestMapping(value="/updateContractNo", method = RequestMethod.POST)
+	 public Result updateContractNo(TOrderNew orderNew){
+		 Result res = new Result();
+		 if(StringUtils.isBlank(orderNew.getContractNo())){
+			 res.getError().add(buildError("", "合同编号不能为空!"));
+			 return res;
+		 } else if(orderNew.getContractNo().length()>32){
+			 res.getError().add(buildError("", "合同编号长度不能大于32!"));
+			 return res;
+		 }
+		 res.setData(fundManageOrderServiceImpl.updateContractNo(orderNew));
+		 return res;
+	 }
 }

+ 49 - 1
src/main/java/com/goafanti/order/controller/OrderBonusStatisticsApiController.java

@@ -120,7 +120,7 @@ public class OrderBonusStatisticsApiController extends CertifyApiController {
 	 
 	 
 	 /**
-	  * 
+	  * 财务专员导出营销员奖金数据
 	  * @param bonusBo
 	  * @param response
 	  * @return
@@ -324,4 +324,52 @@ public class OrderBonusStatisticsApiController extends CertifyApiController {
 		res.setData(orderReportServiceImpl.updateMonthDataById(report));
 		return res;
 	}
+	
+	/**
+	 * 营销管理员查看所有营销员奖金
+	 * @param bonusBo
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	@RequestMapping(value="/getAllSaleBonus", method = RequestMethod.GET)
+	public Result getAllSaleBonus(TOrderBonusBo bonusBo, Integer pageNo, Integer pageSize){
+		 Result res = new Result();
+		 res.setData(orderBonusServiceImpl.saleBonusStatistics(bonusBo, pageNo, pageSize));
+		 return res;
+	}
+	
+	/**
+	 * 营销管理员导出所有营销员奖金
+	 * @param bonusBo
+	 * @param response
+	 * @return
+	 * @throws IOException
+	 */
+	 @RequestMapping(value="/exportAllSaleBonusData", method = RequestMethod.GET)
+	 public Result exportAllSaleBonusData(TOrderBonusBo bonusBo,HttpServletResponse response) throws IOException{
+		 OutputStream out = response.getOutputStream();
+		 Result res = new Result();
+		 XSSFWorkbook wb = orderBonusServiceImpl.exportSaleBonusData(bonusBo);
+		 if(null == wb){
+			 wb = new XSSFWorkbook();
+			 XSSFSheet sheet = wb.createSheet("没有营销员奖金记录");
+			 XSSFRow row = sheet.createRow(0);
+			 XSSFCell 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");  
+		 try {
+			 // 返回数据流
+			 wb.write(out); 
+			 out.flush();
+			 out.close();
+		 } finally {
+			 out.flush(); 
+			 out.close(); 
+		 }
+		 return res;
+	 }
 }

+ 7 - 0
src/main/java/com/goafanti/order/service/FundManageOrderService.java

@@ -85,4 +85,11 @@ public interface FundManageOrderService {
 	 */
 	Integer updateProofreading(TOrderNew orderNew);
 	
+	/**
+	 * 修改订单编号
+	 * @param orderNew
+	 * @return
+	 */
+	int updateContractNo(TOrderNew orderNew);
+	
 }

+ 5 - 0
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -453,6 +453,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		int c = monthReportMapper.updateByMonth(month);
 		LoggerUtils.debug(logger, "更新订单统计【%s】条。", c);
 	}
+
+	@Override
+	public int updateContractNo(TOrderNew orderNew) {
+		return tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
+	}
 }