二次审批操作 不使用JolyneCenter 使用jpa，加快执行速递

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderServiceImpl.java

@@ -320,9 +320,7 @@ public class OrderServiceImpl implements OrderService{
             if (conscont.getGenerateStatus() != CONSCONT_STATUS) {
                 log.info("secondAudit,合同状态不对，channelOrderNumber=".concat(channelOrderNumber));
                 // 修改合同状态
-                ArrayList<String> updateContract = Lists.newArrayList();
-                updateContract.add("update contract set generate_status = 2 where user_id = " + orderMapping.getQgUserId() + ";");
-                jolyneService.executeSQL(JolyneDB.XYQB, JolyneUtil.getJolneSql(updateContract));
+                xyqbCenterService.updateContractStatus(orderMapping.getQgUserId(), CONSCONT_STATUS);
             }
         } else {
             // 合同为空 log表记录问题，UI用户查询

src/main/java/cn/quantgroup/cashloanflowboss/spi/jolyne/JolyneServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
 
 /**
@@ -71,11 +72,11 @@ public class JolyneServiceImpl implements JolyneService {
             }
         }
 
-        if (waitingFundingCorpOperatePeople.getCreatedAt().getTime() > (System.currentTimeMillis() - 5 * 60 * 1000)) {
+        long fiveAgo = System.currentTimeMillis() - 5 * 60 * 1000;
+        if (waitingFundingCorpOperatePeople.getCreatedAt().getTime() > fiveAgo) {
             // 更新待放款时间(5分钟之前)
-            ArrayList<String> updateWaitingFundingCorpOperatePeople = Lists.newArrayList();
-            updateWaitingFundingCorpOperatePeople.add("update waiting_funding_corp_operate_people set created_at = DATE_SUB(created_at, interval 5 minute) where loan_application_history_id = " + loanId + ";");
-            this.executeSQL(JolyneDB.XYQB, JolyneUtil.getJolneSql(updateWaitingFundingCorpOperatePeople));
+            waitingFundingCorpOperatePeople.setCreatedAt(new Timestamp(fiveAgo));
+            xyqbCenterService.saveWaitingFundingCorpOperatePeople(waitingFundingCorpOperatePeople);
         }
 
         try {

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/repository/ContractRepository.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Created by WeiWei on 2019/8/13.
@@ -21,7 +22,7 @@ public interface ContractRepository extends JpaRepository<Contract, Long> {
      * @param status
      * @return
      */
-    @Deprecated
+    @Transactional(rollbackFor = Exception.class)
     @Modifying
     @Query(value = "update contract set generate_status = ?2 where user_id = ?1", nativeQuery = true)
     int updateContractStatus(Long userId, Integer status);

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/service/XYQBCenterService.java

@@ -17,6 +17,7 @@ import java.util.Map;
  * @author: suntao
  */
 public interface XYQBCenterService {
+
     int updateContractStatus(Long userId, Integer status);
 
     Map queryLendingRecordCount(Long fundId);

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/source/XYQBDataSourceConfiguration.java

@@ -2,6 +2,7 @@ package cn.quantgroup.cashloanflowboss.spi.xyqb.source;
 
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
@@ -43,7 +44,7 @@ public class XYQBDataSourceConfiguration {
 
     }
 
-    @Bean
+    @Bean(name = "xyqbEntityManager")
     public LocalContainerEntityManagerFactoryBean xyqbEntityManager(EntityManagerFactoryBuilder builder, DataSource xyqbDataSource) {
 
         return builder.dataSource(xyqbDataSource)
@@ -53,8 +54,8 @@ public class XYQBDataSourceConfiguration {
 
     }
 
-    @Bean
-    public PlatformTransactionManager xyqbTransactionManager(EntityManagerFactory entityManagerFactory) {
+    @Bean(name = "xyqbTransactionManager")
+    public PlatformTransactionManager xyqbTransactionManager(@Qualifier("xyqbEntityManager") EntityManagerFactory entityManagerFactory) {
         return new JpaTransactionManager(entityManagerFactory);
     }
 

src/test/java/cn/quantgroup/cashloanflowboss/service/contract/ContractServiceTest.java

+package cn.quantgroup.cashloanflowboss.service.contract;
+
+import cn.quantgroup.cashloanflowboss.CashLoanFlowBossApplicationTests;
+import cn.quantgroup.cashloanflowboss.spi.xyqb.service.XYQBCenterService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * function:
+ * date: 2019/12/6
+ *
+ * @author: suntao
+ */
+public class ContractServiceTest extends CashLoanFlowBossApplicationTests {
+
+    @Autowired
+    private XYQBCenterService xyqbCenterService;
+
+    @Test
+    public void testt() {
+        xyqbCenterService.updateContractStatus(5L, 2);
+    }
+}