Browse Source

1.添加汇率,币种字段

heqinwei 7 years ago
parent
commit
5a121500f4
23 changed files with 356 additions and 7 deletions
  1. 9 0
      applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Subledger.java
  2. 1 0
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerServiceImpl.java
  3. 1 0
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java
  4. 11 1
      applications/document/document-server/src/main/resources/mapper/SubledgerMapper.xml
  5. 20 0
      applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationDTO.java
  6. 37 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Fundtransferdetail.java
  7. 20 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalance.java
  8. 19 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalancedet.java
  9. 19 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalance.java
  10. 19 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalancedet.java
  11. 10 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Subledger.java
  12. 19 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Verification.java
  13. 2 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java
  14. 3 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java
  15. 3 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java
  16. 1 0
      applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java
  17. 43 1
      applications/money/money-server/src/main/resources/mapper/FundtransferdetailMapper.xml
  18. 21 1
      applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml
  19. 21 1
      applications/money/money-server/src/main/resources/mapper/PaybalancedetMapper.xml
  20. 21 0
      applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml
  21. 23 1
      applications/money/money-server/src/main/resources/mapper/RecbalancedetMapper.xml
  22. 11 1
      applications/money/money-server/src/main/resources/mapper/SubledgerMapper.xml
  23. 22 1
      applications/money/money-server/src/main/resources/mapper/VerificationMapper.xml

+ 9 - 0
applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Subledger.java

