Browse Source

特批财务流程修改。

anderx 6 years ago
parent
commit
b0d7ba8f4c

+ 15 - 0
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -159,6 +159,21 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		}
 		return res;
 	}
+	/**
+	 * 财务特批审核
+	 */
+	@RequestMapping(value="/financeApproval", method = RequestMethod.POST)
+	public Result financeApproval(String orderNo) {
+		Result res=new Result();
+		if (StringUtils.isBlank(orderNo)) {
+			res.getError().add(buildError("","订单必须指定。"));
+		}
+		if(fundManageOrderServiceImpl.checkFinanceApproval(orderNo)) {
+			res.getError().add(buildError("","订单非特批或流程不正确。"));
+		}
+		res.data(fundManageOrderServiceImpl.updateFinanceApproval(orderNo));
+		return res;
+	}
 	
 	/**
 	 * 财务专员查看自己要处理的退单数据

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

@@ -91,5 +91,17 @@ public interface FundManageOrderService {
 	 * @return
 	 */
 	int updateContractNo(TOrderNew orderNew);
+	/**
+	 * 财务特批审核
+	 * @param orderNo
+	 * @return
+	 */
+	int updateFinanceApproval(String orderNo);
+	/**
+	 * 财务特批审核检查
+	 * @param orderNo
+	 * @return
+	 */
+	boolean checkFinanceApproval(String orderNo);
 	
 }

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

@@ -489,6 +489,26 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	public int updateContractNo(TOrderNew orderNew) {
 		return tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 	}
+
+	@Override
+	public int updateFinanceApproval(String orderNo) {
+		TOrderNew t=new TOrderNew();
+		t.setOrderNo(orderNo);
+		t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+		return tOrderNewMapper.updateByPrimaryKeySelective(t);
+	}
+
+	@Override
+	public boolean checkFinanceApproval(String orderNo) {
+		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		if (t.getApproval()!=ApprovalNewState.TG.getCode()) {
+			return true;
+		}
+		if (t.getProcessStatus()!=ProcessStatus.YPCWZY.getCode()) {
+			return true;
+		}
+		return false;
+	}
 }
 
 

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

@@ -550,7 +550,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setOrderNo(orderNo);
 		if (confirm==2) {
 			t.setApproval(2);
-			if(t2.getOutsource()==0)t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+			if(t2.getOutsource()==0)t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
 			addOrderLog(orderNo, OrderLogProcess.TP.getCode());
 		} else {
 			t.setApproval(3);

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

@@ -91,11 +91,10 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 	public int updateAuditOutsource(OrderOutsourceDtails o) {
 		o.setAuditTime(new Date());
 		TOrderNew t=new TOrderNew();
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
 		if (o.getRefundStatus()==1) {
 			t.setOrderNo(o.getOrderNo());
 			t.setOrderStatus(2);//订单审核标记通过
-			t.setProcessStatus(t2.getApproval()==0?ProcessStatus.YPCWGLY.getCode():ProcessStatus.YPZXSGLY.getCode());
+			t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
 			addOrderLog(o.getOrderNo(),OrderLogProcess.WBSH.getCode());
 			tOrderNewMapper.updateByPrimaryKeySelective(t);
 		}else {

+ 4 - 4
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.15
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.15
+avatar.host=//sb.jishutao.com
 
 #连测试
-avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.14
+#avatar.host=//static.jishutao.com
+#static.host=//static.jishutao.com/1.1.14
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload