Explorar o código

新增运营保障审核

anderx hai 1 ano
pai
achega
1323cb3eea

+ 1 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -414,7 +414,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"驳回原因", "驳回原因"));
 			return res;
 		}
-		return res.data(orderNewService.operationGuaranteeAudit(orderNo,type,reason));
+		return res.data(orderNewService.addOperationGuaranteeAudit(orderNo,type,reason));
 	}
 
 

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

@@ -234,5 +234,5 @@ public interface OrderNewService {
 
 	List<TOrderNew> selectGetAll();
 
-    Object operationGuaranteeAudit(String orderNo, Integer type, String reason);
+    Object addOperationGuaranteeAudit(String orderNo, Integer type, String reason);
 }

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

@@ -695,7 +695,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public Object operationGuaranteeAudit(String orderNo, Integer type, String reason) {
+	public Object addOperationGuaranteeAudit(String orderNo, Integer type, String reason) {
 		TOrderNew t= new TOrderNew();
 		TOrderNew t2= checkDeleteSign(orderNo);
 		List<String> aids = new ArrayList<>();
@@ -714,9 +714,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		} else if (type==1) {
 			t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
 			tl.setProcess(OrderLogProcess.YYBZSHTG.getCode());
-			if (t.getApproval().equals(ApprovalNewState.TPDSH.getCode())){
-				str.append(order.getOperationGuaranteeName()).append(",");
-			}else if (t.getApproval().equals(ApprovalNewState.DSZDSH.getCode())){
+			if (t2.getApproval().equals(ApprovalNewState.TPDSH.getCode())){
+				str.append(order.getApprovalName()).append(",");
+			}else if (t2.getApproval().equals(ApprovalNewState.DSZDSH.getCode())){
 				List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.APPROVAL_DECISION);
 				admins.forEach(e->{
 					aids.add(e.getId());