Browse Source

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
a5a4f96586

+ 2 - 2
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -473,8 +473,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	@Override
 	public int pushGuidance(String uid) {
 		User u=userMapper.findUserAccountDetail(uid);
-		if (u!=null &&u.getGuidance()!=0) {
-		 return userMapper.pushUserGuidance(uid,0);
+		if (u!=null &&u.getGuidance()==0) {
+		 return userMapper.pushUserGuidance(uid,2);
 		}
 		return 0;
 	}

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

@@ -1321,7 +1321,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}else {
 			tOrderOutsourceMapper.insertSelective(o);
 		}
-		updateOrderCostAmount(o.getTid());
+		updateOrderCostAmount(o.getTid(),o.getStartType());
 		return 1;
 	}
 
@@ -1329,13 +1329,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 * 发起外包时,通过计算获取项目的成本,订单的成本
 	 * @param tid
 	 */
-	private void updateOrderCostAmount(Integer tid) {
+	private void updateOrderCostAmount(Integer tid,Integer startType) {
 		//计算项目成本
 		List<OutThirdPartyCompany>list=thirdPartyCompanyMapper.selectByTid(tid);
 		BigDecimal tCount=new BigDecimal(0);
 		for (OutThirdPartyCompany op : list) {
 			tCount=tCount.add(new BigDecimal(op.getTotalAmount()));
-			if(op.getOfficialCost()==1) {
+			if(op.getOfficialCost()==1 && startType==1) {
 				BigDecimal sum= new BigDecimal(0);
 				if (op.getCostReduction()==0) {
 					sum= new BigDecimal(op.getOfficialUnitPrice()).multiply(new BigDecimal(op.getQuantity()));

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

@@ -201,7 +201,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public List<OutThirdPartyCompany> selectCompany(Integer tid) {
  		List<OutThirdPartyCompany> list=thirdPartyCompanyMapper.selectByTid(tid);
-		if (!TokenManager.hasRole(AFTConstants.FINANCE)&&!TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
+		if (!TokenManager.hasRole(AFTConstants.FINANCE)&&
+				!TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)) {
 			outProjectBo op =null;
 			if(!list.isEmpty()) op=tOrderOutsourceMapper.selectByTid(tid);
 			//外包type
@@ -214,7 +215,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 					}
 				}
 			}
-					
 		}
 		return list;
 	}