提交

jy-business/src/main/java/com/jy/business/payment/service/impl/PaymentRequestsServiceImpl.java

@@ -15,6 +15,7 @@ import com.jy.business.payment.model.vo.PaymentRequestsVo;
 import com.jy.business.payment.service.PaymentRequestsService;
 import com.jy.flow.model.dto.RetrieveDto;
 import com.jy.flow.model.enums.FlowStatusEnum;
+import com.jy.flow.service.ExecuteService;
 import com.jy.flow.utils.FlowUtil;
 import com.jy.framework.model.constants.CommonConstant;
 import com.jy.framework.model.constants.FlowConstant;
@@ -49,6 +50,9 @@ public class PaymentRequestsServiceImpl implements PaymentRequestsService {
     @Resource
     private CapitalTransactionsService capitalTransactionsService;
 
+    @Resource
+    private ExecuteService executeService;
+
     @Override
     public Page<PaymentRequestsVo> getPage(PaymentRequestsSelectDto dto) {
         return paymentRequestsDao.getPage(dto);
@@ -137,9 +141,11 @@ public class PaymentRequestsServiceImpl implements PaymentRequestsService {
         capitalTransactionsService.add(capitalTransactionsDto);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void retrieve(RetrieveDto dto) {
-        paymentRequestsDao.updateFlowStatus(dto.getBusinessId(), FlowStatusEnum.RETRIEVE.getKeyStr());
+        paymentRequestsDao.updateFlowStatus(dto.getBusinessId() + "", FlowStatusEnum.RETRIEVE.getKeyStr());
+        executeService.retrieveByBusinessId(dto.getBusinessId());
     }
 
 }

jy-flow/src/main/java/com/jy/flow/model/dto/RetrieveDto.java

@@ -8,13 +8,8 @@ import lombok.Setter;
 public class RetrieveDto {
 
     /**
-     * 实例id
-     */
-    private Long instanceId;
-
-    /**
      * 业务id
      */
-    private String businessId;
+    private Long businessId;
 
 }

jy-flow/src/main/java/com/jy/flow/service/ExecuteService.java

@@ -27,10 +27,10 @@ public interface ExecuteService {
      * 撤回
      */
     void retrieveByInstanceId(Long instanceId);
+
     /**
      * 撤回
      */
     void retrieveByBusinessId(Long businessId);
 
-
 }