后端代码提交

src/main/java/com/jkcredit/invoice/controller/localBussiness/CustomerController.java

@@ -163,9 +163,9 @@ public class CustomerController {
     @ApiOperation(value="协议下载", notes="协议下载")
     public RespR contractDownload(String customerRecId,HttpServletResponse response){
         CustomerRec customerRec = (CustomerRec) customerService.contractDownload(customerRecId).getData();
-        String fileName = customerRec.getContractFileName();
-        if(customerRec.getBase64Str()!=null){
-            byte [] byteArray = Base64.getDecoder().decode(customerRec.getBase64Str());
+        String fileName = customerRec.getLowerFileName();
+        if(customerRec.getLowerBase64Str()!=null){
+            byte [] byteArray = Base64.getDecoder().decode(customerRec.getLowerBase64Str());
             InputStream inputStream = new ByteArrayInputStream(byteArray);
 
             OutputStream outputStream = null;

src/main/java/com/jkcredit/invoice/model/entity/customer/CustomerRec.java

@@ -110,6 +110,10 @@ public class CustomerRec {
      */
     private String base64Str;
 
+    private String lowerBase64Str;
+
+    private String lowerFileName;
+
     /**
      * 1-协议已上传 2-协议未上传
      */
@@ -319,4 +323,20 @@ public class CustomerRec {
     public void setContrantNum(String contrantNum) {
         this.contrantNum = contrantNum;
     }
+
+    public String getLowerBase64Str() {
+        return lowerBase64Str;
+    }
+
+    public void setLowerBase64Str(String lowerBase64Str) {
+        this.lowerBase64Str = lowerBase64Str;
+    }
+
+    public String getLowerFileName() {
+        return lowerFileName;
+    }
+
+    public void setLowerFileName(String lowerFileName) {
+        this.lowerFileName = lowerFileName;
+    }
 }

src/main/java/com/jkcredit/invoice/service/customer/impl/CustomerServiceImpl.java

@@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service("customerService")
 public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> implements CustomerService{
     @Autowired
@@ -32,6 +34,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
 
     @Autowired
     CustomerRecMapper customerRecMapper;
+
+    @Autowired
+    CustomerService customerService;
     @Override
     public IPage findAllCustomers(Page page, Customer customer) {
         return baseMapper.selectAllByPage(page,customer);
@@ -62,7 +67,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
         return true;
     }
     public RespR contractAdd(CustomerRec customerRec){
-        customerRec = customerRecMapper.selectByCustomerNameAndCompanyConcat(customerRec);
+        customerRecMapper.updateByPrimaryKeySelective(customerRec);
         if(customerRec.getRecStatus().intValue() == 2){
             return new RespR(false,"无法上传协议，未注册");
         }
@@ -95,13 +100,19 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
     }
 
     public RespR customeRec(CustomerRec customerRec){
-        customerRec = customerRecMapper.selectByCustomerNameAndCompanyConcat(customerRec);
-        if(customerRec.getRecStatus().intValue() == 1 && customerRec.getContractSuc() == 1){
-            return new RespR(false,"已经注册过了");
+        //customerRec = customerRecMapper.selectByCustomerNameAndCompanyConcat(customerRec);
+        customerRecMapper.updateByPrimaryKeySelective(customerRec);
+        //主动查询上游接口，如果已经备案则更新
+        RespR respR1 = customerService.customerRecQuery(customerRec);
+        if(respR1.getCode() == 0){
+            List<B2bCompanyModel> b2bCompanyModels = (List<B2bCompanyModel>)respR1.getData();
+            if(b2bCompanyModels.size()==1){
+                customerRec.setCompanyNum(b2bCompanyModels.get(0).getCompanyNum());
+                customerRec.setRecStatus(1);
+                customerRecMapper.updateByPrimaryKeySelective(customerRec);
+                return new RespR("注册成功");
+            }
         }
-        /*if(customerRec.getRecStatus().intValue() == 1){
-            return contractAdd(customerRec);
-        }*/
         CompanyAddRequest companyAddRequest = buildCompany(customerRec);
         //注册企业
         RespR<CompanyAddResponse> respR = commInterFace.addCompany(companyAddRequest);

src/main/java/com/jkcredit/invoice/service/lowerService/impl/CustomerLowerServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jkcredit.invoice.service.lowerService.impl;
 
+import cn.com.taiji.sdk.model.comm.protocol.eoms.company.B2bCompanyModel;
 import cn.com.taiji.sdk.model.comm.protocol.tts.card.server.*;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterResponse;
@@ -10,6 +11,7 @@ import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
+import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
 import com.jkcredit.invoice.service.lowerService.vo.EtcBindVo;
 import com.jkcredit.invoice.service.lowerService.vo.EtcValidVo;
@@ -41,6 +43,8 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
 
     @Autowired
     SelfCarInterface selfCarInterface;
+    @Autowired
+    CustomerService customerService;
     @Override
     public RespR customeRec(List<CustomerRec> customerRecs) {
 
@@ -52,8 +56,17 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
                 res.append(customerRec.getCustomerName()+"不存在或已经停用;");
                 return;
             }
-            //默认备案状态为备案中 0 -备案中 1.备案失败 2.备案完成
+            //默认备案状态为备案中 2-失败 1-成功 3-等待协议上传 4-停用 0-备案中
             customerRec.setRecStatus(0);
+            //主动查询上游接口，如果已经备案则更新
+            RespR respR = customerService.customerRecQuery(customerRec);
+            if(respR.getCode() == 0){
+               List<B2bCompanyModel> b2bCompanyModels = (List<B2bCompanyModel>)respR.getData();
+               if(b2bCompanyModels.size()==1){
+                   customerRec.setCompanyNum(b2bCompanyModels.get(0).getCompanyNum());
+                   customerRec.setRecStatus(1);
+               }
+            }
             //客户备案信息入表
             CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompany(customerRec);
             customerRec.setCreatetime(DateUtil.getCurrentDateStr());

src/main/resources/mapper/customer/CustomerRecMapper.xml

@@ -27,12 +27,14 @@
     <result column="contractSuc" property="contractSuc" jdbcType="INTEGER" />
     <result column="base64Str" property="base64Str" jdbcType="VARCHAR" />
     <result column="contrantNum" property="contrantNum" jdbcType="VARCHAR" />
+    <result column="lowerFileName" property="lowerFileName" jdbcType="VARCHAR" />
+    <result column="lowerBase64Str" property="lowerBase64Str" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, customerName,company_leader, company_leader_Phone, company_name, company_referenceNum, company_openbank,
     company_openbank_acc, company_adress, company_phone, createTime, company_belong_name, 
     rec_status, inter_type,bussiness_type,company_type,operating_rangeType,company_num,service_startTime
-    ,service_endTime,service_type,contractFileName,contractSuc,contrantNum
+    ,service_endTime,service_type,contractFileName,contractSuc,contrantNum,lowerFileName
   </sql>
 
   <select id="selectAllByPage" resultMap="BaseResultMap">
@@ -48,7 +50,7 @@
   </select>
   <select id="selectByPrimaryKeyHasBase64" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
-    <include refid="Base_Column_List" />,base64Str
+    <include refid="Base_Column_List" />,base64Str,lowerBase64Str
     from t_customer_rec
     where id = #{id,jdbcType=INTEGER}
   </select>
@@ -80,14 +82,14 @@
       company_openbank_acc, company_adress, company_phone, 
       createTime, company_belong_name, rec_status, 
       inter_type,bussiness_type,company_type,operating_rangeType,company_num,
-      service_startTime,service_endTime,service_type,contractFileName,base64Str,contractSuc
+      service_startTime,service_endTime,service_type,contractFileName,base64Str,contractSuc,lowerFileName,lowerBase64Str
       )
     values (#{customerName,jdbcType=VARCHAR}, #{companyLeader,jdbcType=VARCHAR}, #{companyLeaderPhone,jdbcType=VARCHAR},
       #{companyName,jdbcType=VARCHAR}, #{companyReferencenum,jdbcType=VARCHAR}, #{companyOpenbank,jdbcType=VARCHAR}, 
       #{companyOpenbankAcc,jdbcType=VARCHAR}, #{companyAdress,jdbcType=VARCHAR}, #{companyPhone,jdbcType=VARCHAR}, 
       #{createtime,jdbcType=TIMESTAMP}, #{companyBelongName,jdbcType=VARCHAR}, #{recStatus,jdbcType=INTEGER}, 
       #{interType,jdbcType=INTEGER}, #{bussinessType,jdbcType=INTEGER},#{companyType,jdbcType=INTEGER},#{operatingRangeType,jdbcType=INTEGER},#{companyNum,jdbcType=VARCHAR},
-      #{serviceStartTime,jdbcType=VARCHAR},#{serviceEndTime,jdbcType=VARCHAR},#{serviceType,jdbcType=INTEGER},#{contractFileName,jdbcType=VARCHAR},#{base64Str,jdbcType=VARCHAR},#{contractSuc,jdbcType=INTEGER}
+      #{serviceStartTime,jdbcType=VARCHAR},#{serviceEndTime,jdbcType=VARCHAR},#{serviceType,jdbcType=INTEGER},#{contractFileName,jdbcType=VARCHAR},#{base64Str,jdbcType=VARCHAR},#{contractSuc,jdbcType=INTEGER},#{lowerFileName,jdbcType=VARCHAR},#{lowerBase64Str,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >