Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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;

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));

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));

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>

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;
     }

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;
     }

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;
     }

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;

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;

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;

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;
     }

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;

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 {

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);

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);

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();
 

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>

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}

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>

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}

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>

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>

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}

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/mapper/AccountMapper.java

@@ -3,16 +3,17 @@ package com.usoftchina.saas.operation.mapper;
 import com.usoftchina.saas.operation.dto.AccountDTO;
 import com.usoftchina.saas.operation.dto.CompanyAnalyzeDTO;
 import com.usoftchina.saas.operation.dto.LoginDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface AccountMapper {
 
-    List<AccountDTO> findAccountByCondition(String con);
+    List<AccountDTO> findAccountByCondition(@Param("con") String con);
 
-    List<LoginDTO> getLogin(String con);
+    List<LoginDTO> getLogin(@Param("con") String con);
 
-    List<CompanyAnalyzeDTO> getConpanyAnalyze(String con);
+    List<CompanyAnalyzeDTO> getConpanyAnalyze(@Param("con") String con);
 
     void analyzeCompany();
 }

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/mapper/CompanyMapper.java

@@ -3,6 +3,7 @@ package com.usoftchina.saas.operation.mapper;
 import com.usoftchina.saas.operation.dto.CompanyAnalyzeDTO;
 import com.usoftchina.saas.operation.dto.CompanyAnalyzedetailDTO;
 import com.usoftchina.saas.operation.dto.CompanyDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -13,7 +14,7 @@ import java.util.Map;
  **/
 public interface CompanyMapper {
 
-    List<CompanyDTO> findCompanyByCondition(String con);
+    List<CompanyDTO> findCompanyByCondition(@Param("con") String con);
 
     CompanyAnalyzeDTO selectCompanyAnalyze(Long id);
 

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/mapper/CustomerfeedbackMapper.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.operation.mapper;
 
 import com.usoftchina.saas.operation.po.CustomerFeedBack;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,5 +18,5 @@ public interface CustomerfeedbackMapper {
 
     int updateByPrimaryKey(CustomerFeedBack record);
 
-    List<CustomerFeedBack> selectByCondition(String con);
+    List<CustomerFeedBack> selectByCondition(@Param("con") String con);
 }

applications/operation/operation-server/src/main/resources/config/application-dev.yml

@@ -10,4 +10,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
+logging:
+  level:
+    com.usoftchina.saas.operation.mapper : debug

applications/operation/operation-server/src/main/resources/mapper/AccoutMapper.xml

@@ -38,15 +38,29 @@
     </resultMap>
 
     <select id="findAccountByCondition" parameterType="string" resultMap="BaseResultMap">
-        select * from saas_account.ac_account  where #{con}
+        select * from saas_account.ac_account  <where>
+        <if test="con != null">
+            ${con}
+        </if>
+    </where>
     </select>
     <select id="getLogin" parameterType="string" resultMap="loginMap">
         SELECT * FROM (select account_id  ,count(account_id) login_num,max(ac_account.realname) username,max(login_time) lastesttime, max(ac_account.mobile) mobile from au_authorize_log left join saas_account.ac_account on account_id= ac_account.id  where login_time >  date_sub(now(),interval 3 MONTH) GROUP BY account_id order by lastesttime desc
-        )login_info where #{con}
+        )login_info
+        <where>
+            <if test="con != null">
+                ${con}
+            </if>
+        </where>
     </select>
 
     <select id="getConpanyAnalyze" parameterType="string" resultMap="companymap">
-        select  *  from company_analyze  where #{con} order by ca_createtime desc
+        select  *  from company_analyze  <where>
+        <if test="con != null">
+            ${con}
+        </if>
+    </where>
+        order by ca_createtime desc
     </select>
 
     <select id="analyzeCompany"  statementType="CALLABLE">

applications/operation/operation-server/src/main/resources/mapper/CompanyMapper.xml

@@ -15,7 +15,12 @@
 
     <select id="findCompanyByCondition" parameterType="string" resultMap="baseMap">
          select name,business_code,address,tel,fax,realname,mobile,ac_company.create_time,ac_company.uu from saas_account.ac_company
-        left join saas_account.ac_account on ac_account.id = ac_company.creator_id where #{con}
+        left join saas_account.ac_account on ac_account.id = ac_company.creator_id
+        <where>
+            <if test="con != null">
+                ${con}
+            </if>
+        </where>
     </select>
 
 

applications/operation/operation-server/src/main/resources/mapper/CustomerfeedbackMapper.xml

