移动端销售订单和合同审核

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractInitVo.java

@@ -71,6 +71,11 @@ public class AppCommonContractInitVo implements Vo {
     private String configSid;
     @ApiModelProperty("车型sid")
     private String modelSid;
+    @ApiModelProperty("1全款，2贷款")
+    private String buyTypeKey;
+
+    @ApiModelProperty("业务sid")
+    private String busSid;
 
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -113,7 +113,8 @@
                customerTypeKey as customerKey,
                modelSid,
                configSid,
-               customerSid
+               customerSid,
+               busSid
         FROM common_contract
         WHERE sid = #{contractSid}
     </select>
@@ -156,6 +157,8 @@
     </select>
 
     <select id="selectByNo" resultType="com.yxt.anrui.base.api.commoncontract.CommonContract">
-        select * from common_contract where contractNo = #{contractNo}
+        select *
+        from common_contract
+        where contractNo = #{contractNo}
     </select>
 </mapper>

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

@@ -1095,6 +1095,11 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
      */
     public AppCommonContractInitVo getContractInfo(String contractSid, String userSid) {
         AppCommonContractInitVo vo = baseMapper.getContractInfo(contractSid);
+        ResultBean<AppOrderDetailsVo> busSalesOrderFeignSaleOrderDetails = busSalesOrderFeign.getSaleOrderDetails(vo.getBusSid());
+        if (busSalesOrderFeignSaleOrderDetails.getSuccess()) {
+            AppOrderDetailsVo appOrderDetailsVo = busSalesOrderFeignSaleOrderDetails.getData();
+            vo.setBuyTypeKey(appOrderDetailsVo.getPayTypeKey());
+        }
         String urlPrefix = fileUploadComponent.getUrlPrefix();
         if (StringUtils.isNotBlank(vo.getAppdixUrl())) {
             String[] split1 = vo.getAppdixUrl().split(",");

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSaleOrderStateVo.java

@@ -70,4 +70,7 @@ public class AppBusSaleOrderStateVo implements Vo {
     @ApiModelProperty("任务id")
     private String taskId;
 
+    @ApiModelProperty("客户联系电话")
+    private String customerMobile;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -1408,6 +1408,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //单据状态
         BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
         if (busSalesOrder != null) {
+            vo.setCustomerMobile(busSalesOrder.getMobile());
             vo.setUserSid(busSalesOrder.getCreateBySid());
             vo.setProcInsId(busSalesOrder.getProcInstId());
             vo.setTaskId(busSalesOrder.getTaskId());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/contract/CommonContractInitVo.java

@@ -61,4 +61,6 @@ public class CommonContractInitVo implements Vo {
     private String configSid;
     @ApiModelProperty("车型sid")
     private String modelSid;
+    @ApiModelProperty("1全款，2贷款")
+    private String buyTypeKey;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderStateVo.java

@@ -74,4 +74,7 @@ public class OrderStateVo implements Vo {
 
     @ApiModelProperty("任务id")
     private String taskId;
+
+    @ApiModelProperty("客户电话")
+    private String customerMobile;
 }