优化代码提交

src/main/java/com/jkcredit/invoice/controller/interserver/NoCarServiceController.java

@@ -48,7 +48,15 @@ public class NoCarServiceController {
     public RespR hCVoiceQuery(@RequestBody HCInvoiceQueryVo hcInvoiceQueryVo){
         return noCarService.hCInvoiceQuery(hcInvoiceQueryVo);
     }
-
+    /**
+     * @param
+     * @return
+     */
+    @PostMapping("/hCVoiceUpdate")
+    @ApiOperation(value="红冲发票更新接口", notes="红冲发票更新接口")
+    public RespR hCVoiceUpdate(@RequestBody HCInvoiceQueryVo hcInvoiceQueryVo){
+        return noCarService.hCInvoiceUpdate(hcInvoiceQueryVo);
+    }
     /**
      * @param
      * @return

src/main/java/com/jkcredit/invoice/credit/SimpleCORSFilter.java

@@ -172,6 +172,7 @@ public class SimpleCORSFilter implements Filter {
             "/noCarService/noCarHisWaybillEnd",
             "/noCarService/noCarVoiceQuery",
             "/noCarService/hCVoiceQuery",
+            "/noCarService/hCVoiceUpdate",
             "/noCarService/monthAccQuery",
             "/noCarService/monthAccQueryAll",
             "/noCarService/monthAccUpdate",

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

@@ -862,9 +862,8 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                 result.setMsg("日期格式不正确！");
                 return  result;
             }
-            String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
             HCInvoiceQueryVo hcInvoiceQueryVo = new HCInvoiceQueryVo();
-            hcInvoiceQueryVo.setCompanyNum(companyNum);
+            hcInvoiceQueryVo.setBuyerTaxpayerCode(taxplayerCode);
             hcInvoiceQueryVo.setMonth(month);
             RespR rs = noCarService.hCInvoiceQuery(hcInvoiceQueryVo);
             long costtimeend = System.currentTimeMillis();
@@ -872,33 +871,9 @@ public class NoCarInterServiceImpl implements NoCarInterService {
                     + rs.toString() + ", request is " + data + " ,costtime="
                     + (costtimeend - costtimestart));
             if(null != rs && rs.getCode() == 0){
-                JSONObject jb = JSONObject.parseObject(rs.getData().toString());
-                if ("成功".equals(jb.getString("info"))){
-                    com.alibaba.fastjson.JSONArray ja = jb.getJSONArray("result");
-                 int  zero= 0 ;
-                  for ( int  i= 0 ;i<ja.size();i++){
-                      if (!ja.getJSONObject(i).getString("buyerTaxpayerCode").equals(taxplayerCode)){
-                          zero++;
-                      }
-                  }
-                 com.alibaba.fastjson.JSONArray jc = new com.alibaba.fastjson.JSONArray(ja.size()-zero);
-                 int  j= 0 ;
-                  for ( int  i= 0 ;i<ja.size();i++){
-                      if (ja.getJSONObject(i).getString("buyerTaxpayerCode").equals(taxplayerCode)){
-                          jc.add(j,ja.get(i));
-                          j++;
-                      }
-                  }
-                  jb.put("result",jc);
-                }else{
-                    result.setData(3);
-                    result.setCode(200);
-                    result.setMsg("查询失败");
-                    return result;
-                }
                 result.setData(1);
                 result.setCode(200);
-                result.setMsg(jb.toString());
+                result.setMsg(JSON.toJSONString(rs.getData()));
                 return result;
             } else {
                 result.setData(3);

src/main/java/com/jkcredit/invoice/mapper/binvoce/HcInvoiceMapper.java

@@ -0,0 +1,33 @@
+package com.jkcredit.invoice.mapper.binvoce;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
+import com.jkcredit.invoice.model.entity.invoice.HcInvoice;
+import com.jkcredit.invoice.model.vo.CompanyVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface HcInvoiceMapper{
+    /**
+     * 插入红冲发票
+     * @param hcInvoice
+     * @return
+     */
+    int insertHcInvoice(HcInvoice hcInvoice);
+
+    /**
+     * 根据月份删除
+     * @param yearMonth
+     * @return
+     */
+    int deleteByMounth(String yearMonth);
+
+
+    List<HcInvoice> selectInvoiceByCondition(HcInvoice hcInvoice);
+}

src/main/java/com/jkcredit/invoice/model/entity/invoice/HcInvoice.java