@@ -165,6 +165,11 @@
     where cf_id = #{cf_id,jdbcType=INTEGER}
   </update>
   <select id="selectByCondition" parameterType="string" resultMap="BaseResultMap">
-      select * from saas_manage.customerfeedback where #{con} order by cf_creatime desc
+      select * from saas_manage.customerfeedback
+    <where>
+    <if test="con != null">
+      ${con}
+    </if>
+  </where> order by cf_creatime desc
   </select>
 </mapper>

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/DeviceDTO.java

@@ -0,0 +1,146 @@
+package com.usoftchina.saas.purchase.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Created by hey
+ * 2018-10-17 13:44.
+ */
+@Data
+public class DeviceDTO implements Serializable {
+
+    /**
+     * 品牌
+     */
+    private String pr_brand;
+    /**
+     * 名称
+     */
+    private String pr_detail;
+    /**
+     * 型号
+     */
+    private String pr_orispeccode;
+    /**
+     * 规格
+     */
+    private String pr_spec;
+    /**
+     * 包装
+     */
+    private String pr_pack;
+    /**
+     * 供应商
+     */
+    private String pr_vendor;
+    /**
+     * 库存
+     */
+    private Double pr_qty;
+    /**
+     * 梯度
+     */
+    private Double pr_level;
+    /**
+     * 大陆交货单价
+     */
+    private Double pr_cnprice;
+    /**
+     * 香港交货单价
+     */
+    private Double pr_hkprice;
+    /**
+     * 交期
+     */
+    private Double pr_leadtime;
+
+    public String getPr_brand() {
+        return pr_brand;
+    }
+
+    public void setPr_brand(String pr_brand) {
+        this.pr_brand = pr_brand;
+    }
+
+    public String getPr_detail() {
+        return pr_detail;
+    }
+
+    public void setPr_detail(String pr_detail) {
+        this.pr_detail = pr_detail;
+    }
+
+    public String getPr_orispeccode() {
+        return pr_orispeccode;
+    }
+
+    public void setPr_orispeccode(String pr_orispeccode) {
+        this.pr_orispeccode = pr_orispeccode;
+    }
+
+    public String getPr_spec() {
+        return pr_spec;
+    }
+
+    public void setPr_spec(String pr_spec) {
+        this.pr_spec = pr_spec;
+    }
+
+    public String getPr_vendor() {
+        return pr_vendor;
+    }
+
+    public void setPr_vendor(String pr_vendor) {
+        this.pr_vendor = pr_vendor;
+    }
+
+    public Double getPr_qty() {
+        return pr_qty;
+    }
+
+    public void setPr_qty(Double pr_qty) {
+        this.pr_qty = pr_qty;
+    }
+
+    public Double getPr_level() {
+        return pr_level;
+    }
+
+    public void setPr_level(Double pr_level) {
+        this.pr_level = pr_level;
+    }
+
+    public Double getPr_cnprice() {
+        return pr_cnprice;
+    }
+
+    public void setPr_cnprice(Double pr_cnprice) {
+        this.pr_cnprice = pr_cnprice;
+    }
+
+    public Double getPr_hkprice() {
+        return pr_hkprice;
+    }
+
+    public void setPr_hkprice(Double pr_hkprice) {
+        this.pr_hkprice = pr_hkprice;
+    }
+
+    public Double getPr_leadtime() {
+        return pr_leadtime;
+    }
+
+    public void setPr_leadtime(Double pr_leadtime) {
+        this.pr_leadtime = pr_leadtime;
+    }
+
+    public String getPr_pack() {
+        return pr_pack;
+    }
+
+    public void setPr_pack(String pr_pack) {
+        this.pr_pack = pr_pack;
+    }
+}

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/DeviceReqDTO.java

@@ -0,0 +1,85 @@
+package com.usoftchina.saas.purchase.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Created by hey
+ * 2018-10-17 13:44.
+ */
+@Data
+public class DeviceReqDTO implements Serializable {
+    /**
+     * 页码
+     */
+    private int page;
+    /**
+     * 每页条数
+     */
+    private int count;
+    /**
+     * 搜索类型
+     */
+    private String type = "component";
+    /**
+     * 搜索关键字
+     */
+    private String keyword;
+    /**
+     * 过滤
+     */
+    private String filter;
+    /**
+     * 排序
+     */
+    private String sorting;
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public String getFilter() {
+        return filter;
+    }
+
+    public void setFilter(String filter) {
+        this.filter = filter;
+    }
+
+    public String getSorting() {
+        return sorting;
+    }
+
+    public void setSorting(String sorting) {
+        this.sorting = sorting;
+    }
+}

