客户下游接口开发20210923

src/main/java/com/jkcredit/invoice/SysInvoiceApplication.java

@@ -1,7 +1,9 @@
 package com.jkcredit.invoice;
 
+import com.jkcredit.invoice.credit.SimpleCORSFilter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -14,4 +16,15 @@ public class SysInvoiceApplication {
         SpringApplication.run(SysInvoiceApplication.class, args);
     }
 
+
+    /**
+     * 跨域处理
+     *
+     * @return
+     */
+    @Bean
+    public SimpleCORSFilter simpleCORSFilter(){
+        return new SimpleCORSFilter();
+    }
+
 }

src/main/java/com/jkcredit/invoice/mapper/Binvoce/BillInvoiceMapper.java

@@ -23,6 +23,7 @@ public interface BillInvoiceMapper extends BaseMapper<BillInvoice>{
     List<BillInvoice> selectByBillNum(String wayBillNum);
 
     BillInvoice selectByInvoiceNum(String wayBillNum);
-
     Map<String,String> findInvoiceStatics(@Param("billInvoice") BillInvoice billInvoice);
+
+    List<BillInvoice> selectNoCarNoVoiceQuery(String customerName);
 }

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

@@ -25,4 +25,6 @@ public interface CustomerMapper extends BaseMapper<Customer> {
     int updateByPrimaryKey(Customer record);
 
     IPage<List<Customer>> selectAllByPage(Page page, @Param("customer") Customer customer);
+
+    Customer selectByAppKeyAndAppSecret(String customerName, String appSecret);
 }

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

@@ -24,6 +24,9 @@ public interface CustomerRecMapper extends BaseMapper<CustomerRec> {
     CustomerRec selectByCustomerNameAndCompany(CustomerRec record);
     CustomerRec selectByCustomerNameAndCompanyConcat(CustomerRec record);
     CustomerRec selectByCustomerNameAndCompanyReference(CustomerRec record);
+    //根据客户名称和 企业编码查询唯一数据
+    CustomerRec selectByCustomerNameAndCompanyNum(CustomerRec record);
+
     int updateByPrimaryKeySelective(CustomerRec record);
 
     int updateByPrimaryKey(CustomerRec record);

src/main/java/com/jkcredit/invoice/mapper/waybill/NoCarWaybillMapper.java

@@ -25,4 +25,7 @@ public interface NoCarWaybillMapper extends BaseMapper<NoCarWayBill>{
     NoCarWayBill selectByBillNum(String wayBillNum);
 
     List<NoCarWayBill> selectByHisFlagAndBillStatus(NoCarWayBill noCarWayBill);
+
+
+    List<NoCarWayBill> getNoCarNoVoiceQuery(String customerName);
 }

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

@@ -5,8 +5,14 @@ public class Customer {
      * etc收费费用
      */
     private Double fee =5d;
+
+    //appKey
     private String customerName;
 
+    //appSecret
+    private String appSecret;
+
+    //无车最后一次扣费时间
     private String invoiceTime;
 
     private Integer usenumAll;
@@ -45,6 +51,15 @@ public class Customer {
         this.customerName = customerName == null ? null : customerName.trim();
     }
 
+
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret == null ? null : appSecret.trim();
+    }
+
     public String getInvoiceTime() {
         return invoiceTime;
     }

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

@@ -75,4 +75,14 @@ public interface CustomerService extends IService<Customer>{
      * @return
      */
     RespR updateCustomerRecStatus(CustomerRec customerRec);
+
+
+
+
+    /**
+     * 修改用户状态
+     * @param customer
+     * @return
+     */
+    Customer getCustomerByAppKeyAndAppSecret(Customer customer);
 }

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

@@ -175,4 +175,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper,Customer> im
         }
         return new RespR(true);
     }
+
+    @Override
+    public Customer getCustomerByAppKeyAndAppSecret(Customer customer) {
+        return customerMapper.selectByAppKeyAndAppSecret( customer.getCustomerName(), customer.getAppSecret());
+    }
 }

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

@@ -1,5 +1,8 @@
 package com.jkcredit.invoice.service.lowerService.impl;
 
+import cn.com.taiji.sdk.model.comm.protocol.tts.card.server.CardBindQueryListToBResponse;
+import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleQueryRequest;
+import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleQueryResponse;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterResponse;
 import cn.com.taiji.sdk.model.comm.protocol.tts.waybill.*;
