数据中心--利息支出接口更改

data-base/base-sync-cashier/Dockerfile

@@ -20,4 +20,4 @@ RUN cd /usr/app/data-parent && mvn -T 1C install  -pl ../data-base/base-sync-cas
 
 #指定容器启动程序及参数   <ENTRYPOINT> "<CMD>"
 EXPOSE 8080
-ENTRYPOINT ["java","-Xms30m","-Xmx80m","-jar","/usr/app/data-base/base-sync-cashier/target/base-sync-cashier-1.0-SNAPSHOT.jar"]
+ENTRYPOINT ["java","-Xms80m","-Xmx125m","-jar","/usr/app/data-base/base-sync-cashier/target/base-sync-cashier-1.0-SNAPSHOT.jar"]
\ No newline at end of file

data-base/base-sync-cashier/src/main/java/com/bailuntec/job/InterestJob.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.TypeReference;
 import com.bailuntec.domain.constant.CommonConstant;
 import com.bailuntec.domain.entity.DcBaseFinanceInterest;
 import com.bailuntec.domain.entity.JobPointLog;
-import com.bailuntec.domain.example.DcBaseFinanceInterestExample;
 import com.bailuntec.mapper.DcBaseFinanceInterestMapper;
 import com.bailuntec.support.PointJob;
 import com.bailuntec.utils.OkHttpUtil;