applications/purchase/purchase-server/pom.xml

@@ -29,6 +29,11 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>server-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>mall-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
 
         <!--test-->
         <dependency>

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/PurchaseApplication.java

@@ -17,7 +17,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableEurekaClient
 @EnableTransactionManagement
-@EnableFeignClients("com.usoftchina.saas")
+@EnableFeignClients({"com.usoftchina.saas",
+                     "com.usoftchina.inquiry"})
 @EnableAuthClient
 @MapperScan("com.usoftchina.saas.purchase.mapper")
 @EnableDynamicDataSource

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -1,11 +1,15 @@
 package com.usoftchina.saas.purchase.controller;
 
+
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.inquiry.po.inquiry.IPage;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.purchase.dto.DeviceDTO;
+import com.usoftchina.saas.purchase.dto.DeviceReqDTO;
 import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
 import com.usoftchina.saas.purchase.po.PurchaseList;
 import com.usoftchina.saas.purchase.service.PurchaseService;
@@ -178,4 +182,15 @@ public class PurchaseController {
     public String getPurchaseCode(@RequestBody DocBaseDTO baseDTO) {
         return purchaseService.getPurchaseCode(baseDTO);
     }
+
+    /**
+     * 获取器件列表
+     *
+     * @return
+     */
+    @GetMapping("/device/list")
+    public Result getDevice(DeviceReqDTO deviceReqDTO){
+        IPage<DeviceDTO> deviceDTOIPage = purchaseService.getDevice(deviceReqDTO);
+        return Result.success(deviceDTOIPage);
+    }
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java

@@ -1,12 +1,15 @@
 package com.usoftchina.saas.purchase.service;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.inquiry.po.inquiry.IPage;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.purchase.dto.DeviceDTO;
+import com.usoftchina.saas.purchase.dto.DeviceReqDTO;
 import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
 import com.usoftchina.saas.purchase.mapper.PurchaseMapper;
 import com.usoftchina.saas.purchase.po.Purchase;
@@ -137,4 +140,11 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
     Result turnProdin(Long id);
 
     String getPurchaseCode(DocBaseDTO baseDTO);
+
+    /**
+     * 器件查询
+     * @param deviceReqDTO
+     * @return
+     */
+    IPage<DeviceDTO> getDevice(DeviceReqDTO deviceReqDTO);
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -2,6 +2,13 @@ package com.usoftchina.saas.purchase.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.inquiry.api.SearchApi;
+import com.usoftchina.inquiry.po.inquiry.IPage;
+import com.usoftchina.inquiry.po.inquiry.InquiryEnRemind;
+import com.usoftchina.inquiry.po.inquiry.InquiryRemind;
+import com.usoftchina.inquiry.po.search.FuturesEntity;
+import com.usoftchina.inquiry.po.search.ProductEntity;
+import com.usoftchina.inquiry.po.search.SearchComponentResp;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.CommonService;
@@ -18,14 +25,15 @@ import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.exception.ExceptionCode;
 import com.usoftchina.saas.page.PageRequest;
-import com.usoftchina.saas.purchase.dto.PurchaseDTO;
-import com.usoftchina.saas.purchase.dto.PurchaseDetailDTO;
-import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
+import com.usoftchina.saas.purchase.dto.*;
 import com.usoftchina.saas.purchase.mapper.*;
 import com.usoftchina.saas.purchase.po.*;
 import com.usoftchina.saas.purchase.service.ProdInOutService;
 import com.usoftchina.saas.purchase.service.PurchaseService;
 import com.usoftchina.saas.utils.BeanMapper;
+import com.usoftchina.saas.utils.CollectionUtils;
+import com.usoftchina.saas.utils.JsonUtils;
+import com.usoftchina.saas.utils.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,6 +69,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     private ProdInOutService prodInOutService;
     @Autowired
     private CommonService commonService;
+    @Autowired
+    private SearchApi searchApi;
 
 
     @Override
@@ -663,4 +673,51 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchasedetailMapper.calcPurchase(pu_id);
     }
 