@@ -0,0 +1,173 @@
+package com.jkcredit.invoice.model.entity.invoice;
+
+/**
+ * 红冲发票实体类
+ */
+public class HcInvoice {
+    /**
+     * 红冲发票id
+     */
+    private Long id;
+    /**
+     * 销方名称
+     */
+    private String sellerName;
+
+    /**
+     * 销方税号
+     */
+    private String sellerTaxpayerCode;
+    /**
+     * 购方名称
+     */
+    private String buyerName;
+
+    /**
+     * 购方税号
+     */
+    private String buyerTaxpayerCode;
+
+    /**
+     * 金额
+     */
+    private long amount;
+
+    /**
+     * 原票id
+     */
+    private String rawInvoiceId;
+
+    /**
+     * 原票发票代码
+     */
+    private String rawInvoiceCode;
+
+    /**
+     * 原票发票号码
+     */
+    private String rawInvoiceNum;
+
+    /**
+     * 红票代码
+     */
+    private String invoiceCode;
+
+    /**
+     * 红票号码
+     */
+    private String invoiceNum;
+
+    /**
+     * 红票下载url
+     */
+    private String invoiceUrl;
+
+    /**
+     * 年月
+     */
+    private String yearMonth;
+
+    public String getSellerName() {
+        return sellerName;
+    }
+
+    public void setSellerName(String sellerName) {
+        this.sellerName = sellerName;
+    }
+
+    public String getSellerTaxpayerCode() {
+        return sellerTaxpayerCode;
+    }
+
+    public void setSellerTaxpayerCode(String sellerTaxpayerCode) {
+        this.sellerTaxpayerCode = sellerTaxpayerCode;
+    }
+
+    public String getBuyerName() {
+        return buyerName;
+    }
+
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
+    }
+
+    public String getBuyerTaxpayerCode() {
+        return buyerTaxpayerCode;
+    }
+
+    public void setBuyerTaxpayerCode(String buyerTaxpayerCode) {
+        this.buyerTaxpayerCode = buyerTaxpayerCode;
+    }
+
+    public long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(long amount) {
+        this.amount = amount;
+    }
+
+    public String getRawInvoiceId() {
+        return rawInvoiceId;
+    }
+
+    public void setRawInvoiceId(String rawInvoiceId) {
+        this.rawInvoiceId = rawInvoiceId;
+    }
+
+    public String getRawInvoiceCode() {
+        return rawInvoiceCode;
+    }
+
+    public void setRawInvoiceCode(String rawInvoiceCode) {
+        this.rawInvoiceCode = rawInvoiceCode;
+    }
+
+    public String getRawInvoiceNum() {
+        return rawInvoiceNum;
+    }
+
+    public void setRawInvoiceNum(String rawInvoiceNum) {
+        this.rawInvoiceNum = rawInvoiceNum;
+    }
+
+    public String getInvoiceCode() {
+        return invoiceCode;
+    }
+
+    public void setInvoiceCode(String invoiceCode) {
+        this.invoiceCode = invoiceCode;
+    }
+
+    public String getInvoiceNum() {
+        return invoiceNum;
+    }
+
+    public void setInvoiceNum(String invoiceNum) {
+        this.invoiceNum = invoiceNum;
+    }
+
+    public String getInvoiceUrl() {
+        return invoiceUrl;
+    }
+
+    public void setInvoiceUrl(String invoiceUrl) {
+        this.invoiceUrl = invoiceUrl;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        id = id;
+    }
+
+    public String getYearMonth() {
+        return yearMonth;
+    }
+
+    public void setYearMonth(String yearMonth) {
+        this.yearMonth = yearMonth;
+    }
+}

src/main/java/com/jkcredit/invoice/service/lowerservice/NoCarService.java

