移动端合同问题调式

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

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -31,13 +32,13 @@ public class AppCommonContractInitVo implements Vo {
     private String contractPrice;
 
     @ApiModelProperty("新车买卖合同")
-    private List<String> contractImages;
+    private List<String> contractImages = new ArrayList<>();
 
     @ApiModelProperty("现场签署图片")
-    private List<String> siteSigImages;
+    private List<String> siteSigImages = new ArrayList<>();
 
     @ApiModelProperty("身份证图片")
-    private List<String> idCardImages;
+    private List<String> idCardImages = new ArrayList<>();
 
     @ApiModelProperty("客户类型")
     private String customerKey;
@@ -66,5 +67,10 @@ public class AppCommonContractInitVo implements Vo {
     @ApiModelProperty("身份证图片")
     private String idImagesUrl;
 
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
 
 }

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

@@ -45,6 +45,8 @@ public class AppCommonContractPageVo implements Vo {
     private Boolean isShowDownload;
     @JsonIgnore
     private String commonContractUrl;
+    @JsonProperty("number")
+    private String num;
 
 
 

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

@@ -37,6 +37,11 @@ public class CommonContract extends BaseEntity {
     
 	@ApiModelProperty("合同类型")
     private String contractType;
+
+    @ApiModelProperty("客户类型")
+    private String customerType;
+    @ApiModelProperty("客户类型key")
+    private String customerTypeKey;
     
 	@ApiModelProperty("客户sid")
     private String customerSid;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java

@@ -26,4 +26,21 @@ public class DictCommonEnum {
             this.remarks = remarks;
         }
     }
+
+    /**
+     * 客户类型
+     */
+    @Getter
+    public static enum customerType {
+        GR_TYPE("1", "个人"),
+        QY_TYPE("2", "企业"),
+        ;
+        private final String code;
+        private final String remarks;
+
+        customerType(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
 }

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

@@ -77,7 +77,8 @@
                contractAmount                              AS contractPrice,
                if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
                if(length(nodeState) > 0, false, true)      as isShowUpdate,
-               commonContractUrl
+               commonContractUrl,
+               num
         FROM common_contract
         <where>
             ${ew.sqlSegment}
@@ -94,19 +95,23 @@
 
     <!--移动端-初始化合同审核-->
     <select id="getContractInfo" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractInitVo">
-        SELECT sid            AS contractSid,
+        SELECT sid             AS contractSid,
                price,
-               num            AS `number`,
+               num             AS `number`,
-               modelName      AS model,
+               modelName       AS model,
                partyB,
-               contractNo     AS contractId,
+               contractNo      AS contractId,
-               contractAmount AS contractPrice,
+               contractAmount  AS contractPrice,
                customerSid,
                appdixUrl,
                sceneSignUrl,
+               idImagesUrl,
                taskId,
-               procInstId     as procInsId,
+               procInstId      as procInsId,
-               staffSid       as userSid
+               staffSid        as userSid,
+               customerTypeKey as customerKey,
+               modelSid,
+               configSid
         FROM common_contract
         WHERE sid = #{contractSid}
     </select>

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

@@ -987,7 +987,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         AppCommonContractQuery query = pagerQuery.getParams();
         QueryWrapper<CommonContract> qw = appCreateQueryWrapper(query);
         IPage<CommonContract> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<AppCommonContractPageVo> iPage = baseMapper.getContractList(page, qw,query.getNames());
+        IPage<AppCommonContractPageVo> iPage = baseMapper.getContractList(page, qw, query.getNames());
         List<AppCommonContractPageVo> records = iPage.getRecords();
         records.removeAll(Collections.singleton(null));
         if (!records.isEmpty()) {
@@ -1050,24 +1050,28 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             vo.setSiteSigImages(siteSig);
         }
         if (StringUtils.isNotBlank(vo.getCustomerKey())) {
-            if (vo.getCustomerKey().equals("1")) {
+            if ("1".equals(vo.getCustomerKey())) {
-                vo.setIdCardArchives(false);
+                //查询客户的档案库中是否有图片
-                if (StringUtils.isNotBlank(vo.getSceneSignUrl())) {
+                ResultBean<List<String>> resultBean = crmCustomerTempFeign.selectCustomerFile(vo.getCustomerSid());
-
+                List<String> stringList = resultBean.getData();
-                    String[] split3 = vo.getSceneSignUrl().split(",");
+                if (stringList.size() > 0) {
-                    List<String> idCard = new ArrayList<>();
+                    vo.setIdCardArchives(true);
-                    List<String> idCardImages = Arrays.asList(split3);
+                    vo.setIdCardImages(stringList);
-                    for (String idCardImage : idCardImages) {
-                        String idCardImagesUrl = urlPrefix + idCardImage;
-                        idCard.add(idCardImagesUrl);
-                    }
-                    vo.setIdCardImages(idCard);
                 } else {
-                    vo.setIdCardImages(new ArrayList<>());
+                    vo.setIdCardArchives(false);
+                    if (StringUtils.isNotBlank(vo.getIdImagesUrl())) {
+                        String[] split3 = vo.getSceneSignUrl().split(",");
+                        List<String> idCard = new ArrayList<>();
+                        List<String> idCardImages = Arrays.asList(split3);
+                        for (String idCardImage : idCardImages) {
+                            String idCardImagesUrl = urlPrefix + idCardImage;
+                            idCard.add(idCardImagesUrl);
+                        }
+                        vo.setIdCardImages(idCard);
+                    } else {
+                        vo.setIdCardImages(new ArrayList<>());
+                    }
                 }
-            } else if (vo.getCustomerKey().equals("2")) {
-                vo.setIdCardArchives(true);
-//                往里添加客户档案里的身份证信息
             }
         }
         return vo;
@@ -1408,7 +1412,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     //订金
                     commonContract.setDeposit(new BigDecimal(depositTotal));
                     //合同金额
-                    commonContract.setContractAmount(depositTotal);
+                    commonContract.setContractAmount(appOrderDetailsVo.getPriceInfo().getTotalPrice());
                     //合同附件
                     //身份证信息附件
                     //车型sid
@@ -1423,6 +1427,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                     //单台订金
                     commonContract.setOneDeposit(new BigDecimal(depositInfo.getDeposit()));
                     commonContract.setCommonContractUrl(finalUrl);
+                    commonContract.setCustomerType(appOrderDetailsVo.getCustomerType());
+                    commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey());
                     save(commonContract);
                     if (list.size() > 0) {
                         //添加合同下载路径

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

@@ -30,6 +30,8 @@ public class AppOrderDetailsVo implements Vo {
     private String phone;
     @ApiModelProperty(value = "客户类型")
     private String customerKey;
+    @ApiModelProperty("客户类型")
+    private String customerType;
     @ApiModelProperty(value = "订单类型")
     private String orderType;
     @ApiModelProperty(value = "挂靠公司")

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

@@ -93,11 +93,11 @@
             resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderBillInfoVo">
         SELECT customerSid,
                customerName,
-               mobile            AS customerMobile,
+               mobile               AS customerMobile,
-               payTypeKey        AS payType,
+               payTypeKey           AS payType,
-               payType           AS payValue,
+               payType              AS payValue,
-               billingTypeKey    AS invoiceType,
+               billingTypeKey       AS invoiceType,
-               billingType       AS invoiceValue,
+               billingType          AS invoiceValue,
                affiliatedCompany,
                affiliatedCompanySid as affiliatedOrgSid,
                financePlan,
@@ -175,6 +175,7 @@
                bo.customerName                        as name,
                bo.mobile                              as phone,
                bo.customerClassKey                    as customerKey,
+               bo.customerClass                       as customerType,
                bo.affiliatedCompany                   as affiliated,
                bo.billingType                         as invoiceType,
                bo.orgName                             as departmentName,
@@ -209,7 +210,7 @@
     </update>
 
     <select id="selectNum" resultType="int">
-        select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED),0) as code
+        select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
         from bus_sales_order
         where billNo LIKE concat(#{bill}, '%')
     </select>

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -147,5 +147,8 @@ public interface CrmCustomerTempFeign {
     @PutMapping("/saveCustomerArchives")
     public ResultBean saveCustomerArchives(@Valid @RequestBody AppCrmCustomerTempArchivesDto dto);
 
+    @ResponseBody
+    @GetMapping("/selectCustomerFile/{customerSid}")
+    public ResultBean<List<String>> selectCustomerFile(@PathVariable("customerSid")String customerSid);
 
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -115,5 +115,10 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<String>> selectCustomerFile(String customerSid) {
+		return null;
+	}
+
 
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml

@@ -26,7 +26,6 @@
                ccf.dataType AS `key`,
                ccf.fileName AS title,
                createTime
---                (SELECT MAX(cf.createTime) FROM crm_file cf WHERE cf.linkSid = ccf.sid) AS createTime
         FROM crm_customer_file ccf
         WHERE ccf.linkSid = #{customerSid}
     </select>

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java

@@ -32,8 +32,6 @@ import com.yxt.anrui.base.api.basedatalist.BaseDataListFeign;
 import com.yxt.anrui.base.api.basedatalist.BaseDataListVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.crm.api.crmcustomerfile.*;
-import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto;
-import com.yxt.anrui.crm.api.crmcustomerfile.AppCustomerArchivesDataDto;
 import com.yxt.anrui.crm.api.crmfile.CrmFile;
 import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo;
 import com.yxt.anrui.crm.api.crmfile.CrmFileDto;
@@ -41,19 +39,16 @@ import com.yxt.anrui.crm.biz.crmfile.CrmFileService;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
-import com.yxt.common.base.utils.DateUtils;
-import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -311,4 +306,22 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
         String dataType = "身份证";
         return baseMapper.selectIdImageByCustomerSid(customerSid, dataType);
     }
+
+    public ResultBean<List<String>> selectCustomerFile(String customerSid) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<AppCustomerArchivesDataVo> dataVos = baseMapper.selectByCustomerSid(customerSid);
+        List<String> list = new ArrayList<>();
+        if (dataVos.size() > 0) {
+            for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) {
+                String sid = appCustomerArchivesDataVo.getSid();
+                List<CrmFile> listVo = baseMapper.selArchivesFileImageBySid(sid);
+                for (CrmFile crmFile : listVo) {
+                    String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath();
+                    list.add(url);
+                }
+                appCustomerArchivesDataVo.setFiles(list);
+            }
+        }
+        return rb.success().setData(list);
+    }
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -263,5 +263,10 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerFileService.saveCustomerArchives(dto);
     }
 
+    @Override
+    public ResultBean<List<String>> selectCustomerFile(String customerSid) {
+        return crmCustomerFileService.selectCustomerFile(customerSid);
+    }
+
 
 }

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

@@ -57,13 +57,8 @@ public class CommonContractInitVo implements Vo {
 
     @ApiModelProperty("客户sid")
     private String customerSid;
-
+    @ApiModelProperty("配置sid")
-    @ApiModelProperty("合同附件")
+    private String configSid;
-    private String appdixUrl;
+    @ApiModelProperty("车型sid")
-
+    private String modelSid;
-    @ApiModelProperty("现场签署图片附件")
-    private String sceneSignUrl;
-
-    @ApiModelProperty("身份证图片")
-    private String idImagesUrl;
 }