+    /**
+     * 获取器件列表
+     * @param deviceReqDTO
+     * @return
+     */
+    @Override
+    public IPage<DeviceDTO> getDevice(DeviceReqDTO deviceReqDTO) {
+        SearchComponentResp searchComponentResp = searchApi.getInquiry(deviceReqDTO.getKeyword(),deviceReqDTO.getCount(),deviceReqDTO.getSorting(),
+                deviceReqDTO.getType(),deviceReqDTO.getPage(),deviceReqDTO.getFilter());
+        List<ProductEntity> productEntities = searchComponentResp.getFutures().getContent();
+        if (CollectionUtils.isEmpty(productEntities)){
+            return null;
+        }
+        //IPage<FuturesEntity> futuresEntityIPage = searchComponentResps.get(0).getFutures();
+        List<DeviceDTO> deviceDTOList = convertToDeviceDTO(productEntities);
+        int page = Integer.parseInt(String.valueOf(searchComponentResp.getFutures().getPage()));
+        int size = Integer.parseInt(String.valueOf(searchComponentResp.getFutures().getSize()));
+        int total = Integer.parseInt(String.valueOf(searchComponentResp.getFutures().getTotal()));
+        //转换成分页对象
+        IPage<DeviceDTO> deviceDTOIPage = new IPage<DeviceDTO>(page, size,
+                0,deviceDTOList, false, false,
+                total);
+        return deviceDTOIPage;
+    }
+
+    /**
+     * 将平台返回的结果集转成SAAS的传输对象
+     * @param data
+     * @return
+     */
+    private List<DeviceDTO> convertToDeviceDTO(List<ProductEntity> data) {
+        List<DeviceDTO> deviceDTOS = new ArrayList<DeviceDTO>();
+        DeviceDTO deviceDTO = null;
+        for (ProductEntity item : data){
+            deviceDTO = new DeviceDTO();
+            deviceDTO.setPr_brand(item.getPbranden());
+            deviceDTO.setPr_detail(item.getKind());
+            deviceDTO.setPr_orispeccode(item.getPcmpcode());
+            deviceDTO.setPr_spec(item.getSpec());
+            deviceDTO.setPr_pack(item.getPackaging());
+            deviceDTO.setPr_vendor(item.getEnName());
+            deviceDTO.setPr_qty(item.getErpReserve());
+            deviceDTOS.add(deviceDTO);
+        }
+        return deviceDTOS;
+    }
+
 }

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -88,4 +88,8 @@ hystrix:
                 enabled: true
               isolation:
                     thread:
-                        timeoutInMilliseconds: 4000
+                        timeoutInMilliseconds: 4000
+inquiry:
+  base-url: https://test-inquiry.uuzcc.cn
+Component:
+  base-url: https://test-mall.uuzcc.cn

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/SearchApi.java

@@ -1,5 +1,6 @@
 package com.usoftchina.inquiry.api;
 
+import com.usoftchina.inquiry.po.inquiry.IPage;
 import com.usoftchina.inquiry.po.search.SearchComponentResp;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -20,5 +21,5 @@ public interface SearchApi {
      */
     @GetMapping("/201819")
     SearchComponentResp getInquiry(@RequestParam("keyword") String keyword, @RequestParam("count") int count, @RequestParam("sorting") String sorting,
-                                   @RequestParam("type") String type, @RequestParam("page") int page, @RequestParam("filter") String filter);
+                                          @RequestParam("type") String type, @RequestParam("page") int page, @RequestParam("filter") String filter);
 }

applications/transfers/transfers-server/pom.xml

@@ -57,6 +57,10 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/TransfersApplication.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.transfers;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@@ -8,10 +9,9 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableEurekaClient
 @EnableFeignClients("com.usoftchina.saas")
+@MapperScan("com.usoftchina.saas.transfers.mapper")
 public class TransfersApplication {
     public static void main(String[] args) {
         SpringApplication.run(TransfersApplication.class, args);
     }
-
-
 }

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/controller/TransfersController.java

@@ -5,6 +5,7 @@ import com.usoftchina.saas.transfers.po.MessageInfo;
 import com.usoftchina.saas.transfers.service.SendService;
 import com.usoftchina.saas.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,12 +15,13 @@ import org.springframework.web.bind.annotation.RestController;
  * @create: 2019-01-06 22:15
  **/
 @RestController
