Browse Source

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

anderx 7 years ago
parent
commit
fd99b5cd20

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderBonusMapper.xml

@@ -619,7 +619,7 @@
 	o.first_amount as firstAmount, o.settlement_amount as settlementAmount, o.refund_amount as refundAmount,
 	o.order_status as orderStatus, o.project_status as projectStatus, b.bonus_subject as bonusSubject,
 	o.proof_count as proofCount, b.grant_status as grantStatus, a.name as salesName
-	,b.create_time as startTime1
+	,b.create_time as startTime1, b.grant_target as grantTarget
 	from t_order_bonus b
 	left join t_order_new o on o.order_no = b.order_no
 	left join admin a on o.salesman_id = a.id

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

@@ -1011,7 +1011,7 @@
   <select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
   select  o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus, 
   a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus , 
-  ifnull(b.amount,0) as actuallyTotalAmount, 
+  ifnull(b.amount,0) as actuallyTotalAmount, o.contract_no as contractNo,
   o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,
   0 as companyId, "湖南科德信息咨询有限公司" as companyName
   	 from t_order_new o 

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderRefundMapper.xml

@@ -454,7 +454,7 @@
   <select id="getRefundList" parameterType="Map" resultType="com.goafanti.order.bo.OrderRefundBo">
   select r.id as id , r.create_time as createTime, r.order_no as orderNo, u.nickname as buyName, u.id as buyid, o.order_status as orderStatus,
   	a.name as saleName, a.id as saleId, o.liquidation_status as liquidationStatus ,reason as reason,refund_status as  refundStatus,
-  	o.refund_amount as refundAmount
+  	o.refund_amount as refundAmount, o.contract_no as contractNo
   	from t_order_refund r
   	 left join t_order_new o on r.order_no = o.order_no
   	 left join `user` u on o.buyer_id = u.id

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

@@ -68,6 +68,8 @@ public class OrderListBo {
 	private String companyId;
 	/** 收款公司名称 **/
 	private String companyName;
+	/** 合同编号 */
+	private String contractNo;
 	
 	public String getOrderNo() {
 		return orderNo;
@@ -255,4 +257,10 @@ public class OrderListBo {
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
 	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
 }

+ 7 - 0
src/main/java/com/goafanti/order/bo/OrderRefundBo.java

@@ -13,6 +13,7 @@ public class OrderRefundBo extends TOrderRefund {
 	private String startTime;
 	private String endTime;
 	private String refundAmount;
+	private String contractNo;
 	public String getBuyName() {
 		return buyName;
 	}
@@ -67,5 +68,11 @@ public class OrderRefundBo extends TOrderRefund {
 	public void setRefundAmount(String refundAmount) {
 		this.refundAmount = refundAmount;
 	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
 	
 }

+ 33 - 7
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;
@@ -124,14 +125,22 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value="/addReceiptsFlow", method = RequestMethod.POST)
-	public Result addReceiptsFlow(TOrderBillNew billNew){
+	public Result addReceiptsFlow(TOrderBillNew billNew,String contractNo){
 		Result res = new Result();
 		if(null != billNew.getRemarks() && billNew.getRemarks().length() > 255){
 			res.getError().add(buildError("", "备注长度不能大于255"));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(contractNo)) {
+			res.getError().add(buildError("", "合同编号不能为空!"));
+			return res;
+		} else if (contractNo.length() > 32) {
+			res.getError().add(buildError("", "合同编号长度不能大于32!"));
+			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,8 +148,8 @@ public class FundManagerOrderApiController extends CertifyApiController {
 				res.getError().add(buildError("", "财务流水时间有误!"));
 				return res;
 			}
-		}
-		Integer i = fundManageOrderServiceImpl.addReceiptsFlow(billNew);
+		//}
+		Integer i = fundManageOrderServiceImpl.addReceiptsFlow(billNew,contractNo);
 		if(i>0){
 			res.setData("新增收款记录成功!");
 		}else if(i == -3){
@@ -204,7 +213,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 +221,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 				res.getError().add(buildError("", "财务流水时间有误!"));
 				return res;
 			}
-		}
+		//}
 		int r = fundManageOrderServiceImpl.addRefundFlow(orderRefund);
 		if(r>0){
 			res.setData("退款记录新增成功!");
@@ -318,5 +327,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;
+	 }
 }

+ 8 - 1
src/main/java/com/goafanti/order/service/FundManageOrderService.java

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

+ 11 - 3
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -177,7 +177,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	}
 
 	@Override
-	public Integer addReceiptsFlow(TOrderBillNew billNew) {
+	public Integer addReceiptsFlow(TOrderBillNew billNew, String contractNo) {
 		
 		//判断有没有要加入的金额有没有超过总金额
 		BigDecimal bill = billNewMapper.getAmountByOid(billNew.getOrderNo());
@@ -241,7 +241,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			}
 		}
 		//否则新增流水信息
-		billNew.setBillNo(idGenerator.generateId().toString());
+		billNew.setBillNo(UUID.randomUUID().toString().replaceAll("-", ""));
+		//System.out.println("*****************"+billNew.getBillNo());
 		billNew.setCreater(TokenManager.getAdminId());
 		int result = billNewMapper.insertSelective(billNew);
 		
@@ -249,6 +250,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		//如果已经首付并且流程状态是没有派给咨询师的修改流程状态为4
 		TOrderNew orderNew = new TOrderNew();
 		orderNew.setOrderNo(billNew.getOrderNo());
+		orderNew.setContractNo(contractNo);
 		//这里的已收金额是以前收的所有金额加上本次收的金额
 		orderNew.setSettlementAmount(billNew.getTransactionAmount().add(o.getSettlementAmount()));
 		orderNew.setLiquidationStatus(lstaus);
@@ -382,7 +384,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		}
 		
 		//新增退款流水
-		billNew.setBillNo(idGenerator.generateId().toString());
+		billNew.setBillNo(UUID.randomUUID().toString().replaceAll("-", ""));
+		//System.out.println("*****************"+billNew.getBillNo());
 		billNew.setCreater(TokenManager.getAdminId());
 		billNew.setTransactionAmount(billNew.getTransactionAmount().negate());// 取负数
 		int result = billNewMapper.insertSelective(billNew);
@@ -453,6 +456,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);
+	}
 }