@@ -136,7 +139,33 @@ public class NoCarServiceImpl implements NoCarService{
 
     @Override
     public RespR customerCarRecQueryUpper(CustomerCarRec customerCarRec) {
-        return null;
+        StringBuffer res = new StringBuffer();
+
+        Customer customer = customerMapper.selectByCustomerName(customerCarRec.getCustomerName());
+        if(customer == null || customer.getAccstatus()!=0){
+            res.append("#客户："+customer.getCustomerName()+"不存在或状态异常");
+            return new RespR(false,res.toString());
+        }
+        CustomerRec customerRecP = new CustomerRec();
+        customerRecP.setCustomerName(customerCarRec.getCustomerName());
+        customerRecP.setCompanyName(customerCarRec.getCompanyName());
+        CustomerRec customerRec = customerRecMapper.selectByCustomerNameAndCompany(customerRecP);
+        if(customerRec == null){
+            res.append("#客户："+customerCarRec.getCustomerName()+"企业:"+customerCarRec.getCompanyName()+"备案信息不存在");
+            return new RespR(false,res.toString());
+        }
+
+        VehicleQueryRequest vehicleQueryRequest = new VehicleQueryRequest();
+        vehicleQueryRequest.setCompanyNum(customerCarRec.getCompanyNum());
+        vehicleQueryRequest.setWaybillSource(1);//1 无车承运人
+        vehicleQueryRequest.setPlateNum(customerCarRec.getCarNum());
+        vehicleQueryRequest.setPlateColor(Integer.valueOf(customerCarRec.getCarColor()));
+
+        RespR<VehicleQueryResponse> respR = noCarInterface.vehicleQuery(vehicleQueryRequest);
+        if(respR.getCode() == 1){
+            return new RespR(false,respR.getMsg());
+        }
+        return new RespR(respR.getData());
     }
 
     public void updateCustomerCarRec(CustomerCarRec customerCarRec){
@@ -344,6 +373,11 @@ public class NoCarServiceImpl implements NoCarService{
     @Transactional
     public RespR getInvoiceByWayBillNumReal(NoCarWayBill noCarWayBill, boolean isCurr) {
         NoCarWayBill noCarWayBillDb = noCarWaybillMapper.selectByBillNum(noCarWayBill.getBillNum());
+        if(null == noCarWayBillDb){
+            return new RespR(false,"运单号异常,无法开票");
+        }
+
+
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
             return  respR;
@@ -359,11 +393,11 @@ public class NoCarServiceImpl implements NoCarService{
                return new RespR(billInvoices);
            }
         }
-        if(noCarWayBillDb.getBillwayStatus() == 3){
+      /*  if(noCarWayBillDb.getBillwayStatus() == 3){
             //直接返回发票信息
             List<BillInvoice> billInvoices = billInvoiceMapper.selectByBillNum(noCarWayBill.getBillNum());
             return new RespR(billInvoices);
-        }
+        }*/
         //进行取票操作
         WaybillNumFindInvoiceRequest waybillNumFindInvoiceRequest = new WaybillNumFindInvoiceRequest();
         waybillNumFindInvoiceRequest.setCompanyNum(noCarWayBillDb.getCompanyNum());
@@ -406,6 +440,7 @@ public class NoCarServiceImpl implements NoCarService{
                     //先查询数据库中有没有这个交易id
                     if(calculateInforMapper.selectByTradeId(billInvoice.getTransactionId())==null){
                         Customer customer = customerMapper.selectByCustomerName(noCarWayBill.getCustomerName());
+                        customer.setInvoiceTime(DateUtil.getCurrentDateStr());
                         customer.setAccountBalance(MathUtil.sub(customer.getAccountBalance(),calculateInfor.getFee()));
                         customerMapper.updateByPrimaryKeySelective(customer);
                         calculateInforMapper.insert(calculateInfor);

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

@@ -179,6 +179,7 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                 carCalculateInfor.setCompanyReferencenum(customerRec.getCompanyReferencenum());
                 carCalculateInfor.setEtcNum(selfCarTrade.getCardId());
                 if(calculateInforMapper.selectByEtcAndTime(carCalculateInfor) == null){
+                    customer.setInvoiceTime(DateUtil.getCurrentDateStr());
                     customer.setAccountBalance(MathUtil.sub(customer.getAccountBalance(),carCalculateInfor.getFee()));
                     customerMapper.updateByPrimaryKeySelective(customer);
                     calculateInforMapper.insert(carCalculateInfor);
@@ -322,8 +323,10 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
             return new RespR(false,"客户未备案");
         }
         CardBindQueryListToBRequest cardQueryCardToBRequest = new CardBindQueryListToBRequest();
-        cardQueryCardToBRequest.setCompanyNum(customerRec.getCompanyNum());
-        cardQueryCardToBRequest.setPlateNum(etcQueryVo.getPlateNum());
+        cardQueryCardToBRequest.setCompanyNum(customerRec.getCompanyNum());//企业编号，必输
+        cardQueryCardToBRequest.setCardId(etcQueryVo.getCardId());//卡户 ,非必输
+        cardQueryCardToBRequest.setPlateNum(etcQueryVo.getPlateNum());//车牌号,非必输
+        cardQueryCardToBRequest.setPalteColor(etcQueryVo.getPlateColor());//车牌颜色.非必输
         RespR<CardBindQueryListToBResponse> respR = selfCarInterface.cardBindQueryListToB(cardQueryCardToBRequest);
         if(respR.getCode() == 1){
             return new RespR(false,respR.getMsg());

src/main/java/com/jkcredit/invoice/service/lowerService/vo/EtcQueryVo.java

@@ -20,6 +20,17 @@ public class EtcQueryVo {
      * 车牌号
      */
     private String plateNum;
+    /**
+     * 卡号
+     */
+    private String cardId;
+
+    /**
+     *  车牌颜色
+     */
+    private Integer plateColor;
+
+
 
 
     public String getCustomerName() {
@@ -45,4 +56,21 @@ public class EtcQueryVo {
     public void setPlateNum(String plateNum) {
         this.plateNum = plateNum;
     }
+
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    public Integer getPlateColor() {
+        return plateColor;
+    }
+
+    public void setPlateColor(Integer plateColor) {
+        this.plateColor = plateColor;
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/vo/NoCarQueryVo.java

@@ -0,0 +1,58 @@
+package com.jkcredit.invoice.service.lowerService.vo;
+
+/**
+ * 无车备案查询
+ */
+public class NoCarQueryVo {
+    /**
+     * 企业编号
+     */
+    private String companyNum;
+
+    /**
+     * 车牌号
+     */
+    private String plateNum;
+
+    /**
+     * 车牌颜色
+     */
+    private Integer plateColor;
+    /**
+     * 备案来源
+     */
+    private String waybillSource;
+
+
+    public String getCompanyNum() {
+        return companyNum;
+    }
+
+    public void setCompanyNum(String companyNum) {
+        this.companyNum = companyNum;
+    }
+
+    public String getPlateNum() {
+        return plateNum;
+    }
+
+    public void setPlateNum(String plateNum) {
+        this.plateNum = plateNum;
+    }
+
+    public Integer getPlateColor() {
+        return plateColor;
+    }
+
+    public void setPlateColor(Integer plateColor) {
+        this.plateColor = plateColor;
+    }
+
+    public String getWaybillSource() {
+        return waybillSource;
+    }
+
+    public void setWaybillSource(String waybillSource) {
+        this.waybillSource = waybillSource;
+    }
+}

src/main/java/com/jkcredit/invoice/service/user/impl/UserServiceImpl.java

@@ -11,6 +11,7 @@ import com.jkcredit.invoice.mapper.user.UserMapper;
 import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.user.RoleService;
 import com.jkcredit.invoice.service.user.UserService;
+import com.jkcredit.invoice.util.DataSignUtil;
 import com.jkcredit.invoice.util.RespR;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -99,6 +100,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             customer.setFee(user.getFee());
             customer.setBussinessType(Integer.valueOf(user.getRoleId()));
             customer.setAccstatus(0);
+            customer.setAppSecret(DataSignUtil.getAppSecret(user.getUserName()));
             customerService.addCustomers(customer);
         }
         this.save(user);

src/main/java/com/jkcredit/invoice/util/DataSignUtil.java

@@ -0,0 +1,36 @@
+package com.jkcredit.invoice.util;
+
+import java.security.MessageDigest;
+
+public class DataSignUtil {
+
+
+
+    /**
+     * 获取appSecret
+     * @param appKey
+     * @return
+     */
+    public static String getAppSecret(String appKey) {
+        String keyStr = "hangzhou.junxin.risk" + appKey;
+        try {
+            MessageDigest sha = MessageDigest.getInstance("SHA");
+            byte[] byteArray = keyStr.getBytes("UTF-8");
+            byte[] md5Bytes = sha.digest(byteArray);
+            StringBuffer hexValue = new StringBuffer();
+            for (int i = 0; i < md5Bytes.length; i++) {
+                int val = ((int) md5Bytes[i]) & 0xff;
+                if (val < 16) {
+                    hexValue.append("0");
+                }
+                hexValue.append(Integer.toHexString(val));
+            }
+            String singKey = hexValue.toString().toUpperCase();
+            return singKey;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+}

src/main/java/com/jkcredit/invoice/util/JwtUtil.java

@@ -0,0 +1,113 @@
+package com.jkcredit.invoice.util;
+
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.JWTVerifier;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.JWTCreationException;
+import com.auth0.jwt.exceptions.JWTDecodeException;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: JWT 工具类
+ * @Author: junqiang.lu
+ * @Date: 2019/12/3
+ */
+public class JwtUtil implements Serializable {
+
+    private static final long serialVersionUID = -9101115541530000111L;
+
+    /**
+     * 默认秘钥
+     */
+    private final static String DEFAULT_SECRET = "TS2XIUYNOKJZZDXD8YA9JJH5PM1IAHXPYCX7Q3JO";
+
+    private JwtUtil(){
+
+    }
+
+    /**
+     * 加密
+     *
+     * @param key
+     * @param value
+     * @return
+     * @throws JWTCreationException
+     */
+    public static String encode(String key, String value) throws Exception {
+        return encode(key, value, 0);
+    }
+
+    /**
+     * 加密
+     *
+     * @param key
+     * @param value
+     * @param expTime
+     * @return
+     * @throws JWTCreationException
+     */
+    public static String encode(String key, String value, long expTime) throws Exception {
+        return encode(null, key, value, expTime);
+    }
+
+    /**
+     * 加密
+     *
+     * @param secret
+     * @param key
+     * @param value
+     * @param expMillis
+     * @return
+     */
+    public static String encode(String secret, String key, String value, long expMillis) throws Exception {
+        if (secret == null || secret.length() < 1) {
+            secret = DEFAULT_SECRET;
+        }
+        Date expDate = null;
+        if (expMillis > 1) {
+            expDate = new Date(System.currentTimeMillis() + expMillis);
+        }
+        Algorithm algorithm = Algorithm.HMAC256(secret);
+        String token = JWT.create()
+                .withIssuer("auth0")
+                .withClaim(key,value)
+                .withExpiresAt(expDate)
+                .sign(algorithm);
+        return token;
+    }
+
+    /**
+     * 解密
+     *
+     * @param key
+     * @param encodedToken
+     * @return
+     * @throws JWTDecodeException
+     */
+    public static String decode(String key, String encodedToken) throws Exception {
+        return decode(null, key, encodedToken);
+    }
+
+    /**
+     * 解密
+     *
+     * @param secret
+     * @param key
+     * @param encodedToken
+     * @return
+     */
+    public static String decode(String secret, String key, String encodedToken) throws Exception {
+        if (secret == null || secret.length() < 1) {
+            secret = DEFAULT_SECRET;
+        }
+        Algorithm algorithm = Algorithm.HMAC256(secret);
+        JWTVerifier verifier = JWT.require(algorithm)
+                .withIssuer("auth0")
+                .build();
+        return verifier.verify(encodedToken).getClaim(key).asString();
+    }
+
+
+}

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

@@ -16,14 +16,40 @@
     <result column="company" property="company" jdbcType="VARCHAR" />
     <result column="fee" property="fee" jdbcType="DOUBLE" />
   </resultMap>
+
+
+
+  <resultMap id="BaseResultMapByAppKeyAndAppSecret" type="com.jkcredit.invoice.model.entity.customer.Customer" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="customer_name" property="customerName" jdbcType="VARCHAR" />
+    <result column="app_secret" property="appSecret" jdbcType="VARCHAR" />
+    <result column="invoice_time" property="invoiceTime" jdbcType="VARCHAR" />
+    <result column="usenum_all" property="usenumAll" jdbcType="INTEGER" />
+    <result column="usenum_interface" property="usenumInterface" jdbcType="INTEGER" />
+    <result column="usenum_plat" property="usenumPlat" jdbcType="INTEGER" />
+    <result column="account_balance" property="accountBalance" jdbcType="DOUBLE" />
+    <result column="bussiness_type" property="bussinessType" jdbcType="INTEGER" />
+    <result column="integration_type" property="integrationType" jdbcType="INTEGER" />
+    <result column="first_sign" property="firstSign" jdbcType="VARCHAR" />
+    <result column="accStatus" property="accstatus" jdbcType="INTEGER" />
+    <result column="company" property="company" jdbcType="VARCHAR" />
+    <result column="fee" property="fee" jdbcType="DOUBLE" />
+  </resultMap>
+
+
   <sql id="Base_Column_List" >
     id, customer_name, invoice_time, usenum_all, usenum_interface, usenum_plat, account_balance,
     bussiness_type, integration_type, first_sign, accStatus, company,fee
   </sql>
 
+  <sql id="Base_Column_List_app_secret" >
+    id, app_secret, customer_name, invoice_time, usenum_all, usenum_interface, usenum_plat, account_balance,
+    bussiness_type, integration_type, first_sign, accStatus, company,fee
+  </sql>
+
   <select id="selectAllByPage" resultMap="BaseResultMap">
      select
-      <include refid="Base_Column_List" />
+      <include refid="Base_Column_List_app_secret" />
      from t_customer
   </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -43,12 +69,12 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.customer.Customer" >
-    insert into t_customer (customer_name, invoice_time,
+    insert into t_customer (app_secret, customer_name, invoice_time,
       usenum_all, usenum_interface, usenum_plat, 
       account_balance, bussiness_type, integration_type, 
       first_sign, accStatus, company,fee
       )
-    values ( #{customerName,jdbcType=VARCHAR}, #{invoiceTime,jdbcType=TIMESTAMP},
+    values ( #{appSecret,jdbcType=VARCHAR},#{customerName,jdbcType=VARCHAR}, #{invoiceTime,jdbcType=TIMESTAMP},
       #{usenumAll,jdbcType=INTEGER}, #{usenumInterface,jdbcType=INTEGER}, #{usenumPlat,jdbcType=INTEGER}, 
       #{accountBalance,jdbcType=DOUBLE}, #{bussinessType,jdbcType=INTEGER}, #{integrationType,jdbcType=INTEGER}, 
       #{firstSign,jdbcType=VARCHAR}, #{accstatus,jdbcType=INTEGER}, #{company,jdbcType=VARCHAR},#{fee,jdbcType=DOUBLE}
@@ -197,4 +223,16 @@
       fee = #{fee,jdbcType=DOUBLE}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+
+
+
+  <select id="selectByAppKeyAndAppSecret" resultMap="BaseResultMapByAppKeyAndAppSecret" parameterType="java.lang.String" >
+    select
+    <include refid="Base_Column_List_app_secret" />
+    from t_customer
+    where customer_name = #{customerName,jdbcType=VARCHAR}
+          and app_secret = #{appSecret,jdbcType=VARCHAR}
+  </select>
+
 </mapper>

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

@@ -92,6 +92,12 @@
     from t_customer_rec
     where customerName = #{customerName,jdbcType=VARCHAR} AND company_name =  #{companyName,jdbcType=VARCHAR}
   </select>
+  <select id="selectByCustomerNameAndCompanyNum" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerRec" >
+    select
+    <include refid="Base_Column_List" />
+    from t_customer_rec
+    where customerName = #{customerName,jdbcType=VARCHAR} AND company_num =  #{companyNum,jdbcType=VARCHAR}
+  </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from t_customer_rec
     where id = #{id,jdbcType=INTEGER}

src/main/resources/mapper/invoice/BillInvoiceMapper.xml

@@ -253,4 +253,11 @@
             </if>
         </where>
     </select>
+
+    <select id="selectNoCarNoVoiceQuery" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="baseSql" />
+        from t_billInvoice
+        where customerName = #{customerName,jdbcType=VARCHAR}
+    </select>
 </mapper>

src/main/resources/mapper/waybill/NoCarWaybillMapper.xml

@@ -59,15 +59,6 @@
             <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
                 and billNum = #{noCarWayBill.billNum}
             </if>
-            <if test="noCarWayBill.plateNum != null and noCarWayBill.plateNum != ''">
-                and plateNum = #{noCarWayBill.plateNum}
-            </if>
-            <if test="noCarWayBill.billwayStatus != null and noCarWayBill.billwayStatus != ''">
-                and billwayStatus = #{noCarWayBill.billwayStatus}
-            </if>
-            <if test="noCarWayBill.hisFlag != null and noCarWayBill.hisFlag != ''">
-                and hisFlag = #{noCarWayBill.hisFlag}+1
-            </if>
             <if test="noCarWayBill.taxplayerCode != null and noCarWayBill.taxplayerCode != ''">
                 and taxplayerCode = #{noCarWayBill.taxplayerCode}
             </if>
@@ -204,4 +195,16 @@
         from t_waybill_no
         where hisFlag = #{hisFlag,jdbcType=INTEGER} and billwayStatus = #{billwayStatus,jdbcType=INTEGER}
     </select>
+
+
+
+    <select id="getNoCarNoVoiceQuery" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="baseSql" />
+        from t_waybill_no
+        where customerName = #{customerName,jdbcType=VARCHAR}
+    </select>
+
+
+
 </mapper>