后端代码提交

src/main/java/com/jkcredit/invoice/credit/custInterface/NoCarInterServiceImpl.java

@@ -8,7 +8,6 @@ import com.jkcredit.invoice.common.DataResult;
 import com.jkcredit.invoice.mapper.Binvoce.BillInvoiceMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerMapper;
-import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
@@ -16,6 +15,7 @@ import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
 import com.jkcredit.invoice.model.entity.manager.Param;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
+import com.jkcredit.invoice.service.customer.CustomerRecService;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.*;
@@ -49,7 +49,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
     @Autowired
     NoCarWaybillMapper noCarWaybillMapper;
     @Autowired
-    CustomerRecMapper customerRecMapper;
+    CustomerRecService customerRecMapper;
 
 
     @Autowired
@@ -268,7 +268,7 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             customerRec.setCustomerName(appKey);
             customerRec.setCompanyReferencenum(taxplayerCode);
             customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
-            if(customerRec == null){
+            if(customerRec == null || customerRec.getRecStatus()!=1){
                 result.setMsg("客户："+appKey+";税号"+taxplayerCode+"未在平台备案成功，请先做备案");
                 return result;
             }

src/main/java/com/jkcredit/invoice/credit/custInterface/SelfCarInterServiceImpl.java

@@ -4,9 +4,9 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jkcredit.invoice.common.DataResult;
-import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
+import com.jkcredit.invoice.service.customer.CustomerRecService;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.*;
 import com.jkcredit.invoice.service.selfCar.SelfCarService;
@@ -31,7 +31,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
     SelfCarServiceL selfCarService;
 
     @Autowired
-    CustomerRecMapper customerRecMapper;
+    CustomerRecService customerRecMapper;
 
     /**
      * 自有车 用户卡列表查询接口
@@ -507,7 +507,7 @@ public class SelfCarInterServiceImpl implements SelfCarInterService {
             customerRec.setCustomerName(appKey);
             customerRec.setCompanyNum(companyNum);
             CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompanyNum(customerRec);
-            if (null == customerRec1){
+            if (null == customerRec1 ){
                 result.setMsg("该企业编号未注册企业!");
                 return result;
             }

src/main/java/com/jkcredit/invoice/mapper/customer/CustomerRecMapper.java

@@ -14,7 +14,7 @@ public interface CustomerRecMapper extends BaseMapper<CustomerRec> {
     int deleteByPrimaryKey(Integer id);
 
     int insert(CustomerRec record);
-
+    int updateByCompany(CustomerRec customerRec);
     int insertSelective(CustomerRec record);
 
     CustomerRec selectByPrimaryKey(String id);
@@ -25,9 +25,10 @@ public interface CustomerRecMapper extends BaseMapper<CustomerRec> {
     CustomerRec selectByCustomerNameAndCompany(CustomerRec record);
     CustomerRec selectByCustomerNameAndCompanyConcat(CustomerRec record);
     CustomerRec selectByCustomerNameAndCompanyReference(CustomerRec record);
+    List<CustomerRec> selectByCompanyReference(String companyReference);
     //根据客户名称和 企业编码查询唯一数据
     CustomerRec selectByCustomerNameAndCompanyNum(CustomerRec record);
-
+    List<CustomerRec> selectByCompanyNum(CustomerRec record);
     int updateByPrimaryKeySelective(CustomerRec record);
 
     int updateByPrimaryKey(CustomerRec record);

src/main/java/com/jkcredit/invoice/service/customer/CustomerRecService.java

@@ -16,4 +16,8 @@ public interface CustomerRecService {
     IPage findAllCustomerRec(Page page, CustomerRec customerRec);
 
     List<CustomerRec> findAllCustomerRecForExport(CustomerRec customerRec);
+
+    CustomerRec selectByCustomerNameAndCompanyReference(CustomerRec record);
+
+    CustomerRec selectByCustomerNameAndCompanyNum(CustomerRec customerRec);
 }

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

@@ -24,4 +24,46 @@ public class CustomerRecServiceImpl extends ServiceImpl<CustomerRecMapper,Custom
     public List<CustomerRec> findAllCustomerRecForExport(CustomerRec customerRec) {
         return customerRecMapper.selectAllByPageExport(customerRec);
     }
+
+    @Override
+    public synchronized CustomerRec selectByCustomerNameAndCompanyReference(CustomerRec record) {
+        CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompanyReference(record);
+
+        if(customerRec == null){
+            //根据税号查询企业，若业务类型一致自动挂到当前客户下
+           List<CustomerRec> customerRecs = customerRecMapper.selectByCompanyReference(customerRec.getCompanyReferencenum());
+           if(customerRecs!=null && customerRecs.size()>0){
+               for(CustomerRec customerRec1:customerRecs){
+                   if(customerRec1.getBussinessType().equals(customerRec.getBussinessType())){
+                       customerRec1.setCustomerName(customerRec.getCustomerName());
+                       customerRec = customerRec1;
+                       customerRecMapper.insert(customerRec);
+                       break;
+                   }
+               }
+           }
+        }
+        return customerRec;
+    }
+
+    @Override
+    public synchronized CustomerRec selectByCustomerNameAndCompanyNum(CustomerRec record) {
+        CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompanyNum(record);
+        if(customerRec == null){
+            //根据税号查询企业，若业务类型一致自动挂到当前客户下
+            List<CustomerRec> customerRecs = customerRecMapper.selectByCompanyNum(customerRec);
+            if(customerRecs!=null && customerRecs.size()>0){
+                for(CustomerRec customerRec1:customerRecs){
+                    if(customerRec1.getBussinessType().equals(customerRec.getBussinessType())){
+                        customerRec1.setCustomerName(customerRec.getCustomerName());
+                        customerRec = customerRec1;
+                        customerRecMapper.insert(customerRec);
+                        break;
+                    }
+                }
+            }
+        }
+        if(customerRec == null || customerRec.getRecStatus()!=1){customerRec = null;}
+        return customerRec;
+    }
 }

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

@@ -124,7 +124,10 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
 
     public RespR customeRec(CustomerRec customerRec){
         log.info("开始客户注册：CustomerServiceImpl.customeRec{}",customerRec);
-        //customerRec = customerRecMapper.selectByCustomerNameAndCompanyConcat(customerRec);
+        CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompanyReference(customerRec);
+        if(customerRec1.getRecStatus() == 1){
+            return new RespR(false,"客户已经备案成功，无需备案");
+        }
         customerRecMapper.updateByPrimaryKeySelective(customerRec);
         //主动查询上游接口，如果已经备案则更新
     /*    RespR respR1 = customerService.customerRecQuery(customerRec);
@@ -155,7 +158,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
 
         customerRec.setRecStatus(1);
         customerRec.setCompanyNum(companyNum);
-        customerRecMapper.updateByPrimaryKeySelective(customerRec);
+        customerRecMapper.updateByCompany(customerRec);
         //contractAdd(customerRec);
         return new RespR(true,respR.getData().toString());
     };

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

@@ -271,8 +271,11 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             log.info("余额不足{}",applQueryInvVo);
             return ;
         }
-        CustomerRec customerRec = customerRecMapper.selectByPrimaryKey(applQueryInvVo.getCompanyNum());
-        if(customerRec == null){
+        CustomerRec customerRecParam = new CustomerRec();
+        customerRecParam.setCustomerName(applQueryInvVo.getCustomId());
+        customerRecParam.setCompanyName(applQueryInvVo.getCompanyNum());
+        CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompanyNum(customerRecParam);
+        if(customerRec == null || customerRec.getRecStatus() != 1){
             log.info("备案信息不存在{}",applQueryInvVo);
             return;
         }

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -11,6 +11,7 @@ import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.customer.CustomerOperService;
+import com.jkcredit.invoice.service.customer.CustomerRecService;
 import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
@@ -38,7 +39,7 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
     NoCarService noCarService;
 
     @Autowired
-    CustomerRecMapper customerRecMapper;
+    CustomerRecService customerRecMapper;
 
     @Autowired
     CustomerOperService customerOperService;

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

@@ -125,6 +125,13 @@
     from t_customer_rec
     where customerName = #{customerName,jdbcType=VARCHAR} AND company_referenceNum =  #{companyReferencenum,jdbcType=VARCHAR} and rec_status =1
   </select>
+    <select id="selectByCompanyReference" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="Base_Column_List" />
+        from t_customer_rec
+        where  company_referenceNum =  #{companyReferencenum,jdbcType=VARCHAR} and rec_status =1
+    </select>
+
   <select id="selectByCustomerNameAndCompanyConcat" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
     select
     <include refid="Base_Column_List" />,base64Str
@@ -137,6 +144,12 @@
     from t_customer_rec
     where customerName = #{customerName,jdbcType=VARCHAR} AND company_num =  #{companyNum,jdbcType=VARCHAR}
   </select>
+    <select id="selectByCompanyNum" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
+        select
+        <include refid="Base_Column_List" />
+        from t_customer_rec
+        where  company_num =  #{companyNum,jdbcType=VARCHAR} and rec_status =1
+    </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from t_customer_rec
     where id = #{id,jdbcType=INTEGER}
@@ -321,33 +334,60 @@
         lowerBase64Str = #{lowerBase64Str,jdbcType=VARCHAR},
       </if>
     </set>
-    where id = #{id,jdbcType=INTEGER}
+    where company_name = #{companyName,jdbcType=VARCHAR} and  bussiness_type = #{bussinessType,jdbcType=INTEGER} and company_referenceNum = #{companyReferencenum,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
+  update t_customer_rec
+  set company_leader = #{companyLeader,jdbcType=VARCHAR},
+  company_leader_Phone = #{companyLeaderPhone,jdbcType=VARCHAR},
+  company_name = #{companyName,jdbcType=VARCHAR},
+  company_referenceNum = #{companyReferencenum,jdbcType=VARCHAR},
+  company_openbank = #{companyOpenbank,jdbcType=VARCHAR},
+  company_openbank_acc = #{companyOpenbankAcc,jdbcType=VARCHAR},
+  company_adress = #{companyAdress,jdbcType=VARCHAR},
+  company_phone = #{companyPhone,jdbcType=VARCHAR},
+  createTime = #{createtime,jdbcType=TIMESTAMP},
+  company_belong_name = #{companyBelongName,jdbcType=VARCHAR},
+  rec_status = #{recStatus,jdbcType=INTEGER},
+  inter_type = #{interType,jdbcType=INTEGER},
+  bussiness_type = #{bussinessType,jdbcType=INTEGER},
+  company_type = #{companyType,jdbcType=INTEGER},
+  operating_rangeType = #{operatingRangeType,jdbcType=INTEGER},
+  company_num = #{companyNum,jdbcType=VARCHAR},
+  service_startTime = #{serviceStartTime,jdbcType=VARCHAR},
+  service_endTime = #{serviceEndTime,jdbcType=VARCHAR},
+  service_type = #{serviceType,jdbcType=INTEGER},
+  contractFileName = #{contractFileName,jdbcType=VARCHAR},
+  base64Str = #{base64Str,jdbcType=VARCHAR},
+  contractSuc = #{contractSuc,jdbcType=INTEGER},
+  contrantNum = #{contrantNum,jdbcType=VARCHAR}
+  where id = #{id,jdbcType=INTEGER}
+</update>
+  <update id="updateByCompany" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
     update t_customer_rec
     set company_leader = #{companyLeader,jdbcType=VARCHAR},
-      company_leader_Phone = #{companyLeaderPhone,jdbcType=VARCHAR},
-      company_name = #{companyName,jdbcType=VARCHAR},
-      company_referenceNum = #{companyReferencenum,jdbcType=VARCHAR},
-      company_openbank = #{companyOpenbank,jdbcType=VARCHAR},
-      company_openbank_acc = #{companyOpenbankAcc,jdbcType=VARCHAR},
-      company_adress = #{companyAdress,jdbcType=VARCHAR},
-      company_phone = #{companyPhone,jdbcType=VARCHAR},
-      createTime = #{createtime,jdbcType=TIMESTAMP},
-      company_belong_name = #{companyBelongName,jdbcType=VARCHAR},
-      rec_status = #{recStatus,jdbcType=INTEGER},
-      inter_type = #{interType,jdbcType=INTEGER},
-      bussiness_type = #{bussinessType,jdbcType=INTEGER},
-      company_type = #{companyType,jdbcType=INTEGER},
-      operating_rangeType = #{operatingRangeType,jdbcType=INTEGER},
-      company_num = #{companyNum,jdbcType=VARCHAR},
-      service_startTime = #{serviceStartTime,jdbcType=VARCHAR},
-      service_endTime = #{serviceEndTime,jdbcType=VARCHAR},
-      service_type = #{serviceType,jdbcType=INTEGER},
-      contractFileName = #{contractFileName,jdbcType=VARCHAR},
-      base64Str = #{base64Str,jdbcType=VARCHAR},
-      contractSuc = #{contractSuc,jdbcType=INTEGER},
-      contrantNum = #{contrantNum,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=INTEGER}
+    company_leader_Phone = #{companyLeaderPhone,jdbcType=VARCHAR},
+    company_name = #{companyName,jdbcType=VARCHAR},
+    company_referenceNum = #{companyReferencenum,jdbcType=VARCHAR},
+    company_openbank = #{companyOpenbank,jdbcType=VARCHAR},
+    company_openbank_acc = #{companyOpenbankAcc,jdbcType=VARCHAR},
+    company_adress = #{companyAdress,jdbcType=VARCHAR},
+    company_phone = #{companyPhone,jdbcType=VARCHAR},
+    createTime = #{createtime,jdbcType=TIMESTAMP},
+    company_belong_name = #{companyBelongName,jdbcType=VARCHAR},
+    rec_status = #{recStatus,jdbcType=INTEGER},
+    inter_type = #{interType,jdbcType=INTEGER},
+    bussiness_type = #{bussinessType,jdbcType=INTEGER},
+    company_type = #{companyType,jdbcType=INTEGER},
+    operating_rangeType = #{operatingRangeType,jdbcType=INTEGER},
+    company_num = #{companyNum,jdbcType=VARCHAR},
+    service_startTime = #{serviceStartTime,jdbcType=VARCHAR},
+    service_endTime = #{serviceEndTime,jdbcType=VARCHAR},
+    service_type = #{serviceType,jdbcType=INTEGER},
+    contractFileName = #{contractFileName,jdbcType=VARCHAR},
+    base64Str = #{base64Str,jdbcType=VARCHAR},
+    contractSuc = #{contractSuc,jdbcType=INTEGER},
+    contrantNum = #{contrantNum,jdbcType=VARCHAR}
+    where company_name = #{companyName,jdbcType=VARCHAR} and bussiness_type = #{bussinessType,jdbcType=INTEGER} and company_referenceNum = #{companyReferencenum,jdbcType=VARCHAR}
   </update>
 </mapper>