@@ -33,6 +33,15 @@ public class Subledger extends CommonBaseEntity implements Serializable {
     private Double sl_discount;
 
     private Integer sl_ym;
+    private String sl_currency;
+
+    public String getSl_currency() {
+        return sl_currency;
+    }
+
+    public void setSl_currency(String sl_currency) {
+        this.sl_currency = sl_currency;
+    }
 
     public String getSl_code() {
         return sl_code;

+ 1 - 0
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerServiceImpl.java

@@ -322,6 +322,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         subledger.setCreateTime(new Date());
         subledger.setCreatorId(BaseContextHolder.getUserId());
         subledger.setCreatorName(BaseContextHolder.getUserName());
+        subledger.setSl_currency(customer.getCu_currency());
         if (amount > new Double(0)){
             subledger.setSl_amount(amount);
             subledger.setSl_preamount(new Double(0));

+ 1 - 0
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -278,6 +278,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
         subledger.setCompanyId(BaseContextHolder.getCompanyId());
         subledger.setSl_date(DateUtils.getFirstDay(main.getVe_begindate()));
         subledger.setSl_ym(DateUtils.getYm(main.getVe_begindate()));
+        subledger.setSl_currency(main.getVe_currency());
         if (amount > new Double(0)){
             subledger.setSl_preamount(new Double(0));
             subledger.setSl_amount(Math.abs(amount));

+ 11 - 1
applications/document/document-server/src/main/resources/mapper/SubledgerMapper.xml

@@ -19,11 +19,12 @@
     <result column="sl_orderamount" property="sl_orderamount" jdbcType="DOUBLE" />
     <result column="sl_discount" property="sl_discount" jdbcType="DOUBLE" />
     <result column="sl_ym" property="sl_ym" jdbcType="INTEGER" />
+    <result column="sl_currency" property="sl_currency" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     sl_id, sl_code, sl_kind, sl_custid, sl_vendid, sl_date, sl_amount, sl_preamount, 
     sl_yamount, sl_namount, sl_remark, companyId, updaterId, updateTime, sl_orderamount, 
-    sl_discount, sl_ym
+    sl_discount, sl_ym, sl_currency
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -111,6 +112,9 @@
       <if test="creatorName != null" >
         creatorName,
       </if>
+      <if test="sl_currency != null" >
+        sl_currency,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sl_code != null" >
@@ -170,6 +174,9 @@
       <if test="creatorName != null" >
         #{creatorName,jdbcType=VARCHAR},
       </if>
+      <if test="sl_currency != null" >
+        #{sl_currency,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Subledger" >
@@ -223,6 +230,9 @@
       <if test="sl_ym != null" >
         sl_ym = #{sl_ym,jdbcType=INTEGER},
       </if>
+      <if test="sl_currency != null" >
+        sl_currency = #{sl_currency,jdbcType=INTEGER},
+      </if>
     </set>
     where sl_id = #{id,jdbcType=INTEGER}
   </update>

+ 20 - 0
applications/money/money-dto/src/main/java/com/usoftchina/saas/money/dto/VerificationDTO.java

@@ -72,6 +72,26 @@ public class VerificationDTO extends  CommonBaseDTO implements Serializable {
 
     private String vc_auditman;
 
+    private String vc_currency;
+
+    private Double vc_rate;
+
+    public String getVc_currency() {
+        return vc_currency;
+    }
+
+    public void setVc_currency(String vc_currency) {
+        this.vc_currency = vc_currency;
+    }
+
+    public Double getVc_rate() {
+        return vc_rate;
+    }
+
+    public void setVc_rate(Double vc_rate) {
+        this.vc_rate = vc_rate;
+    }
+
     public Date getVc_auditdate() {
         return vc_auditdate;
     }

+ 37 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Fundtransferdetail.java

@@ -50,6 +50,43 @@ public class Fundtransferdetail extends CommonBaseEntity implements Serializable
     private Double bk_outthisamount;
     private Double bk_inthisamount;
 
+    private String ftd_currency;
+    private String ftd_incurrency;
+    private Double ftd_innowbalance;
+    private Double ftd_rate;
+
+    public String getFtd_currency() {
+        return ftd_currency;
+    }
+
+    public void setFtd_currency(String ftd_currency) {
+        this.ftd_currency = ftd_currency;
+    }
+
+    public String getFtd_incurrency() {
+        return ftd_incurrency;
+    }
+
+    public void setFtd_incurrency(String ftd_incurrency) {
+        this.ftd_incurrency = ftd_incurrency;
+    }
+
+    public Double getFtd_innowbalance() {
+        return ftd_innowbalance;
+    }
+
+    public void setFtd_innowbalance(Double ftd_innowbalance) {
+        this.ftd_innowbalance = ftd_innowbalance;
+    }
+
+    public Double getFtd_rate() {
+        return ftd_rate;
+    }
+
+    public void setFtd_rate(Double ftd_rate) {
+        this.ftd_rate = ftd_rate;
+    }
+
     public Double getBk_outthisamount() {
         return bk_outthisamount;
     }

+ 20 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalance.java

@@ -83,6 +83,26 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
 
     private Double pb_amount;
 
+    private String pb_currency;
+
+    private Double pb_rate;
+
+    public String getPb_currency() {
+        return pb_currency;
+    }
+
+    public void setPb_currency(String pb_currency) {
+        this.pb_currency = pb_currency;
+    }
+
+    public Double getPb_rate() {
+        return pb_rate;
+    }
+
+    public void setPb_rate(Double pb_rate) {
+        this.pb_rate = pb_rate;
+    }
+
     public Double getPb_amount() {
         return pb_amount;
     }

+ 19 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalancedet.java

@@ -39,6 +39,25 @@ public class Paybalancedet extends CommonBaseEntity implements Serializable {
 
     private String pd_text5;
     private Date pb_date;
+    private String pd_currency;
+
+    private Double pd_rate;
+
+    public String getPd_currency() {
+        return pd_currency;
+    }
+
+    public void setPd_currency(String pd_currency) {
+        this.pd_currency = pd_currency;
+    }
+
+    public Double getPd_rate() {
+        return pd_rate;
+    }
+
+    public void setPd_rate(Double pd_rate) {
+        this.pd_rate = pd_rate;
+    }
 
     public Date getPb_date() {
         return pb_date;

+ 19 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalance.java

@@ -82,6 +82,25 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
     private Date rb_auditdate;
 
     private Double rb_amount;
+    private String rb_currency;
+
+    private Double rb_rate;
+
+    public String getRb_currency() {
+        return rb_currency;
+    }
+
+    public void setRb_currency(String rb_currency) {
+        this.rb_currency = rb_currency;
+    }
+
+    public Double getRb_rate() {
+        return rb_rate;
+    }
+
+    public void setRb_rate(Double rb_rate) {
+        this.rb_rate = rb_rate;
+    }
 
     public Double getRb_amount() {
         return rb_amount;

+ 19 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalancedet.java

@@ -45,6 +45,25 @@ public class Recbalancedet extends CommonBaseEntity implements Serializable{
 
     private String rd_text5;
     private Date rb_date;
+    private String rd_currency;
+
+    private Double rd_rate;
+
+    public String getRd_currency() {
+        return rd_currency;
+    }
+
+    public void setRd_currency(String rd_currency) {
+        this.rd_currency = rd_currency;
+    }
+
+    public Double getRd_rate() {
+        return rd_rate;
+    }
+
+    public void setRd_rate(Double rd_rate) {
+        this.rd_rate = rd_rate;
+    }
 
     public Date getRb_date() {
         return rb_date;

+ 10 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Subledger.java

@@ -35,6 +35,16 @@ public class Subledger extends CommonBaseEntity implements Serializable {
 
     private Integer sl_ym;
 
+    private String sl_currency;
+
+    public String getSl_currency() {
+        return sl_currency;
+    }
+
+    public void setSl_currency(String sl_currency) {
+        this.sl_currency = sl_currency;
+    }
+
     public String getSl_code() {
         return sl_code;
     }

+ 19 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Verification.java

@@ -68,6 +68,25 @@ public class Verification extends CommonBaseEntity implements Serializable {
     private Date vc_auditdate;
 
     private String vc_auditman;
+    private String vc_currency;
+
+    private Double vc_rate;
+
+    public String getVc_currency() {
+        return vc_currency;
+    }
+
+    public void setVc_currency(String vc_currency) {
+        this.vc_currency = vc_currency;
+    }
+
+    public Double getVc_rate() {
+        return vc_rate;
+    }
+
+    public void setVc_rate(Double vc_rate) {
+        this.vc_rate = vc_rate;
+    }
 
     public Date getVc_auditdate() {
         return vc_auditdate;

+ 2 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java

@@ -104,6 +104,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
             othreceiptsdetail1.setOr_date(othreceipts.getOr_date());
             othreceiptsdetail1.setOrd_currency(othreceipts.getOr_currency());
             othreceiptsdetail1.setOrd_rate(othreceipts.getOr_rate());
+            othreceiptsdetail1.setOrd_currency(othreceipts.getOr_currency());
+            othreceiptsdetail1.setOrd_rate(othreceipts.getOr_rate());
             if (othreceiptsdetail1.getId() > 0 ){
                 othreceiptsdetailMapper.updateByPrimaryKeySelective(othreceiptsdetail1);
             }else {

+ 3 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -101,6 +101,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             paybalancedet1.setPd_pbid(Math.toIntExact(pbId));
             paybalancedet1.setCompanyId(BaseContextHolder.getCompanyId());
             paybalancedet1.setPb_date(paybalance.getPb_date());
+            paybalancedet1.setPd_currency(paybalance.getPb_currency());
+            paybalancedet1.setPd_rate(paybalance.getPb_rate());
             if (paybalancedet1.getId() > 0 ){
                 paybalancedetMapper.updateByPrimaryKeySelective(paybalancedet1);
             }else {
@@ -563,6 +565,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         Double pbdamount = paybalance.getPb_pbdamount()==null?new Double(0):paybalance.getPb_pbdamount();
         subledger.setSl_amount(-pbdamount);
         subledger.setSl_orderamount(pdamount);
+        subledger.setSl_currency(paybalance.getPb_currency());
 
         if(preamount!=0){
             subledger.setSl_yamount(pbdamount);

+ 3 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -102,6 +102,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             recbalancedet1.setRd_rbid(Math.toIntExact(rbId));
             recbalancedet1.setCompanyId(BaseContextHolder.getCompanyId());
             recbalancedet1.setRb_date(recbalance.getRb_date());
+            recbalancedet1.setRd_currency(recbalance.getRb_currency());
+            recbalancedet1.setRd_rate(recbalance.getRb_rate());
             if (recbalancedet1.getId() > 0 ){
                 recbalancedetMapper.updateByPrimaryKeySelective(recbalancedet1);
             }else {
@@ -573,6 +575,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         Double rbdamount = recbalance.getRb_rbdamount()==null?new Double(0):recbalance.getRb_rbdamount();
         subledger.setSl_amount(-rbdamount);
         subledger.setSl_orderamount(rdamount);
+        subledger.setSl_currency(recbalance.getRb_currency());
 
         if(preamount!=0){
             subledger.setSl_yamount(rbdamount);

+ 1 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java

@@ -277,6 +277,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
         String kind = verification.getVc_kind();
         subledger.setCompanyId(BaseContextHolder.getCompanyId());
         subledger.setSl_code(verification.getVc_code());
+        subledger.setSl_currency(verification.getVc_currency());
         Double amount1 = verification.getVc_amount1()==null?new Double(0):verification.getVc_amount1();
         Double amount2 = verification.getVc_amount2()==null?new Double(0):verification.getVc_amount2();
 

+ 43 - 1
applications/money/money-server/src/main/resources/mapper/FundtransferdetailMapper.xml

@@ -27,11 +27,17 @@
     <result column="ftd_text5" property="ftd_text5" jdbcType="VARCHAR" />
       <result column="bk_outthisamount" property="bk_outthisamount" jdbcType="DOUBLE" />
       <result column="bk_inthisamount" property="bk_inthisamount" jdbcType="DOUBLE" />
+
+    <result column="ftd_currency" property="ftd_currency" jdbcType="VARCHAR" />
+    <result column="ftd_incurrency" property="ftd_incurrency" jdbcType="VARCHAR" />
+    <result column="ftd_innowbalance" property="ftd_innowbalance" jdbcType="DOUBLE" />
+    <result column="ftd_rate" property="ftd_rate" jdbcType="DOUBLE" />
   </resultMap>
   <sql id="Base_Column_List" >
     ftd_id, ftd_ftid, ftd_detno, ftd_ym, ftd_bankid, ftd_bankcode, ftd_bankname, ftd_inbankid, 
     ftd_inbankcode, ftd_inbankname, ftd_nowbalance, ftd_paymethod, ftd_paycode, ftd_remark, 
-    companyid, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5
+    companyid, updaterId, updatedate, ftd_text1, ftd_text2, ftd_text3, ftd_text4, ftd_text5, ftd_currency,
+    ftd_incurrency,ftd_innowbalance,ftd_rate
   </sql>
     <sql id="Bank_Column_List">
         b.bk_thisamount as bk_outthisamount,c.bk_thisamount as bk_inthisamount
@@ -147,6 +153,18 @@
       <if test="ftd_text5 != null" >
         ftd_text5,
       </if>
+      <if test="ftd_currency != null" >
+        ftd_currency,
+      </if>
+      <if test="ftd_incurrency != null" >
+        ftd_incurrency,
+      </if>
+      <if test="ftd_innowbalance != null" >
+        ftd_innowbalance,
+      </if>
+      <if test="ftd_rate != null" >
+        ftd_rate,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="ftd_ftid != null" >
@@ -212,6 +230,18 @@
       <if test="ftd_text5 != null" >
         #{ftd_text5,jdbcType=VARCHAR},
       </if>
+      <if test="ftd_currency != null" >
+        #{ftd_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="ftd_incurrency != null" >
+        #{ftd_incurrency,jdbcType=VARCHAR},
+      </if>
+      <if test="ftd_innowbalance != null" >
+        #{ftd_innowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="ftd_rate != null" >
+        #{ftd_rate,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Fundtransferdetail" >
@@ -278,6 +308,18 @@
       <if test="ftd_text5 != null" >
         ftd_text5 = #{ftd_text5,jdbcType=VARCHAR},
       </if>
+      <if test="ftd_currency != null" >
+        ftd_currency = #{ftd_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="ftd_incurrency != null" >
+        ftd_incurrency = #{ftd_incurrency,jdbcType=VARCHAR},
+      </if>
+      <if test="ftd_innowbalance != null" >
+        ftd_innowbalance = #{ftd_innowbalance,jdbcType=DOUBLE},
+      </if>
+      <if test="ftd_rate != null" >
+        ftd_rate = #{ftd_rate,jdbcType=DOUBLE},
+      </if>
     </set>
     where ftd_id = #{id,jdbcType=INTEGER}
   </update>

+ 21 - 1
applications/money/money-server/src/main/resources/mapper/PaybalanceMapper.xml

@@ -43,6 +43,8 @@
     <result column="pb_auditman" property="pb_auditman" jdbcType="VARCHAR" />
     <result column="pb_amount" property="pb_amount" jdbcType="DOUBLE" />
     <result column="pd_paycode" property="pd_paycode" jdbcType="VARCHAR" />
+    <result column="pb_rate" property="pb_rate" jdbcType="DOUBLE" />
+    <result column="pb_currency" property="pb_currency" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -107,7 +109,7 @@
     pb_pdamount, pb_pbdamount, pb_preamount, pb_discounts, pb_havebalance,
      pb_status, pb_statuscode, pb_remark, paybalance.companyId,
     paybalance.updaterId,paybalance.updatedate, pb_text1, pb_text2, pb_text3, pb_text4, pb_text5, paybalance.creatorName,
-    paybalance.createTime, pb_auditdate, pb_auditman,pb_amount
+    paybalance.createTime, pb_auditdate, pb_auditman,pb_amount,pb_rate,pb_currency
   </sql>
   <sql id="left_Column_List">
     ve_leftamount
@@ -241,6 +243,12 @@
       <if test="pb_amount != null" >
         pb_amount,
       </if>
+      <if test="pb_currency != null">
+        pb_currency,
+      </if>
+      <if test="pb_rate != null">
+        pb_rate,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pb_code != null">
@@ -318,6 +326,12 @@
       <if test="pb_amount != null" >
         #{pb_amount,jdbcType=DOUBLE},
       </if>
+      <if test="pb_currency != null">
+        #{pb_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="pb_rate != null">
+        #{pb_rate,jdbcType=DOUBLE},
+      </if>
     </trim>
     <selectKey resultType="Long" keyProperty="id" order="AFTER">
       SELECT LAST_INSERT_ID()
@@ -401,6 +415,12 @@
       </if>
       <if test="pb_amount != null">
         pb_amount = #{pb_amount,jdbcType=DOUBLE},
+      </if>
+      <if test="pb_currency != null">
+        pb_currency = #{pb_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="pb_rate != null">
+        pb_rate = #{pb_rate,jdbcType=DOUBLE},
       </if>
         pb_auditman = #{pb_auditman,jdbcType=VARCHAR},
         pb_auditdate = #{pb_auditdate,jdbcType=TIMESTAMP}

+ 21 - 1
applications/money/money-server/src/main/resources/mapper/PaybalancedetMapper.xml

@@ -22,11 +22,13 @@
     <result column="pd_text3" property="pd_text3" jdbcType="VARCHAR" />
     <result column="pd_text4" property="pd_text4" jdbcType="VARCHAR" />
     <result column="pd_text5" property="pd_text5" jdbcType="VARCHAR" />
+    <result column="pd_rate" property="pd_rate" jdbcType="DOUBLE" />
+    <result column="pd_currency" property="pd_currency" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     pd_id, pd_pbid, pd_detno, pd_ym, pd_bankid, pd_bankcode, pd_bankname, pd_amount,
     pd_paymethod, pd_paycode, pd_remark, companyId, updaterId, updatedate, pd_text1, 
-    pd_text2, pd_text3, pd_text4, pd_text5
+    pd_text2, pd_text3, pd_text4, pd_text5,pd_rate,pd_currency
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -119,6 +121,12 @@
       <if test="pd_text5 != null" >
         pd_text5,
       </if>
+      <if test="pd_currency != null">
+        pd_currency,
+      </if>
+      <if test="pd_rate != null">
+        pd_rate,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="pd_pbid != null" >
@@ -175,6 +183,12 @@
       <if test="pd_text5 != null" >
         #{pd_text5,jdbcType=VARCHAR},
       </if>
+      <if test="pd_currency != null">
+        #{pd_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_rate != null">
+        #{pd_rate,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
@@ -234,6 +248,12 @@
       <if test="pd_text5 != null" >
         pd_text5 = #{pd_text5,jdbcType=VARCHAR},
       </if>
+      <if test="pd_currency != null">
+        pd_currency = #{pd_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="pd_rate != null">
+        pd_rate = #{pd_rate,jdbcType=DOUBLE},
+      </if>
     </set>
     where pd_id = #{id,jdbcType=INTEGER}
   </update>

+ 21 - 0
applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml

@@ -43,6 +43,9 @@
     <result column="rb_auditdate" property="rb_auditdate" jdbcType="TIMESTAMP" />
     <result column="rb_amount" property="rb_amount" jdbcType="DOUBLE" />
     <result column="rd_paycode" property="rd_paycode" jdbcType="VARCHAR" />
+
+    <result column="rb_rate" property="rb_rate" jdbcType="DOUBLE" />
+    <result column="rb_currency" property="rb_currency" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -284,6 +287,12 @@
       <if test="rb_amount != null">
         rb_amount,
       </if>
+      <if test="rb_currency != null">
+        rb_currency,
+      </if>
+      <if test="rb_rate != null">
+      rb_rate,
+    </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="rb_code != null">
@@ -361,6 +370,12 @@
       <if test="rb_amount != null">
         #{rb_amount,jdbcType=DOUBLE},
       </if>
+      <if test="rb_currency != null">
+        #{rb_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="rb_rate != null">
+        #{rb_rate,jdbcType=DOUBLE},
+      </if>
     </trim>
     <selectKey resultType="Long" keyProperty="id" order="AFTER">
       SELECT LAST_INSERT_ID()
@@ -556,6 +571,12 @@
       </if>
       <if test="rb_amount != null">
         rb_amount = #{rb_amount,jdbcType=DOUBLE},
+      </if>
+      <if test="rb_currency != null">
+        rb_currency = #{rb_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="rb_rate != null">
+        rb_rate = #{rb_rate,jdbcType=DOUBLE},
       </if>
         rb_auditman = #{rb_auditman,jdbcType=VARCHAR},
       rb_auditdate = #{rb_auditdate,jdbcType=TIMESTAMP}

+ 23 - 1
applications/money/money-server/src/main/resources/mapper/RecbalancedetMapper.xml

@@ -22,6 +22,10 @@
     <result column="rd_text3" jdbcType="VARCHAR" property="rd_text3" />
     <result column="rd_text4" jdbcType="VARCHAR" property="rd_text4" />
     <result column="rd_text5" jdbcType="VARCHAR" property="rd_text5" />
+    <result column="rd_amount" property="rd_amount" jdbcType="DOUBLE" />
+    <result column="rd_paycode" property="rd_paycode" jdbcType="VARCHAR" />
+    <result column="rd_rate" property="rd_rate" jdbcType="DOUBLE" />
+    <result column="rd_currency" property="rd_currency" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -84,7 +88,7 @@
   <sql id="Base_Column_List">
     rd_id, rd_rbid, rd_detno, rd_ym, rd_bankid, rd_bankcode, rd_bankname, rd_amount, 
     rd_paymethod, rd_paycode, rd_remark, companyId, updaterId, updatedate, rd_text1,
-    rd_text2, rd_text3, rd_text4, rd_text5
+    rd_text2, rd_text3, rd_text4, rd_text5,rd_currency,rd_rate
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -175,6 +179,12 @@
       <if test="rd_text5 != null">
         rd_text5,
       </if>
+      <if test="rd_currency != null">
+        rd_currency,
+      </if>
+      <if test="rd_rate != null">
+        rd_rate,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="rd_rbid != null">
@@ -231,6 +241,12 @@
       <if test="rd_text5 != null">
         #{rd_text5,jdbcType=VARCHAR},
       </if>
+      <if test="rd_currency != null">
+        #{rd_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="rd_rate != null">
+        #{rd_rate,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Recbalancedet">
@@ -287,6 +303,12 @@
       <if test="rd_text5 != null">
         rd_text5 = #{rd_text5,jdbcType=VARCHAR},
       </if>
+      <if test="rd_currency != null">
+        rd_currency = #{rd_currency,jdbcType=VARCHAR},
+      </if>
+      <if test="rd_rate != null">
+        rd_rate = #{rd_rate,jdbcType=DOUBLE},
+      </if>
     </set>
     where rd_id = #{id,jdbcType=INTEGER}
   </update>

+ 11 - 1
applications/money/money-server/src/main/resources/mapper/SubledgerMapper.xml

@@ -19,12 +19,13 @@
     <result column="sl_orderamount" property="sl_orderamount" jdbcType="DOUBLE" />
     <result column="sl_discount" property="sl_discount" jdbcType="DOUBLE" />
     <result column="sl_ym" property="sl_ym" jdbcType="INTEGER" />
+    <result column="sl_currency" property="sl_currency" jdbcType="VARCHAR" />
   </resultMap>
 
   <sql id="Base_Column_List" >
     sl_id, sl_code, sl_kind, sl_custid, sl_vendid, sl_date, sl_amount, sl_preamount, 
     sl_yamount, sl_namount, sl_remark, companyId, updaterId, updateTime, sl_orderamount, 
-    sl_discount, sl_ym
+    sl_discount, sl_ym, sl_currency
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -102,6 +103,9 @@
       <if test="sl_ym != null" >
         sl_ym,
       </if>
+      <if test="sl_currency != null" >
+        sl_currency,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sl_code != null" >
@@ -152,6 +156,9 @@
       <if test="sl_ym != null" >
         #{sl_ym,jdbcType=INTEGER},
       </if>
+      <if test="sl_currency != null" >
+        #{sl_currency,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.money.po.Subledger" >
@@ -205,6 +212,9 @@
       <if test="sl_ym != null" >
         sl_ym = #{sl_ym,jdbcType=INTEGER},
       </if>
+      <if test="sl_currency != null" >
+        sl_currency = #{sl_currency,jdbcType=VARCHAR},
+      </if>
     </set>
     where sl_id = #{id,jdbcType=INTEGER}
   </update>

+ 22 - 1
applications/money/money-server/src/main/resources/mapper/VerificationMapper.xml

@@ -35,6 +35,9 @@
     <result column="vc_auditdate" property="vc_auditdate" jdbcType="TIMESTAMP" />
     <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
     <result column="createTime" property="createTime" jdbcType="TIMESTAMP" />
+
+    <result column="vc_rate" property="vc_rate" jdbcType="DOUBLE" />
+    <result column="vc_currency" property="vc_currency" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -98,7 +101,7 @@
     vc_id, vc_code, vc_kind, vc_date, vc_vendid, vc_vendcode, vc_vendname, vc_custid, 
     vc_custcode, vc_custname, vc_turnvendid, vc_turnvendcode, vc_turnvendname, vc_turncustid, 
     vc_turncustcode, vc_turncustname, vc_amount1, vc_amount2, vc_status, vc_statuscode, vc_remark, companyId, updaterId, updateTime,
-    vc_text1, vc_text2, vc_text3, vc_text4, vc_text5, vc_auditman, vc_auditdate, createTime, creatorName
+    vc_text1, vc_text2, vc_text3, vc_text4, vc_text5, vc_auditman, vc_auditdate, createTime, creatorName,vc_currency,vc_rate
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.usoftchina.saas.money.po.VerificationExample" >
     select
@@ -245,6 +248,12 @@
       <if test="createTime != null" >
         createTime,
       </if>
+      <if test="vc_currency != null" >
+        vc_currency,
+      </if>
+      <if test="vc_rate != null" >
+        vc_rate,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="vc_code != null" >
@@ -337,6 +346,12 @@
       <if test="createTime != null" >
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="vc_rate != null" >
+        #{vc_rate,jdbcType=DOUBLE},
+      </if>
+      <if test="vc_currency != null" >
+        #{vc_currency,jdbcType=VARCHAR},
+      </if>
     </trim>
     <selectKey resultType="Long" keyProperty="id" order="AFTER">
       SELECT LAST_INSERT_ID()
@@ -564,6 +579,12 @@
       </if>
       <if test="vc_text5 != null" >
         vc_text5 = #{vc_text5,jdbcType=VARCHAR},
+      </if>
+      <if test="vc_rate != null" >
+        vc_rate = #{vc_rate,jdbcType=DOUBLE},
+      </if>
+      <if test="vc_currency != null" >
+        vc_currency = #{vc_currency,jdbcType=VARCHAR},
       </if>
         vc_auditman = #{vc_auditman,jdbcType=VARCHAR},
         vc_auditdate = #{vc_auditdate,jdbcType=TIMESTAMP}