Przeglądaj źródła

修改发起外包

anderx 1 rok temu
rodzic
commit
067c2f7457

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

@@ -1975,6 +1975,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			outsourceLogMapper.insertSelective(ol);
 			TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
 			pushGeneralSendNoticeAndEmail(aids, NoticeStatus.PROJECT_OUTSOURCE_START.getCode(),order, TokenManager.getAdminId(),t2.getApproval(),o.getTid());
+		}else {
+			o.setRefundStatus(1);
 		}
 		List<OutPaymentNode> list=paymentNodeMapper.selectByStatus(0);
 		for (OutPaymentNode outPaymentNode : list) {
@@ -1985,9 +1987,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				paymentNodeMapper.updateByPrimaryKeySelective(pn);
 			}
 		}
-		if (o.getStartType()==1) {//供应商无需审核
-			o.setRefundStatus(1);
-		}
 		if (o.getId()==null) {
 			tOrderOutsourceMapper.insertSelective(o);
 		}else {

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

@@ -32,7 +32,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	 * 新增第三方机构
 	 * @param calculation 0 其他 1软著 2专利
 	 *  patentType 专利名称 0实用新型 1发明专利 2外观专利 3 其他
-	 *  startType  0外包 1供应商  外包全为输入,供应商才分软著和专利从后台选取
+	 *  startType  0外包 1供应商 2专利转让  外包全为输入,供应商才分软著和专利从后台选取
 	 * @param type  type 0正常新增 1发起后新增
 	 * 	type=1用于发起供应商后,用来计算成本,正常则在发起时计算
 	 * @return