代码优化开发20211025

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

@@ -279,7 +279,7 @@ public class SimpleCORSFilter implements Filter {
             api = m.group(1);
         }
         if(StringUtils.isEmpty(api)){
-           api = getsrt("\"api\":\"", "\"", request).trim();;
+            api = JSONObject.parseObject(request.substring(0, request.length()-1)).getString("api");
         }
         return  api;
     }
@@ -292,7 +292,7 @@ public class SimpleCORSFilter implements Filter {
         }
 
         if(StringUtils.isEmpty(appkey)){
-            appkey = getsrt("\"appkey\":\"", "\"", request).trim();;
+            appkey = JSONObject.parseObject(request.substring(0, request.length()-1)).getString("appkey");
 
         }
         return  appkey;
@@ -306,7 +306,7 @@ public class SimpleCORSFilter implements Filter {
         }
 
         if(StringUtils.isEmpty(appSecret)){
-            appSecret = getsrt("\"appSecret\":\"", "\"", request).trim();;
+            appSecret = JSONObject.parseObject(request.substring(0, request.length()-1)).getString("appSecret");
 
         }
 
@@ -318,6 +318,7 @@ public class SimpleCORSFilter implements Filter {
         Matcher m=p.matcher(request);
         while(m.find()){
             data = m.group(1);
+
         }
 
         if(StringUtils.isEmpty(data)){

src/main/java/com/jkcredit/invoice/model/entity/Calculate/NoCarCalculateInfor.java

@@ -18,6 +18,12 @@ public class NoCarCalculateInfor {
      */
     private String customId;
 
+
+    /**
+     * 主体名称
+     */
+    private String companyLongName;
+
     /**
      * 公司编号
      */
@@ -167,12 +173,21 @@ public class NoCarCalculateInfor {
         this.calculateEnd = calculateEnd;
     }
 
+    public String getCompanyLongName() {
+        return companyLongName;
+    }
+
+    public void setCompanyLongName(String companyLongName) {
+        this.companyLongName = companyLongName;
+    }
+
     @Override
     public String toString() {
         return "NoCarCalculateInfor{" +
                 "Id=" + Id +
                 ", tradeId='" + tradeId + '\'' +
                 ", customId='" + customId + '\'' +
+                ", companyLongName='" + companyLongName + '\'' +
                 ", companyNum='" + companyNum + '\'' +
                 ", buyerName='" + buyerName + '\'' +
                 ", buyerTaxpayerCode='" + buyerTaxpayerCode + '\'' +

src/main/java/com/jkcredit/invoice/model/entity/Calculate/SelfCarCalculateInfor.java

@@ -10,6 +10,17 @@ public class SelfCarCalculateInfor {
      */
     private String customId;
 
+
+    /**
+     * 主体名称
+     */
+    private String companyLongName;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
     /**
      * 税号
      */
@@ -122,11 +133,29 @@ public class SelfCarCalculateInfor {
         this.calTimeEnd = calTimeEnd;
     }
 
+    public String getCompanyLongName() {
+        return companyLongName;
+    }
+
+    public void setCompanyLongName(String companyLongName) {
+        this.companyLongName = companyLongName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
     @Override
     public String toString() {
         return "SelfCarCalculateInfor{" +
                 "id=" + id +
                 ", customId='" + customId + '\'' +
+                ", companyLongName='" + companyLongName + '\'' +
+                ", companyName='" + companyName + '\'' +
                 ", companyReferencenum='" + companyReferencenum + '\'' +
                 ", companyNum='" + companyNum + '\'' +
                 ", etcNum='" + etcNum + '\'' +

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

@@ -15,6 +15,8 @@ public class CustomerRecharge {
     private Double rechargeMony;
 
     private String rechargeTime;
+    private String rechargeStartTime;
+    private String rechargeEndTime;
 
     public Long getId() {
         return id;
@@ -63,4 +65,20 @@ public class CustomerRecharge {
     public void setCompanyName(String companyName) {
         this.companyName = companyName;
     }
+
+    public String getRechargeStartTime() {
+        return rechargeStartTime;
+    }
+
+    public void setRechargeStartTime(String rechargeStartTime) {
+        this.rechargeStartTime = rechargeStartTime;
+    }
+
+    public String getRechargeEndTime() {
+        return rechargeEndTime;
+    }
+
+    public void setRechargeEndTime(String rechargeEndTime) {
+        this.rechargeEndTime = rechargeEndTime;
+    }
 }

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

@@ -540,6 +540,9 @@ public class NoCarServiceImpl implements NoCarService{
                         customer.setInvoiceTime(DateUtil.getCurrentDateStr());
                         customer.setAccountBalance(MathUtil.sub(customer.getAccountBalance(),calculateInfor.getFee()));
                         customerMapper.updateByPrimaryKeySelective(customer);
+
+                        calculateInfor.setCompanyLongName(customer.getCompany());
+
                         calculateInforMapper.insert(calculateInfor);
                     }
 

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

@@ -191,6 +191,8 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                 SelfCarCalculateInfor carCalculateInfor = new SelfCarCalculateInfor();
                 carCalculateInfor.setCustomId(customerRec.getCustomerName());
                 carCalculateInfor.setCompanyNum(customerRec.getCompanyNum());
+                carCalculateInfor.setCompanyName(customerRec.getCompanyName());//公司名称
+                carCalculateInfor.setCompanyLongName(customerRec.getCompanyBelongName());//主体名称
                 carCalculateInfor.setCalTime(StringUtils.substring(selfCarTrade.getExTime(),0,7));
                 carCalculateInfor.setFee(customer.getFee());
                 carCalculateInfor.setCompanyReferencenum(customerRec.getCompanyReferencenum());

src/main/resources/mapper/calculateInfor/NoCarCalculateInforMapper.xml

@@ -13,6 +13,7 @@
         <result column="buyerName" property="buyerName"/>
         <result column="buyerTaxpayerCode" property="buyerTaxpayerCode"/>
         <result column="invoiceMakeTime" property="invoiceMakeTime"/>
+        <result column="companyLongName" property="companyLongName"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -25,22 +26,30 @@
         ctype,
         buyerName,
         buyerTaxpayerCode,
-        invoiceMakeTime
+        invoiceMakeTime,
+        companyLongName
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
         <include refid="baseSql" />
         from t_CalculateInfor
         <where>
+            1 = 1
             <if test="calculateInfor.customId != null and calculateInfor.customId != ''">
                 and customId LIKE CONCAT('%',#{calculateInfor.customId},'%')
             </if>
+            <if test="calculateInfor.companyLongName != null and calculateInfor.companyLongName != ''">
+                and companyLongName LIKE CONCAT('%',#{calculateInfor.companyLongName},'%')
+            </if>
             <if test="calculateInfor.buyerName != null and calculateInfor.buyerName != ''">
                 and buyerName LIKE CONCAT('%',#{calculateInfor.buyerName},'%')
             </if>
             <if test="calculateInfor.buyerTaxpayerCode != null and calculateInfor.buyerTaxpayerCode != ''">
                 and buyerTaxpayerCode = #{calculateInfor.buyerTaxpayerCode}
             </if>
+            <if test="calculateInfor.tradeId != null and calculateInfor.tradeId != ''">
+                and tradeId = #{calculateInfor.tradeId}
+            </if>
             <if test="calculateInfor.invoiceMakeTime != null and calculateInfor.invoiceMakeTime != ''">
                 and invoiceMakeTime BETWEEN #{calculateInfor.invoiceMakeStart} and #{calculateInfor.invoiceMakeEnd}
             </if>
@@ -95,11 +104,12 @@
         ctype,
         buyerName,
         buyerTaxpayerCode,
-        invoiceMakeTime
+        invoiceMakeTime,
+        companyLongName
         )
         values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
         #{tradeId,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE},#{calculateTime,jdbcType=VARCHAR},#{ctype,jdbcType=INTEGER}
-        ,#{buyerName,jdbcType=VARCHAR},#{buyerTaxpayerCode,jdbcType=VARCHAR},#{invoiceMakeTime,jdbcType=VARCHAR}
+        ,#{buyerName,jdbcType=VARCHAR},#{buyerTaxpayerCode,jdbcType=VARCHAR},#{invoiceMakeTime,jdbcType=VARCHAR},#{companyLongName,jdbcType=VARCHAR}
         )
     </insert>
 </mapper>

src/main/resources/mapper/calculateInfor/SefCarCalculateInforMapper.xml

@@ -12,6 +12,8 @@
         <result column="ctype" property="ctype"/>
         <result column="invoiceMkTime" property="invoiceMkTime"/>
         <result column="companyReferencenum" property="companyReferencenum"/>
+        <result column="companyName" property="companyName"/>
+        <result column="companyLongName" property="companyLongName"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -22,18 +24,28 @@
         fee,
         calTime,
         invoiceMkTime,
-        companyReferencenum
+        companyReferencenum,
+        companyName,
+        companyLongName
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
         <include refid="baseSql" />
         from t_SelfCalculateInfor
+        where 1 = 1
         <if test="calculateInfor.customId != null and calculateInfor.customId != ''">
             and customId LIKE CONCAT('%',#{calculateInfor.customId},'%')
         </if>
+
         <if test="calculateInfor.companyReferencenum != null and calculateInfor.companyReferencenum != ''">
             and companyReferencenum =#{calculateInfor.companyReferencenum}
         </if>
+        <if test="calculateInfor.companyName != null and calculateInfor.companyName != ''">
+            and companyName LIKE CONCAT('%',#{calculateInfor.companyName},'%')
+        </if>
+        <if test="calculateInfor.companyLongName != null and calculateInfor.companyLongName != ''">
+            and companyLongName LIKE CONCAT('%',#{calculateInfor.companyLongName},'%')
+        </if>
         <if test="calculateInfor.etcNum != null and calculateInfor.etcNum != ''">
             and etcNum = #{calculateInfor.etcNum}
         </if>
@@ -52,10 +64,10 @@
         companyNum,
         etcNum,
         fee,
-        calTime,invoiceMkTime,companyReferencenum
+        calTime,invoiceMkTime,companyReferencenum,companyName,companyLongName
         )
         values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
-        #{etcNum,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE},#{calTime,jdbcType=VARCHAR},#{invoiceMkTime,jdbcType=VARCHAR},#{companyReferencenum,jdbcType=VARCHAR}
+        #{etcNum,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE},#{calTime,jdbcType=VARCHAR},#{invoiceMkTime,jdbcType=VARCHAR},#{companyReferencenum,jdbcType=VARCHAR},#{companyName,jdbcType=VARCHAR},#{companyLongName,jdbcType=VARCHAR}
         )
     </insert>
     <resultMap id="staticResultMap" type="java.util.Map">

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

@@ -23,6 +23,9 @@
       <if test="customerRecharge.companyName != null and customerRecharge.companyName != ''">
         and companyName LIKE CONCAT('%',#{customerRecharge.companyName},'%')
       </if>
+      <if test="customerRecharge.rechargeMony != null and customerRecharge.rechargeMony != ''">
+        and recharge_mony = #{rechargeMony,jdbcType=DOUBLE}
+      </if>
     </where>
     order by recharge_time desc
   </select>