@@ -20,7 +19,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -57,12 +55,11 @@ public class InterestJob extends PointJob {
             if (StringUtils.isNoneBlank(palResultStr)) {
                 List<DcBaseFinanceInterest> dcBaseFinanceInterestList = JSON.parseObject(palResultStr, new TypeReference<List<DcBaseFinanceInterest>>(){});
                 if (dcBaseFinanceInterestList != null && dcBaseFinanceInterestList.size() > 0) {
-                    DcBaseFinanceInterestMapper dcBaseFinanceInterestMapper = SessionUtil.getSession().getMapper(DcBaseFinanceInterestMapper.class);
-                    dcBaseFinanceInterestMapper.deleteByExample(DcBaseFinanceInterestExample.newAndCreateCriteria().andActualRepayTimeBetween(LocalDateTime.of(jobPointLog.getStartTime().toLocalDate(), LocalTime.MIN), LocalDateTime.of(jobPointLog.getEndTime().toLocalDate(), LocalTime.MIN)).example());
                     for(DcBaseFinanceInterest dcBaseFinanceInterest : dcBaseFinanceInterestList) {
+                        DcBaseFinanceInterestMapper dcBaseFinanceInterestMapper = SessionUtil.getSession().getMapper(DcBaseFinanceInterestMapper.class);
                         try {
                             dcBaseFinanceInterestMapper = SessionUtil.getSession().getMapper(DcBaseFinanceInterestMapper.class);
-                            dcBaseFinanceInterestMapper.insertSelective(dcBaseFinanceInterest);
+                            dcBaseFinanceInterestMapper.upsertSelective(dcBaseFinanceInterest);
                         } catch (Exception e) {
                             log.warn("Mybatis 操作失败!", e);
                             throw new RuntimeException("MyBatis 操作失败!");

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseFinanceInterest.java

@@ -19,6 +19,33 @@ public class DcBaseFinanceInterest {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_finance_interest.borrow_id
+     *
+     * @mbg.generated
+     */
+    private Integer borrowId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_finance_interest.repay_id
+     *
+     * @mbg.generated
+     */
+    private Integer repayId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_finance_interest.contract_no
+     *
+     * @mbg.generated
+     */
+    private String contractNo;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_finance_interest.company_val
      *
      * @mbg.generated
@@ -128,6 +155,9 @@ public class DcBaseFinanceInterest {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
+        sb.append(", borrowId=").append(borrowId);
+        sb.append(", repayId=").append(repayId);
+        sb.append(", contractNo=").append(contractNo);
         sb.append(", companyVal=").append(companyVal);
         sb.append(", company=").append(company);
         sb.append(", bankCard=").append(bankCard);
@@ -162,6 +192,9 @@ public class DcBaseFinanceInterest {
         }
         DcBaseFinanceInterest other = (DcBaseFinanceInterest) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getBorrowId() == null ? other.getBorrowId() == null : this.getBorrowId().equals(other.getBorrowId()))
+            && (this.getRepayId() == null ? other.getRepayId() == null : this.getRepayId().equals(other.getRepayId()))
+            && (this.getContractNo() == null ? other.getContractNo() == null : this.getContractNo().equals(other.getContractNo()))
             && (this.getCompanyVal() == null ? other.getCompanyVal() == null : this.getCompanyVal().equals(other.getCompanyVal()))
             && (this.getCompany() == null ? other.getCompany() == null : this.getCompany().equals(other.getCompany()))
             && (this.getBankCard() == null ? other.getBankCard() == null : this.getBankCard().equals(other.getBankCard()))
@@ -186,6 +219,9 @@ public class DcBaseFinanceInterest {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getBorrowId() == null) ? 0 : getBorrowId().hashCode());
+        result = prime * result + ((getRepayId() == null) ? 0 : getRepayId().hashCode());
+        result = prime * result + ((getContractNo() == null) ? 0 : getContractNo().hashCode());
         result = prime * result + ((getCompanyVal() == null) ? 0 : getCompanyVal().hashCode());
         result = prime * result + ((getCompany() == null) ? 0 : getCompany().hashCode());
         result = prime * result + ((getBankCard() == null) ? 0 : getBankCard().hashCode());

data-common/src/main/java/com/bailuntec/domain/example/DcBaseFinanceInterestExample.java

@@ -431,6 +431,196 @@ public class DcBaseFinanceInterestExample {
             return (Criteria) this;
         }
 
+        public Criteria andBorrowIdIsNull() {
+            addCriterion("borrow_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdIsNotNull() {
+            addCriterion("borrow_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdEqualTo(Integer value) {
+            addCriterion("borrow_id =", value, "borrowId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdNotEqualTo(Integer value) {
+            addCriterion("borrow_id <>", value, "borrowId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdGreaterThan(Integer value) {
+            addCriterion("borrow_id >", value, "borrowId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("borrow_id >=", value, "borrowId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdLessThan(Integer value) {
+            addCriterion("borrow_id <", value, "borrowId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdLessThanOrEqualTo(Integer value) {
+            addCriterion("borrow_id <=", value, "borrowId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdIn(List<Integer> values) {
+            addCriterion("borrow_id in", values, "borrowId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdNotIn(List<Integer> values) {
+            addCriterion("borrow_id not in", values, "borrowId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdBetween(Integer value1, Integer value2) {
+            addCriterion("borrow_id between", value1, value2, "borrowId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBorrowIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("borrow_id not between", value1, value2, "borrowId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdIsNull() {
+            addCriterion("repay_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdIsNotNull() {
+            addCriterion("repay_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdEqualTo(Integer value) {
+            addCriterion("repay_id =", value, "repayId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdNotEqualTo(Integer value) {
+            addCriterion("repay_id <>", value, "repayId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdGreaterThan(Integer value) {
+            addCriterion("repay_id >", value, "repayId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("repay_id >=", value, "repayId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdLessThan(Integer value) {
+            addCriterion("repay_id <", value, "repayId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdLessThanOrEqualTo(Integer value) {
+            addCriterion("repay_id <=", value, "repayId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdIn(List<Integer> values) {
+            addCriterion("repay_id in", values, "repayId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdNotIn(List<Integer> values) {
+            addCriterion("repay_id not in", values, "repayId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdBetween(Integer value1, Integer value2) {
+            addCriterion("repay_id between", value1, value2, "repayId");
+            return (Criteria) this;
+        }
+
+        public Criteria andRepayIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("repay_id not between", value1, value2, "repayId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoIsNull() {
+            addCriterion("contract_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoIsNotNull() {
+            addCriterion("contract_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoEqualTo(String value) {
+            addCriterion("contract_no =", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoNotEqualTo(String value) {
+            addCriterion("contract_no <>", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoGreaterThan(String value) {
+            addCriterion("contract_no >", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoGreaterThanOrEqualTo(String value) {
+            addCriterion("contract_no >=", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoLessThan(String value) {
+            addCriterion("contract_no <", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoLessThanOrEqualTo(String value) {
+            addCriterion("contract_no <=", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoLike(String value) {
+            addCriterion("contract_no like", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoNotLike(String value) {
+            addCriterion("contract_no not like", value, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoIn(List<String> values) {
+            addCriterion("contract_no in", values, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoNotIn(List<String> values) {
+            addCriterion("contract_no not in", values, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoBetween(String value1, String value2) {
+            addCriterion("contract_no between", value1, value2, "contractNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andContractNoNotBetween(String value1, String value2) {
+            addCriterion("contract_no not between", value1, value2, "contractNo");
+            return (Criteria) this;
+        }
+
         public Criteria andCompanyValIsNull() {
             addCriterion("company_val is null");
             return (Criteria) this;

data-common/src/main/java/com/bailuntec/mapper/DcBaseFinanceInterestMapper.xml

@@ -7,6 +7,9 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="borrow_id" jdbcType="INTEGER" property="borrowId" />
+    <result column="repay_id" jdbcType="INTEGER" property="repayId" />
+    <result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
     <result column="company_val" jdbcType="INTEGER" property="companyVal" />
     <result column="company" jdbcType="VARCHAR" property="company" />
     <result column="bank_card" jdbcType="VARCHAR" property="bankCard" />
@@ -90,8 +93,9 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, company_val, company, bank_card, bank_card_user, bank_name, creditor, repay_interest, 
-    repay_interest_rmb, actual_repay_time, gmt_create, gmt_modify
+    id, borrow_id, repay_id, contract_no, company_val, company, bank_card, bank_card_user, 
+    bank_name, creditor, repay_interest, repay_interest_rmb, actual_repay_time, gmt_create, 
+    gmt_modify
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseFinanceInterestExample" resultMap="BaseResultMap">
     <!--
@@ -152,12 +156,14 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into dc_base_finance_interest (id, company_val, company, 
+    insert into dc_base_finance_interest (id, borrow_id, repay_id, 
+      contract_no, company_val, company, 
       bank_card, bank_card_user, bank_name, 
       creditor, repay_interest, repay_interest_rmb, 
       actual_repay_time, gmt_create, gmt_modify
       )
-    values (#{id,jdbcType=INTEGER}, #{companyVal,jdbcType=INTEGER}, #{company,jdbcType=VARCHAR}, 
+    values (#{id,jdbcType=INTEGER}, #{borrowId,jdbcType=INTEGER}, #{repayId,jdbcType=INTEGER}, 
+      #{contractNo,jdbcType=VARCHAR}, #{companyVal,jdbcType=INTEGER}, #{company,jdbcType=VARCHAR}, 
       #{bankCard,jdbcType=VARCHAR}, #{bankCardUser,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, 
       #{creditor,jdbcType=VARCHAR}, #{repayInterest,jdbcType=DECIMAL}, #{repayInterestRmb,jdbcType=DECIMAL}, 
       #{actualRepayTime,jdbcType=TIMESTAMP}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModify,jdbcType=TIMESTAMP}
@@ -173,6 +179,15 @@
       <if test="id != null">
         id,
       </if>
+      <if test="borrowId != null">
+        borrow_id,
+      </if>
+      <if test="repayId != null">
+        repay_id,
+      </if>
+      <if test="contractNo != null">
+        contract_no,
+      </if>
       <if test="companyVal != null">
         company_val,
       </if>
@@ -211,6 +226,15 @@
       <if test="id != null">
         #{id,jdbcType=INTEGER},
       </if>
+      <if test="borrowId != null">
+        #{borrowId,jdbcType=INTEGER},
+      </if>
+      <if test="repayId != null">
+        #{repayId,jdbcType=INTEGER},
+      </if>
+      <if test="contractNo != null">
+        #{contractNo,jdbcType=VARCHAR},
+      </if>
       <if test="companyVal != null">
         #{companyVal,jdbcType=INTEGER},
       </if>
@@ -266,6 +290,15 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=INTEGER},
       </if>
+      <if test="record.borrowId != null">
+        borrow_id = #{record.borrowId,jdbcType=INTEGER},
+      </if>
+      <if test="record.repayId != null">
+        repay_id = #{record.repayId,jdbcType=INTEGER},
+      </if>
+      <if test="record.contractNo != null">
+        contract_no = #{record.contractNo,jdbcType=VARCHAR},
+      </if>
       <if test="record.companyVal != null">
         company_val = #{record.companyVal,jdbcType=INTEGER},
       </if>
@@ -311,6 +344,9 @@
     -->
     update dc_base_finance_interest
     set id = #{record.id,jdbcType=INTEGER},
+      borrow_id = #{record.borrowId,jdbcType=INTEGER},
+      repay_id = #{record.repayId,jdbcType=INTEGER},
+      contract_no = #{record.contractNo,jdbcType=VARCHAR},
       company_val = #{record.companyVal,jdbcType=INTEGER},
       company = #{record.company,jdbcType=VARCHAR},
       bank_card = #{record.bankCard,jdbcType=VARCHAR},
@@ -333,6 +369,15 @@
     -->
     update dc_base_finance_interest
     <set>
+      <if test="borrowId != null">
+        borrow_id = #{borrowId,jdbcType=INTEGER},
+      </if>
+      <if test="repayId != null">
+        repay_id = #{repayId,jdbcType=INTEGER},
+      </if>
+      <if test="contractNo != null">
+        contract_no = #{contractNo,jdbcType=VARCHAR},
+      </if>
       <if test="companyVal != null">
         company_val = #{companyVal,jdbcType=INTEGER},
       </if>
@@ -375,7 +420,10 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update dc_base_finance_interest
-    set company_val = #{companyVal,jdbcType=INTEGER},
+    set borrow_id = #{borrowId,jdbcType=INTEGER},
+      repay_id = #{repayId,jdbcType=INTEGER},
+      contract_no = #{contractNo,jdbcType=VARCHAR},
+      company_val = #{companyVal,jdbcType=INTEGER},
       company = #{company,jdbcType=VARCHAR},
       bank_card = #{bankCard,jdbcType=VARCHAR},
       bank_card_user = #{bankCardUser,jdbcType=VARCHAR},
@@ -399,6 +447,15 @@
       <if test="id != null">
         id,
       </if>
+      <if test="borrowId != null">
+        borrow_id,
+      </if>
+      <if test="repayId != null">
+        repay_id,
+      </if>
+      <if test="contractNo != null">
+        contract_no,
+      </if>
       <if test="companyVal != null">
         company_val,
       </if>
@@ -438,6 +495,15 @@
       <if test="id != null">
         #{id,jdbcType=INTEGER},
       </if>
+      <if test="borrowId != null">
+        #{borrowId,jdbcType=INTEGER},
+      </if>
+      <if test="repayId != null">
+        #{repayId,jdbcType=INTEGER},
+      </if>
+      <if test="contractNo != null">
+        #{contractNo,jdbcType=VARCHAR},
+      </if>
       <if test="companyVal != null">
         #{companyVal,jdbcType=INTEGER},
       </if>
@@ -477,6 +543,15 @@
       <if test="id != null">
         id = #{id,jdbcType=INTEGER},
       </if>
+      <if test="borrowId != null">
+        borrow_id = #{borrowId,jdbcType=INTEGER},
+      </if>
+      <if test="repayId != null">
+        repay_id = #{repayId,jdbcType=INTEGER},
+      </if>
+      <if test="contractNo != null">
+        contract_no = #{contractNo,jdbcType=VARCHAR},
+      </if>
       <if test="companyVal != null">
         company_val = #{companyVal,jdbcType=INTEGER},
       </if>
@@ -519,16 +594,21 @@
       @project https://github.com/itfsw/mybatis-generator-plugin
     -->
     insert into dc_base_finance_interest
-    (id, company_val, company, bank_card, bank_card_user, bank_name, creditor, repay_interest, 
-      repay_interest_rmb, actual_repay_time, gmt_create, gmt_modify)
+    (id, borrow_id, repay_id, contract_no, company_val, company, bank_card, bank_card_user, 
+      bank_name, creditor, repay_interest, repay_interest_rmb, actual_repay_time, gmt_create, 
+      gmt_modify)
     values
-    (#{id,jdbcType=INTEGER}, #{companyVal,jdbcType=INTEGER}, #{company,jdbcType=VARCHAR}, 
+    (#{id,jdbcType=INTEGER}, #{borrowId,jdbcType=INTEGER}, #{repayId,jdbcType=INTEGER}, 
+      #{contractNo,jdbcType=VARCHAR}, #{companyVal,jdbcType=INTEGER}, #{company,jdbcType=VARCHAR}, 
       #{bankCard,jdbcType=VARCHAR}, #{bankCardUser,jdbcType=VARCHAR}, #{bankName,jdbcType=VARCHAR}, 
       #{creditor,jdbcType=VARCHAR}, #{repayInterest,jdbcType=DECIMAL}, #{repayInterestRmb,jdbcType=DECIMAL}, 
       #{actualRepayTime,jdbcType=TIMESTAMP}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModify,jdbcType=TIMESTAMP}
       )
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
+    borrow_id = #{borrowId,jdbcType=INTEGER}, 
+    repay_id = #{repayId,jdbcType=INTEGER}, 
+    contract_no = #{contractNo,jdbcType=VARCHAR}, 
     company_val = #{companyVal,jdbcType=INTEGER}, 
     company = #{company,jdbcType=VARCHAR}, 
     bank_card = #{bankCard,jdbcType=VARCHAR},