Browse Source

修改

master
dimengzhe 2 years ago
parent
commit
c80dee3f75
  1. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  2. 1635
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles2.ftl
  3. 1635
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black2.ftl

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@ -820,7 +820,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String remarks = "";
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles";
ftl = "existingvehicles2";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) {
@ -919,7 +919,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
// 现车
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles_black";
ftl = "existingvehicles_black2";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getOrderVinList();
if (stringList.size() > 0) {
@ -1902,8 +1902,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
ExecutorService pool = new ThreadPoolExecutor(1, 2,
1000, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
if("1".equals(appOrderDetailsVo.getPayTypeKey())){//全款
Future<String> future1 = pool.submit(() -> {

1635
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles2.ftl

File diff suppressed because it is too large

1635
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black2.ftl

File diff suppressed because it is too large
Loading…
Cancel
Save