@@ -74,6 +74,14 @@ public interface NoCarService {
     RespR hCInvoiceQuery(HCInvoiceQueryVo hcInvoiceQueryVo);
 
     /**
+     * 红冲发票更新
+     * @param hcInvoiceQueryVo
+     * @return
+     */
+    RespR hCInvoiceUpdate(HCInvoiceQueryVo hcInvoiceQueryVo);
+
+
+    /**
      * 月账单查询
      * @param monthAccountQueryVo
      * @return

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

@@ -7,6 +7,7 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterResponse;
 import cn.com.taiji.sdk.model.comm.protocol.tts.waybill.*;
 import com.jkcredit.invoice.common.CommonConstants;
 import com.jkcredit.invoice.mapper.binvoce.BillInvoiceMapper;
+import com.jkcredit.invoice.mapper.binvoce.HcInvoiceMapper;
 import com.jkcredit.invoice.mapper.calculateinfor.MounthAccMapper;
 import com.jkcredit.invoice.mapper.calculateinfor.NoCarCalculateInforMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
@@ -19,6 +20,7 @@ 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.model.entity.invoice.BillInvoice;
+import com.jkcredit.invoice.model.entity.invoice.HcInvoice;
 import com.jkcredit.invoice.model.entity.manager.Param;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.lowerservice.NoCarService;
@@ -711,18 +713,64 @@ public class NoCarServiceImpl implements NoCarService{
     @Override
     public RespR hCInvoiceQuery(HCInvoiceQueryVo hcInvoiceQueryVo) {
         log.info("取红冲票啦：NoCarServiceImpl.hCInvoiceQuery{}",hcInvoiceQueryVo);
+        HcInvoice hcInvoiceParam = new HcInvoice();
+        hcInvoiceParam.setBuyerName(hcInvoiceQueryVo.getBuyerName());
+        hcInvoiceParam.setBuyerTaxpayerCode(hcInvoiceQueryVo.getBuyerTaxpayerCode());
+        hcInvoiceParam.setYearMonth(hcInvoiceQueryVo.getMonth());
+        List<HcInvoice> hcInvoices = hcInvoiceMapper.selectInvoiceByCondition(hcInvoiceParam);
+        if(hcInvoices == null || hcInvoices.size()==0){
+            hcInvoiceParam.setBuyerName("");
+            hcInvoiceParam.setBuyerTaxpayerCode("");
+            hcInvoices = hcInvoiceMapper.selectInvoiceByCondition(hcInvoiceParam);
+            if(hcInvoices == null || hcInvoices.size()==0){
+                hCInvoiceUpdate(hcInvoiceQueryVo);
+                hcInvoiceParam.setBuyerName(hcInvoiceQueryVo.getBuyerName());
+                hcInvoiceParam.setBuyerTaxpayerCode(hcInvoiceQueryVo.getBuyerTaxpayerCode());
+                hcInvoices = hcInvoiceMapper.selectInvoiceByCondition(hcInvoiceParam);
+            }else{
+                hcInvoices = null;
+            }
+        }
+        if(hcInvoices == null){
+            hcInvoices = new ArrayList<>();
+        }
+        Map<String,List<HcInvoice>> map = new HashMap<>();
+        map.put("result",hcInvoices);
+        return new RespR(map);
+    }
+    @Autowired
+    HcInvoiceMapper hcInvoiceMapper;
+
+    @Override
+    @Transactional
+    public RespR hCInvoiceUpdate(HCInvoiceQueryVo hcInvoiceQueryVo) {
+        log.info("取红冲票啦：NoCarServiceImpl.hCInvoiceQuery{}",hcInvoiceQueryVo);
         WaybillInvoiceRedQueryRequest redQueryRequest = new WaybillInvoiceRedQueryRequest();
         String companyNum = paramService.getParamsByParamName("REQUEST_COMPANY_NUM").getParamValue();
         redQueryRequest.setCompanyNum(companyNum);
         redQueryRequest.setMonth(hcInvoiceQueryVo.getMonth());
 
         RespR<WaybillInvoiceRedQueryResponse> respR = noCarInterface.waybillInvoiceRedQuery(redQueryRequest);
+
         if(respR.getCode() == 1){
             log.info("取红冲票失败啦：NoCarServiceImpl.hCInvoiceQuery{},msg{}",hcInvoiceQueryVo,respR.getMsg());
             return new RespR(false,respR.getMsg());
+        }else{
+            List<WaybillInvoiceRedQueryModel> waybillInvoiceRedQueryModels =  respR.getData().getResult();
+            if(waybillInvoiceRedQueryModels!=null && waybillInvoiceRedQueryModels.size()>0){
+                //1.删除原有红冲发票
+                hcInvoiceMapper.deleteByMounth(hcInvoiceQueryVo.getMonth());
+                //逐条插入红冲发票
+                for(WaybillInvoiceRedQueryModel waybillInvoiceRedQueryModel :waybillInvoiceRedQueryModels){
+                    HcInvoice hcInvoice = new HcInvoice();
+                    BeanUtils.copyProperties(waybillInvoiceRedQueryModel,hcInvoice);
+                    hcInvoiceMapper.insertHcInvoice(hcInvoice);
+                }
+            }
         }
-            return respR;
+        return new RespR();
     }
+
     @Override
     public RespR monthAccQuery(MonthAccountQueryVo monthAccountQueryVo) {
         log.info("取月票啦：NoCarServiceImpl.monthAccQuery{},msg{}",monthAccountQueryVo,"开始");

src/main/java/com/jkcredit/invoice/service/lowerservice/vo/HCInvoiceQueryVo.java

@@ -7,12 +7,12 @@ public class HCInvoiceQueryVo {
     /**
      * 客户名称
      */
-    private String customerName;
+    private String buyerName;
 
     /**
      * 企业名称
      */
-    private String companyName;
+    private String buyerTaxpayerCode;
 
     private String companyNum;
 
@@ -21,20 +21,20 @@ public class HCInvoiceQueryVo {
      */
     private String month;
 
-    public String getCustomerName() {
-        return customerName;
+    public String getBuyerName() {
+        return buyerName;
     }
 
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName;
+    public void setBuyerName(String buyerName) {
+        this.buyerName = buyerName;
     }
 
-    public String getCompanyName() {
-        return companyName;
+    public String getBuyerTaxpayerCode() {
+        return buyerTaxpayerCode;
     }
 
-    public void setCompanyName(String companyName) {
-        this.companyName = companyName;
+    public void setBuyerTaxpayerCode(String buyerTaxpayerCode) {
+        this.buyerTaxpayerCode = buyerTaxpayerCode;
     }
 
     public String getMonth() {
@@ -56,8 +56,8 @@ public class HCInvoiceQueryVo {
     @Override
     public String toString() {
         return "HCInvoiceQueryVo{" +
-                "customerName='" + customerName + '\'' +
-                ", companyName='" + companyName + '\'' +
+                "buyerName='" + buyerName + '\'' +
+                ", buyerTaxpayerCode='" + buyerTaxpayerCode + '\'' +
                 ", companyNum='" + companyNum + '\'' +
                 ", month='" + month + '\'' +
                 '}';

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

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jkcredit.invoice.mapper.binvoce.HcInvoiceMapper">
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.invoice.HcInvoice">
+        <id column="id" property="id"/>
+        <result column="sellerName" property="sellerName"/>
+        <result column="sellerTaxpayerCode" property="sellerTaxpayerCode"/>
+        <result column="buyerName" property="buyerName"/>
+        <result column="buyerTaxpayerCode" property="buyerTaxpayerCode"/>
+        <result column="amount" property="amount"/>
+        <result column="rawInvoiceId" property="rawInvoiceId"/>
+        <result column="rawInvoiceCode" property="rawInvoiceCode"/>
+        <result column="rawInvoiceNum" property="rawInvoiceNum"/>
+        <result column="invoiceCode" property="invoiceCode"/>
+        <result column="invoiceNum" property="invoiceNum"/>
+        <result column="invoiceUrl" property="invoiceUrl"/>
+        <result column="yearMonth" property="yearMonth"/>
+    </resultMap>
+
+    <sql id="baseSql">
+        sellerName,
+        sellerTaxpayerCode,
+        buyerName,
+        buyerTaxpayerCode,
+        amount,
+        rawInvoiceId,
+        rawInvoiceCode,
+        rawInvoiceNum,
+        invoiceUrl,
+        yearMonth
+    </sql>
+    <select id="selectInvoiceByCondition" parameterType="com.jkcredit.invoice.model.entity.invoice.HcInvoice" resultMap="BaseResultMap">
+        select
+        id,<include refid="baseSql" />
+        from t_hcinvoice
+        where yearMonth = #{yearMonth,jdbcType=VARCHAR}
+        <if test="buyerName != null and buyerName != ''">
+            and  buyerName = BINARY #{buyerName,jdbcType=VARCHAR}
+        </if>
+        <if test="buyerTaxpayerCode != null and buyerTaxpayerCode != ''">
+            and  buyerTaxpayerCode = BINARY #{buyerTaxpayerCode,jdbcType=VARCHAR}
+        </if>
+    </select>
+    <insert id="insertHcInvoice" parameterType="com.jkcredit.invoice.model.entity.invoice.HcInvoice">
+        INSERT INTO t_hcinvoice (<include refid="baseSql"></include>)
+         VALUES (   #{sellerName,jdbcType=VARCHAR},
+                    #{sellerTaxpayerCode,jdbcType=VARCHAR},
+                    #{buyerName,jdbcType=VARCHAR},
+                    #{buyerTaxpayerCode,jdbcType=VARCHAR},
+                    #{amount,jdbcType=INTEGER},
+                    #{rawInvoiceId,jdbcType=VARCHAR},
+                    #{rawInvoiceCode,jdbcType=VARCHAR},
+                    #{rawInvoiceNum,jdbcType=VARCHAR},
+                    #{invoiceUrl,jdbcType=VARCHAR},
+                    #{yearMonth,jdbcType=VARCHAR}
+        )
+    </insert>
+    <delete id="deleteByMounth" parameterType="java.lang.String">
+        DELETE  from t_hcinvoice where yearMonth = #{yearMonth,jdbcType=VARCHAR}
+    </delete>
+</mapper>