+@RequestMapping("/send")
 public class TransfersController {
 
     @Autowired
     private SendService sendService;
 
-    @RequestMapping("/sendMsg")
+    @PostMapping("/Message")
     public Result sendMsg(@RequestBody MessageInfo info) {
         if (StringUtils.isEmpty(info)) {
             return Result.error("信息为空");

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/service/ReceiveService.java

@@ -58,7 +58,7 @@ public class ReceiveService {
        logger.info("---------收到消息，消息id={},开始消费---------", info.getMsgId());
         Executable task = null;
        try {
-           switch(BillCodeSeq.valueOf(info.getBizType())){
+           switch(BillCodeSeq.valueOf(info.getBizType())) {
                case PURCHASE:
                    task = new SendPurchaseTask();
                    break;

applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/service/SendService.java

@@ -67,7 +67,7 @@ public class SendService {
                 logger.info("msgId={},已发送服务器", messageId);
             } else {
                 //失败则进行具体的后续操作:进入延迟队列
-                BrokerMessagelog message = brokerMessageLogMapper.getMessage(messageId);
+                BrokerMessagelog message = brokerMessageLogMapper.getLiveMessage(messageId);
                 String info = message.getMessage();
                 if (!StringUtils.isEmpty(info)) {
                     MessageInfo messageInfo = JsonUtils.fromJsonString(info, MessageInfo.class);
@@ -93,14 +93,14 @@ public class SendService {
         brokerMessageLogMapper.updateMessageLogandAddRetry(messagelog);
 
         //发送至延迟队列
-        rabbitTemplate.setConfirmCallback(delayConfirmCallback);
+        rabbitTemplate.setConfirmCallback(confirmCallback);
         //消息唯一ID
         CorrelationData correlationData = new CorrelationData(info.getMsgId());
         rabbitTemplate.convertAndSend(rabbitConfig.getExchange(), rabbitConfig.getRoutingkey(), info,
                 new ExpirationMessagePostProcessor(rabbitConfig.getExpired()), correlationData);
     }
 
-    //回调函数: confirm确认
+    /*//回调函数: confirm确认
     final RabbitTemplate.ConfirmCallback delayConfirmCallback = new RabbitTemplate.ConfirmCallback() {
         @Override
         public void confirm(CorrelationData correlationData, boolean confirm, String cause) {
@@ -112,6 +112,6 @@ public class SendService {
                 logger.info("msgId={},发送延迟队列失败:{}", messageId, cause);
             }
         }
-    };
+    };*/
 
 }

applications/transfers/transfers-server/src/main/resources/application.yml

@@ -71,6 +71,9 @@ info:
   version: '@project.version@'
   spring-boot-version: '@spring.boot.version@'
   spring-cloud-version: '@spring.cloud.version@'
+mybatis:
+  type-aliases-package: com.usoftchina.saas.transfers.po
+  mapper-locations: classpath:mapper/*.xml
 auth:
   public-key: auth/pub.key
 ribbon:

applications/transfers/transfers-server/src/main/resources/config/application-dev.yml

@@ -11,3 +11,6 @@ eureka:
     registryFetchIntervalSeconds: 5
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
+logging:
+  level:
+    com.usoftchina.saas.transfers.mapper : debug

applications/transfers/transfers-server/src/main/resources/mapper/BrokermessagelogMapper.xml

@@ -50,6 +50,9 @@
       <if test="reason != null" >
         reason,
       </if>
+      <if test="retry != null" >
+        retry,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="msgId != null" >
@@ -67,6 +70,9 @@
       <if test="reason != null" >
         #{reason,jdbcType=VARCHAR},
       </if>
+      <if test="retry != null" >
+        #{retry},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.transfers.po.BrokerMessagelog" >
@@ -109,7 +115,7 @@
   </select>
 
   <select id="getLiveMessage" parameterType="string" resultMap="BaseResultMap">
-    select * from BrokerMessagelog where msgId = #{msgId} and retry &lt;= 3
+    select * from BrokerMessagelog where msgId = #{msgId} and retry &lt; 3
   </select>
 
   <select id="getDeadMessage" parameterType="string" resultMap="BaseResultMap">

applications/transfers/transfers-server/src/test/java/com/usoftchina/saas/transfers/service/RabbitSendServiceTest.java

@@ -25,7 +25,7 @@ public class RabbitSendServiceTest {
     public void TestA_Send() {
         MessageInfo msg = new MessageInfo();
         msg.setBizId("测试");
-        msg.setMsgId("测试0001");
+        msg.setMsgId("测试00001");
         sendService.sendMessage(msg);
     }
 
@@ -34,7 +34,7 @@ public class RabbitSendServiceTest {
         MessageInfo msg = new MessageInfo();
         msg.setBizId("测试");
         msg.setMsgId("测试延迟0001");
-        sendService.sendDelayMessage(msg);
+        sendService.sendDelayMessage(msg, "测试");
     }