diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index eb09c11098..43261440e0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -1953,13 +1953,13 @@ public class CommonContractService extends MybatisBaseService future4 = pool.submit(() -> { return getReceiveCar(map, appOrderDetailsVo); }); - Future future5 = pool.submit(() -> { + /* Future future5 = pool.submit(() -> { return getInvoicMessage(map, appOrderDetailsVo); - }); + });*/ String singleFinalPriceOne = priceInfo.getSingleFinalPrice(); String depositOne = depositInfo.getDeposit(); //单台成交价与单台订金相等 - Future future6 = null; + /* Future future6 = null; if (new BigDecimal(singleFinalPriceOne).compareTo(new BigDecimal(depositOne)) != 0) { future6 = pool.submit(() -> { return getCarFin(map, appOrderDetailsVo); @@ -1967,7 +1967,7 @@ public class CommonContractService extends MybatisBaseService future7 = pool.submit(() -> { return getMoneyFin(map, appOrderDetailsVo); - }); + });*/ Future future8 = null; if (!"02".equals(appOrderDetailsVo.getInvoiceType())) { future8 = pool.submit(() -> { @@ -2010,11 +2010,11 @@ public class CommonContractService extends MybatisBaseService 0) { // String typeName = ContractTemplateEnum.CONTRACTALL.getName() + "_" + DateUtil.format(new Date(), "yyyMMdd") + System.currentTimeMillis() + ".pdf"; diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java index 2789ac42df..8ba3451a4d 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java @@ -75,7 +75,8 @@ public class SysStaffinfoDto implements Dto { @ApiModelProperty(value = "住址", required = false) private String address; @ApiModelProperty(value = "手机号", required = true) - @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确") +// @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确") + @Pattern(regexp = "^[0-9]{11}$", message = "手机号码格式不正确") @NotBlank(message = "手机号不能为空") private String mobile; @ApiModelProperty(value = "邮箱", required = false) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java index 4e77c50a7f..59f5e45415 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CarModelVo.java @@ -4,6 +4,8 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -31,4 +33,14 @@ public class CarModelVo implements Vo { private String json; private String requestCode; + + private String pluginName; + + private String aRouterClass; + + private String aRouterMethod; + + private List aRouterParamType; + + private List aRouterParamValue; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java index 884a7a5bf3..c605978e84 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -104,6 +104,15 @@ public class CommonService { appSubVersionVo.setJson(JSONObject.toJSONString(map)); BeanUtil.copyProperties(appSubVersionVo, carModelVo); carModelVo.setRequestCode("1002"); + carModelVo.setPluginName("autoservice"); + carModelVo.setARouterClass("com.anrui.android.plugin.autoservice.manager.ARouterManager"); + carModelVo.setARouterMethod("DETAIL_SALE_ORDER"); + List aRouterParamType = new ArrayList<>(); + aRouterParamType.add("STRING"); + List aRouterParamValue = new ArrayList<>(); + aRouterParamValue.add(saleOrderSid); + carModelVo.setARouterParamType(aRouterParamType); + carModelVo.setARouterParamValue(aRouterParamValue); return rb.success().setData(carModelVo); } @@ -120,6 +129,16 @@ public class CommonService { appSubVersionVo.setJson(JSONObject.toJSONString(map)); BeanUtil.copyProperties(appSubVersionVo, carModelVo); carModelVo.setRequestCode("1003"); + carModelVo.setPluginName("autoservice"); + carModelVo.setARouterClass("com.anrui.android.plugin.autoservice.manager.ARouterManager"); + carModelVo.setARouterMethod("EDIT_SALE_ORDER_ONE_CAR_FINANCE"); + List aRouterParamType = new ArrayList<>(); + aRouterParamType.add("STRING"); + aRouterParamType.add("INT"); + List aRouterParamValue = new ArrayList<>(); + aRouterParamValue.add(orderSid); + carModelVo.setARouterParamType(aRouterParamType); + carModelVo.setARouterParamValue(aRouterParamValue); return rb.success().setData(carModelVo); } }