anderx 4 years ago
parent
commit
2a304f7396

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

@@ -56,4 +56,5 @@ public interface TOrderPaymentMapper {
 
 	void updateByids(@Param("list")List<String> list,@Param("processStatus")Integer processStatus);
 
+
 }

+ 5 - 9
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -300,20 +300,16 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	 * @return
 	 */
 	@RequestMapping(value = "/updateOrderPayment" , method = RequestMethod.POST)
-	public Result updateOrderPayment(TOrderPayment p,BindingResult bindingResult) {
+	public Result updateOrderPayment(TOrderPayment p) {
 		Result res =new Result();
-		if (bindingResult.hasErrors()) {
-            res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
-            		ThirdPartyError.getValueByCode(bindingResult.getFieldError().getField())));
-            return res;
-        }
 		if (null==p.getId()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 			return res;
 		}
-		if (!res.getError().isEmpty()) {
-            return res;
-        }
+		if (thirdPartyCompanyService.checkQuantity(p)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"数量","数量"));
+			return res;
+		}
 		res.data(thirdPartyCompanyService.updateOrderPayment(p));
 		return res;
 	}

+ 2 - 0
src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java

@@ -116,6 +116,8 @@ public interface ThirdPartyCompanyService {
 
 	int pushPaymentExamine(PaymentLog in, String pids);
 
+	boolean checkQuantity(TOrderPayment p);
+
 
 
 	

+ 45 - 17
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -313,22 +314,26 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		}else if (type==2) {
 			ProjectTypePuls tt=thirdPartyCompanyMapper.selectByTidGetDtails(tp.getTid());
 			op.setInitialQuantity(tt.getQuantity());
-			
-		}
-	if (!TokenManager.hasRole(AFTConstants.FINANCE)&&
-			!TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)&&
-			!TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)&&
-			!TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
-		outProjectBo ob=tOrderOutsourceMapper.selectByTid(tp.getTid());
-		if (ob!=null &&ob.getStartType()!=null&& ob.getStartType()==1) {
-			if((ob.getProjectType()==1&&ob.getPatentType()==0)
-					||(ob.getProjectType()==2)) {
-				op.setInitialUnitPrice("***");
-				op.setInitialTotalAmount("***");
+			if (tt.getCostReduction()==1) {
+				op.setInitialUnitPrice(tt.getProportion85().toEngineeringString());
+			}else {
+				op.setInitialUnitPrice(tt.getOfficialAmount().toEngineeringString());
 			}
+			
 		}
-		
-	}
+//	if (!TokenManager.hasRole(AFTConstants.FINANCE)&&
+//			!TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)&&
+//			!TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)&&
+//			!TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
+//		outProjectBo ob=tOrderOutsourceMapper.selectByTid(tp.getTid());
+//		if (ob!=null &&ob.getStartType()!=null&& ob.getStartType()==1) {
+//			if((ob.getProjectType()==1&&ob.getPatentType()==0)||(ob.getProjectType()==2)) {
+//				op.setInitialUnitPrice("***");
+//				op.setInitialTotalAmount("***");
+//			}
+//		}
+//		
+//	}
 		return op;
 	}
 
@@ -339,6 +344,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		tp.setId(p.getId());
 		tp.setRemarks(p.getRemarks());
 		tp.setStatus(p.getStatus());
+		tp.setQuantity(p.getQuantity());
 		Integer type=NoticeStatus.PAYMENT_NODE.getCode();
 		String auditStr="重新发起付款:";
 		//状态 0审核 1待支付 2驳回 3已支付 4取消
@@ -347,12 +353,10 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			tp.setChooseType(p.getChooseType());
 			tp.setPaymentType(p.getPaymentType());
 			tp.setPaymentAmount(p.getPaymentAmount());
-			tp.setQuantity(p.getQuantity());
 			tp.setPaymentStatus(p.getPaymentStatus());
 		}else if (p.getStatus()==1) {
 			type= NoticeStatus.PAYMENT_YES.getCode();
 			tp.setApplicationAmount(p.getApplicationAmount());
-			tp.setQuantity(p.getQuantity());
 			auditStr="审核通过:";
 		}else if(p.getStatus()==2) {
 			type= NoticeStatus.PAYMENT_NO.getCode();
@@ -360,7 +364,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			auditStr="审核驳回:";
 		}else if (p.getStatus()==3) {
 			type=NoticeStatus.PAYMENT_COMPLETE.getCode();
-			tp.setPaymentAmount(p.getPaymentAmount()==null?p.getPaymentAmount():p.getApplicationAmount());
+			tp.setPaymentAmount(p.getPaymentAmount()!=null?p.getPaymentAmount():p.getApplicationAmount());
+			
 			confirmPayment(p);
 			auditStr="审核完成";
 		}else if(p.getStatus()==4) {
@@ -991,5 +996,28 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		}
 		
 	}
+
+
+
+
+
+	@Override
+	public boolean checkQuantity(TOrderPayment p) {
+		TOrderPayment tp=tOrderPaymentMapper.selectByPrimaryKey(p.getId());
+		TOrderTask tt=tOrderTaskMapper.selectByPrimaryKey(tp.getTid());
+		List<outOrderPayment> list =tOrderPaymentMapper.selectByTid(tt.getId(), 2);
+		Integer q=0;
+		for (outOrderPayment o : list) {
+			if (p.getId().equals(o.getId())) {
+				q+=p.getQuantity();
+			}else {
+				q+=o.getQuantity();
+			}
+		}
+		if (q>tt.getCommodityQuantity()) {
+			return true;
+		}
+		return false;
+	}
 		
 }