Merge remote-tracking branch 'origin/dev'

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/InitStatusDTO.java

@@ -10,8 +10,17 @@ public class InitStatusDTO implements Serializable {
     private boolean product;
     private boolean customer;
     private boolean vendor;
+    private boolean currency;
     private boolean begin;
 
+    public boolean isCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(boolean currency) {
+        this.currency = currency;
+    }
+
     public boolean isBegin() {
         return begin;
     }

applications/commons/commons-server/pom.xml

@@ -31,6 +31,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>sms-api</artifactId>
         </dependency>
+        <dependency>
+          <groupId>com.usoftchina.saas</groupId>
+          <artifactId>document-api</artifactId>
+        </dependency>
         <!-- db -->
         <dependency>
             <groupId>mysql</groupId>

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/CommonMapper.java

@@ -12,5 +12,7 @@ public interface CommonMapper {
 
     int getCountVendor(@Param("companyId") Long companyId);
 
+    int getCountCurrency(@Param("companyId") Long companyId);
+
     void commonAudit(String sql);
 }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/CommonServiceImpl.java

@@ -40,6 +40,10 @@ public class CommonServiceImpl implements CommonService {
         if (count > 0){
             result.setVendor(true);
         }
+        count = commonMapper.getCountCurrency(companyId);
+        if (count > 0){
+            result.setCurrency(true);
+        }
         if (result.isBaseSet() && result.isWarehouse() && result.isProduct() && result.isCustomer() && result.isVendor()){
             result.setBegin(true);
         }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/ConfigsServiceImpl.java

@@ -9,6 +9,8 @@ import com.usoftchina.saas.commons.po.Configs;
 import com.usoftchina.saas.commons.service.ConfigsService;
 import com.usoftchina.saas.commons.service.MessageLogService;
 import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.document.api.CurrencyApi;
+import com.usoftchina.saas.document.dto.CurrencyDTO;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
@@ -29,6 +31,8 @@ public class ConfigsServiceImpl implements ConfigsService{
     private ConfigsMapper configsMapper;
     @Autowired
     private MessageLogService messageLogService;
+    @Autowired
+    private CurrencyApi currencyApi;
 
 
     @Override
@@ -95,6 +99,12 @@ public class ConfigsServiceImpl implements ConfigsService{
         }
         for (Configs con : data) {
             con.setCompanyId(BaseContextHolder.getCompanyId());
+            if ("defaultCurrency".equals(con.getCode())){
+                CurrencyDTO currencyDTO = new CurrencyDTO();
+                currencyDTO.setCr_name(con.getData());
+                currencyDTO.setCr_standard(1L);
+                currencyApi.setStandard(currencyDTO);
+            }
             configsMapper.updateByCodeSelective(con);
         }
         DocBaseDTO baseDTO = new DocBaseDTO(null, "", "Configs");

applications/commons/commons-server/src/main/resources/mapper/CommonMapper.xml

@@ -15,6 +15,10 @@
         SELECT COUNT(*) FROM VENDOR WHERE COMPANYID=#{companyId} AND VE_STATUSCODE = 'ENABLE'
     </select>
 
+    <select id="getCountCurrency" resultType="int">
+        select count(*) from configs where companyId = #{companyId} and code = 'defaultCurrency' and data is not null;
+    </select>
+
     <update id="commonAudit" parameterType="string">
       ${value}
     </update>

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/CurrencyApi.java

@@ -0,0 +1,16 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.auth.client.interceptor.ServiceFeignInterceptor;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.document.dto.CurrencyDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(name = "document-server", configuration = ServiceFeignInterceptor.class)
+public interface CurrencyApi {
+
+    @PostMapping("/currency/setStandard")
+    Result setStandard(@RequestBody CurrencyDTO currencyDTO);
+
+}

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/controller/CurrencyController.java

@@ -39,4 +39,9 @@ public class CurrencyController {
         return Result.success();
     }
 
+    @PostMapping("/setStandard")
+    public Result setStandard(@RequestBody CurrencyDTO currencyDTO){
+        currencyService.setStandard(currencyDTO);
+        return Result.success();
+    }
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/CurrencyMapper.java

@@ -10,4 +10,9 @@ public interface CurrencyMapper extends CommonBaseMapper<Currency> {
 
     List<Currency> getAll(@Param("condition") String condition, @Param("companyId") Long companyId);
 
+    void clearStandard(@Param("companyId") Long companyId);
+
+    void setStandard(@Param("name") String name, @Param("companyId") Long companyId, @Param("standard") Long standard);
+
+    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/CurrencyService.java

@@ -14,4 +14,5 @@ public interface CurrencyService  extends CommonBaseService<CurrencyMapper, Curr
 
     PageInfo<Currency> getAll(PageRequest pageRequest, ListReqDTO listReqDTO);
 
+    void setStandard(CurrencyDTO currencyDTO);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CurrencyServiceImpl.java

@@ -3,14 +3,19 @@ package com.usoftchina.saas.document.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.api.MessageLogService;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.dto.CurrencyDTO;
 import com.usoftchina.saas.document.entities.Currency;
 import com.usoftchina.saas.document.mapper.CurrencyMapper;
 import com.usoftchina.saas.document.service.CurrencyService;
+import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.BeanMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,14 +27,27 @@ import java.util.List;
 @Service
 public class CurrencyServiceImpl extends CommonBaseServiceImpl<CurrencyMapper, Currency> implements CurrencyService {
 
+    @Autowired
+    private MessageLogService messageLogService;
 
     @Override
     public void save(CurrencyDTO currencyDTO) {
+        Currency currency = BeanMapper.map(currencyDTO, Currency.class);
+        Long companyId = BaseContextHolder.getCompanyId();
+        DocBaseDTO docBaseDTO = null;
         if (currencyDTO.getId() == 0){
-
+            currency.setCompanyId(companyId);
+            int count = getMapper().selectCountByName(currency.getCr_name(), companyId);
+            if (count > 0){
+                throw new BizException(BizExceptionCode.REPEAT_NAME);
+            }
+            getMapper().insertSelective(currency);
+            docBaseDTO = generateMsgObj(currency.getId());
+            messageLogService.save(docBaseDTO);
         }else{
-            Currency currency = BeanMapper.map(currencyDTO, Currency.class);
             getMapper().updateByPrimaryKeySelective(currency);
+            docBaseDTO = generateMsgObj(currency.getId());
+            messageLogService.update(docBaseDTO);
         }
     }
 
@@ -41,4 +59,17 @@ public class CurrencyServiceImpl extends CommonBaseServiceImpl<CurrencyMapper, C
         PageInfo<Currency> pageInfo = new PageInfo<Currency>(currencyList);
         return pageInfo;
     }
+
+    @Override
+    public void setStandard(CurrencyDTO currencyDTO) {
+        Long companyId = BaseContextHolder.getCompanyId();
+        getMapper().clearStandard(companyId);
+        getMapper().setStandard(currencyDTO.getCr_name(), companyId, currencyDTO.getCr_standard());
+
+    }
+
+    private DocBaseDTO generateMsgObj(Long id){
+        return new DocBaseDTO(id, "", "Currency");
+    }
+
 }

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/CurrencyMapper.xml

@@ -28,6 +28,9 @@
         where cr_id = #{id}
     </delete>
     <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Currency" >
+        <selectKey resultType="java.lang.Long" keyProperty="id">
+          SELECT LAST_INSERT_ID() AS ID
+        </selectKey>
         insert into Currencys
         <trim prefix="(" suffix=")" suffixOverrides="," >
             <if test="cr_name != null" >
@@ -127,4 +130,13 @@
       </where>
       ORDER BY CR_ID DESC
     </select>
+    <update id="clearStandard">
+      UPDATE CURRENCYS SET CR_STANDARD = 0 WHERE COMPANYID = #{companyId}
+    </update>
+    <update id="setStandard">
+      UPDATE CURRENCYS SET CR_STANDARD = #{standard} WHERE COMPANYID = #{companyId} AND CR_NAME = #{name}
+    </update>
+    <select id="selectCountByName" resultType="int">
+      SELECT COUNT(*) FROM CURRENCYS WHERE CR_NAME = #{name} AND COMPANYID = #{companyId}
+    </select>
 </mapper>

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/controller/DataController.java

@@ -3,14 +3,13 @@ package com.usoftchina.saas.operation.controller;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
-import com.usoftchina.saas.operation.dto.AccountDTO;
-import com.usoftchina.saas.operation.dto.CompanyDTO;
-import com.usoftchina.saas.operation.dto.LoginDTO;
+import com.usoftchina.saas.operation.dto.*;
 import com.usoftchina.saas.operation.service.DataService;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -42,5 +41,14 @@ public class DataController {
         return Result.success(dataService.getLogin(page, req));
     }
 
+    @GetMapping("/getConpanyAnalyze")
+    public Result<PageInfo<CompanyAnalyzeDTO>> getConpanyAnalyze(@PageDefault(size = 10) PageRequest page, ListReqDTO req) {
+        return Result.success(dataService.getConpanyAnalyze(page, req));
+    }
+
+    @GetMapping("/companyAnalyzeRead/{id}")
+    public Result<CompanyAnalyzeFormDTO> companyAnalyzeRead(@PathVariable("id") Long id) {
+        return Result.success(dataService.companyAnalyzeRead(id));
+    }
 
 }

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/dto/CompanyAnalyzeDTO.java

@@ -0,0 +1,108 @@
+package com.usoftchina.saas.operation.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CompanyAnalyzeDTO implements Serializable{
+    private Long ca_id;
+
+    private Long ca_companyid;
+
+    private String ca_company;
+
+    private String ca_address;
+
+    private String ca_admin;
+
+    public Long getCa_id() {
+        return ca_id;
+    }
+
+    public void setCa_id(Long ca_id) {
+        this.ca_id = ca_id;
+    }
+
+    public Long getCa_companyid() {
+        return ca_companyid;
+    }
+
+    public void setCa_companyid(Long ca_companyid) {
+        this.ca_companyid = ca_companyid;
+    }
+
+    public Long getCa_creatorid() {
+        return ca_creatorid;
+    }
+
+    public void setCa_creatorid(Long ca_creatorid) {
+        this.ca_creatorid = ca_creatorid;
+    }
+
+    private Long ca_creatorid;
+
+    private Date ca_createtime;
+
+    private Date ca_newestlogtime;
+
+    private String ca_phase;
+
+    private String ca_status;
+
+
+
+    public String getCa_company() {
+        return ca_company;
+    }
+
+    public void setCa_company(String ca_company) {
+        this.ca_company = ca_company == null ? null : ca_company.trim();
+    }
+
+    public String getCa_address() {
+        return ca_address;
+    }
+
+    public void setCa_address(String ca_address) {
+        this.ca_address = ca_address == null ? null : ca_address.trim();
+    }
+
+    public String getCa_admin() {
+        return ca_admin;
+    }
+
+    public void setCa_admin(String ca_admin) {
+        this.ca_admin = ca_admin == null ? null : ca_admin.trim();
+    }
+
+    public Date getCa_createtime() {
+        return ca_createtime;
+    }
+
+    public void setCa_createtime(Date ca_createtime) {
+        this.ca_createtime = ca_createtime;
+    }
+
+    public Date getCa_newestlogtime() {
+        return ca_newestlogtime;
+    }
+
+    public void setCa_newestlogtime(Date ca_newestlogtime) {
+        this.ca_newestlogtime = ca_newestlogtime;
+    }
+
+    public String getCa_phase() {
+        return ca_phase;
+    }
+
+    public void setCa_phase(String ca_phase) {
+        this.ca_phase = ca_phase == null ? null : ca_phase.trim();
+    }
+
+    public String getCa_status() {
+        return ca_status;
+    }
+
+    public void setCa_status(String ca_status) {
+        this.ca_status = ca_status == null ? null : ca_status.trim();
+    }
+}

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/dto/CompanyAnalyzeFormDTO.java

@@ -0,0 +1,30 @@
+package com.usoftchina.saas.operation.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: guq
+ * @create: 2019-01-07 15:36
+ **/
+public class CompanyAnalyzeFormDTO implements Serializable{
+
+    private CompanyAnalyzeDTO main;
+    private List<CompanyAnalyzedetailDTO> items;
+
+    public CompanyAnalyzeDTO getMain() {
+        return main;
+    }
+
+    public void setMain(CompanyAnalyzeDTO main) {
+        this.main = main;
+    }
+
+    public List<CompanyAnalyzedetailDTO> getItems() {
+        return items;
+    }
+
+    public void setItems(List<CompanyAnalyzedetailDTO> items) {
+        this.items = items;
+    }
+}

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/dto/CompanyAnalyzedetailDTO.java

@@ -0,0 +1,115 @@
+package com.usoftchina.saas.operation.dto;
+
+import java.io.Serializable;
+
+public class CompanyAnalyzedetailDTO implements Serializable{
+    private Long cd_id;
+
+    private Long cd_companyid;
+
+    private Integer cd_accountnum;
+
+    private Integer cd_productnum;
+
+    private Integer cd_customernum;
+
+    private Integer cd_vendornum;
+
+    private Integer cd_salenum;
+
+    private Integer cd_purchasenum;
+
+    private Integer cd_prodionum;
+
+    private Integer cd_paynum;
+
+    private Integer cd_receivenum;
+
+    public Long getCd_id() {
+        return cd_id;
+    }
+
+    public void setCd_id(Long cd_id) {
+        this.cd_id = cd_id;
+    }
+
+    public Long getCd_companyid() {
+        return cd_companyid;
+    }
+
+    public void setCd_companyid(Long cd_companyid) {
+        this.cd_companyid = cd_companyid;
+    }
+
+    public Integer getCd_accountnum() {
+        return cd_accountnum;
+    }
+
+    public void setCd_accountnum(Integer cd_accountnum) {
+        this.cd_accountnum = cd_accountnum;
+    }
+
+    public Integer getCd_productnum() {
+        return cd_productnum;
+    }
+
+    public void setCd_productnum(Integer cd_productnum) {
+        this.cd_productnum = cd_productnum;
+    }
+
+    public Integer getCd_customernum() {
+        return cd_customernum;
+    }
+
+    public void setCd_customernum(Integer cd_customernum) {
+        this.cd_customernum = cd_customernum;
+    }
+
+    public Integer getCd_vendornum() {
+        return cd_vendornum;
+    }
+
+    public void setCd_vendornum(Integer cd_vendornum) {
+        this.cd_vendornum = cd_vendornum;
+    }
+
+    public Integer getCd_salenum() {
+        return cd_salenum;
+    }
+
+    public void setCd_salenum(Integer cd_salenum) {
+        this.cd_salenum = cd_salenum;
+    }
+
+    public Integer getCd_purchasenum() {
+        return cd_purchasenum;
+    }
+
+    public void setCd_purchasenum(Integer cd_purchasenum) {
+        this.cd_purchasenum = cd_purchasenum;
+    }
+
+    public Integer getCd_prodionum() {
+        return cd_prodionum;
+    }
+
+    public void setCd_prodionum(Integer cd_prodionum) {
+        this.cd_prodionum = cd_prodionum;
+    }
+
+    public Integer getCd_paynum() {
+        return cd_paynum;
+    }
+
+    public void setCd_paynum(Integer cd_paynum) {
+        this.cd_paynum = cd_paynum;
+    }
+
+    public Integer getCd_receivenum() {
+        return cd_receivenum;
+    }
+
+    public void setCd_receivenum(Integer cd_receivenum) {
+        this.cd_receivenum = cd_receivenum;
+    }
+}

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

@@ -1,13 +1,19 @@
 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(@Param("con") String con);
+
+    void analyzeCompany();
 }

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

@@ -1,8 +1,12 @@
 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;
 
 /**
  * @author: guq
@@ -10,5 +14,11 @@ import java.util.List;
  **/
 public interface CompanyMapper {
 
-    List<CompanyDTO> findCompanyByCondition(String con);
+    List<CompanyDTO> findCompanyByCondition(@Param("con") String con);
+
+    CompanyAnalyzeDTO selectCompanyAnalyze(Long id);
+
+    List<CompanyAnalyzedetailDTO> selectCompanyAnalyzeDetail(Long id);
+
+    void analyzeDetail(Map<String, Object> map);
 }

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/java/com/usoftchina/saas/operation/service/DataService.java

@@ -2,9 +2,7 @@ package com.usoftchina.saas.operation.service;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
-import com.usoftchina.saas.operation.dto.AccountDTO;
-import com.usoftchina.saas.operation.dto.CompanyDTO;
-import com.usoftchina.saas.operation.dto.LoginDTO;
+import com.usoftchina.saas.operation.dto.*;
 import com.usoftchina.saas.page.PageRequest; /**
  * @author: guq
  * @create: 2019-01-04 15:27
@@ -16,4 +14,8 @@ public interface DataService {
     PageInfo<AccountDTO> getAccount(PageRequest page, ListReqDTO req);
 
     PageInfo<LoginDTO> getLogin(PageRequest page, ListReqDTO req);
+
+    PageInfo<CompanyAnalyzeDTO> getConpanyAnalyze(PageRequest page, ListReqDTO req);
+
+    CompanyAnalyzeFormDTO companyAnalyzeRead(Long id);
 }

applications/operation/operation-server/src/main/java/com/usoftchina/saas/operation/service/impl/DataServiceImpl.java

@@ -3,17 +3,18 @@ package com.usoftchina.saas.operation.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
-import com.usoftchina.saas.operation.dto.AccountDTO;
-import com.usoftchina.saas.operation.dto.CompanyDTO;
-import com.usoftchina.saas.operation.dto.LoginDTO;
+import com.usoftchina.saas.operation.dto.*;
 import com.usoftchina.saas.operation.mapper.AccountMapper;
 import com.usoftchina.saas.operation.mapper.CompanyMapper;
 import com.usoftchina.saas.operation.service.DataService;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.utils.BeanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author: guq
@@ -68,4 +69,41 @@ public class DataServiceImpl implements DataService{
         PageInfo<LoginDTO> pageInfo = new PageInfo<LoginDTO>(info);
         return pageInfo;
     }
+
+    @Override
+    public PageInfo<CompanyAnalyzeDTO> getConpanyAnalyze(PageRequest page, ListReqDTO req) {
+        //调用过程产生数据
+        if (page.getNumber() <= 1) {
+            accountMapper.analyzeCompany();
+        }
+        PageHelper.startPage(page.getNumber(), page.getSize());
+        //查询数据
+        String con = req.getFinalCondition();
+        if (null == con) {
+            con = "1=1";
+        }
+        List<CompanyAnalyzeDTO> info = accountMapper.getConpanyAnalyze(con);
+        //取分页信息
+        PageInfo<CompanyAnalyzeDTO> pageInfo = new PageInfo<CompanyAnalyzeDTO>(info);
+        return pageInfo;
+    }
+
+    @Override
+    public CompanyAnalyzeFormDTO companyAnalyzeRead(Long id) {
+        if (null == id || "0".equals(id)) {
+            return null;
+        }
+        //调用过程 生成明细数据
+        Map<String, Object> map = new HashMap<>();
+        map.put("companyId", id);
+        companyMapper.analyzeDetail(map);
+        CompanyAnalyzeFormDTO formDTO = new CompanyAnalyzeFormDTO();
+        //查询主表信息
+        CompanyAnalyzeDTO main = companyMapper.selectCompanyAnalyze(id);
+        //查询从表
+        List<CompanyAnalyzedetailDTO> items = companyMapper.selectCompanyAnalyzeDetail(id);
+        formDTO.setMain(main);
+        formDTO.setItems(items);
+        return  formDTO;
+    }
 }

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

@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.79:3306/saas_auth?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_manage?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

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/config/application-docker-prod.yml

@@ -13,7 +13,7 @@ spring:
     username: saas
     password: select123***
   datasource:
-    url: jdbc:mysql://10.10.100.18:3306/saas_auth?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.10.100.18:3306/saas_manage?characterEncoding=utf-8&useSSL=false
     username: saas
     password: select111***
   redis:

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

@@ -24,11 +24,46 @@
         <result column="mobile" jdbcType="VARCHAR" property="mobile"/>
     </resultMap>
 
+    <resultMap id="companymap" type="com.usoftchina.saas.operation.dto.CompanyAnalyzeDTO">
+        <id column="ca_id" jdbcType="INTEGER" property="ca_id"/>
+        <result column="ca_companyid" jdbcType="INTEGER" property="ca_companyid"/>
+        <result column="ca_company" jdbcType="VARCHAR" property="ca_company"/>
+        <result column="ca_address" jdbcType="VARCHAR" property="ca_address"/>
+        <result column="ca_admin" jdbcType="VARCHAR" property="ca_admin"/>
+        <result column="ca_creatorid" jdbcType="INTEGER" property="ca_creatorid"/>
+        <result column="ca_createtime" property="ca_createtime" jdbcType="TIMESTAMP" />
+        <result column="ca_newestlogtime" property="ca_newestlogtime" jdbcType="TIMESTAMP" />
+        <result column="ca_phase" property="ca_phase" jdbcType="VARCHAR" />
+        <result column="ca_status" property="ca_status" jdbcType="VARCHAR" />
+    </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>
+        <if test="con != null">
+            ${con}
+        </if>
+    </where>
+        order by ca_createtime desc
+    </select>
+
+    <select id="analyzeCompany"  statementType="CALLABLE">
+        CALL sp_company_analyze()
     </select>
 </mapper>

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

@@ -15,6 +15,56 @@
 
     <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>
+
+
+
+    <resultMap id="companymap" type="com.usoftchina.saas.operation.dto.CompanyAnalyzeDTO">
+        <id column="ca_id" jdbcType="INTEGER" property="ca_id"/>
+        <result column="ca_companyid" jdbcType="INTEGER" property="ca_companyid"/>
+        <result column="ca_company" jdbcType="VARCHAR" property="ca_company"/>
+        <result column="ca_address" jdbcType="VARCHAR" property="ca_address"/>
+        <result column="ca_admin" jdbcType="VARCHAR" property="ca_admin"/>
+        <result column="ca_creatorid" jdbcType="INTEGER" property="ca_creatorid"/>
+        <result column="ca_createtime" property="ca_createtime" jdbcType="TIMESTAMP" />
+        <result column="ca_newestlogtime" property="ca_newestlogtime" jdbcType="TIMESTAMP" />
+        <result column="ca_phase" property="ca_phase" jdbcType="VARCHAR" />
+        <result column="ca_status" property="ca_status" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <resultMap id="detailMap" type="com.usoftchina.saas.operation.dto.CompanyAnalyzedetailDTO" >
+        <result column="cd_id" property="cd_id" jdbcType="INTEGER" />
+        <result column="cd_companyid" property="cd_companyid" jdbcType="INTEGER" />
+        <result column="cd_accountnum" property="cd_accountnum" jdbcType="INTEGER" />
+        <result column="cd_productnum" property="cd_productnum" jdbcType="INTEGER" />
+        <result column="cd_customernum" property="cd_customernum" jdbcType="INTEGER" />
+        <result column="cd_vendornum" property="cd_vendornum" jdbcType="INTEGER" />
+        <result column="cd_salenum" property="cd_salenum" jdbcType="INTEGER" />
+        <result column="cd_purchasenum" property="cd_purchasenum" jdbcType="INTEGER" />
+        <result column="cd_prodionum" property="cd_prodionum" jdbcType="INTEGER" />
+        <result column="cd_paynum" property="cd_paynum" jdbcType="INTEGER" />
+        <result column="cd_receivenum" property="cd_receivenum" jdbcType="INTEGER" />
+    </resultMap>
+
+    <select id="selectCompanyAnalyze" parameterType="long" resultMap="companymap">
+        select * from company_analyze where ca_companyid=#{id}
+    </select>
+
+    <select id="selectCompanyAnalyzeDetail" parameterType="long" resultMap="detailMap">
+        select * from company_analyzedetail where cd_companyid=#{id}
+    </select>
+
+    <select id="analyzeDetail" parameterMap="postParamMap" statementType="CALLABLE">
+        CALL sp_company_analyzedetail(?)
+    </select>
+
+    <parameterMap id="postParamMap" type="java.util.Map">
+        <parameter property="companyId" jdbcType="INTEGER" mode="IN" />
+    </parameterMap>
 </mapper>

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
@@ -159,6 +169,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchasedetailMapper.batchInsert(insertDetails);
             }
             baseDTO = getBaseDTOById(pu_id);
+            //明细需求日期为空时==主表交货日期
+            getMapper().updateDelivery(pu_id);
             //计算金额，未税单价，未税金额等
             calcPurchase(pu_id);
             //日志记录
@@ -456,6 +468,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         prodInOut.setPi_buyerid(purchase.getPu_buyerid());
         prodInOut.setPi_buyercode(purchase.getPu_buyercode());
         prodInOut.setPi_buyername(purchase.getPu_buyername());
+        //币别
+        prodInOut.setPi_currency(purchase.getPu_currency());
+        prodInOut.setPi_rate(purchase.getPu_rate());
         prodInOutMapper.insertSelective(prodInOut);
         //插入验收单从表
         long pi_id = prodInOut.getId();
@@ -663,4 +678,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/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/RemindReqDTO.java

@@ -0,0 +1,95 @@
+package com.usoftchina.saas.sale.dto;
+
+import java.io.Serializable;
+
+/**
+ * @Description 商机请求参数对象
+ * @Author chenwei
+ * @Date 2019/01/07
+ */
+public class RemindReqDTO implements Serializable {
+    /**
+     * 页码
+     */
+    private int pageNumber;
+    /**
+     * 每页条数
+     */
+    private int pageSize;
+    /**
+     * 可报价为1  不可报价为0
+     */
+    private int enableOffer;
+    /**
+     * 搜索关键字
+     */
+    private String keyword;
+    /**
+     * 筛选开始时间
+     */
+    private Long fromDate;
+    /**
+     * 筛选截止时间
+     */
+    private Long endDate;
+    /**
+     * 是否已报价, 1:已报价,0:未报价,null 全部
+     */
+    private Integer quoted;
+
+    public int getPageNumber() {
+        return pageNumber;
+    }
+
+    public void setPageNumber(int pageNumber) {
+        this.pageNumber = pageNumber;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public int getEnableOffer() {
+        return enableOffer;
+    }
+
+    public void setEnableOffer(int enableOffer) {
+        this.enableOffer = enableOffer;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public Long getFromDate() {
+        return fromDate;
+    }
+
+    public void setFromDate(Long fromDate) {
+        this.fromDate = fromDate;
+    }
+
+    public Long getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Long endDate) {
+        this.endDate = endDate;
+    }
+
+    public Integer getQuoted() {
+        return quoted;
+    }
+
+    public void setQuoted(Integer quoted) {
+        this.quoted = quoted;
+    }
+}

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/RemindRspDTO.java

@@ -0,0 +1,121 @@
+package com.usoftchina.saas.sale.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 公司商机返回 实体对象
+ * @Author chenwei
+ * @Date 2019/01/07
+ */
+public class RemindRspDTO implements Serializable {
+
+    /**
+     * 客户名称
+     */
+    private String custName;
+    /**
+     * 物料品牌
+     */
+    private String prodBrand;
+    /**
+     * 物料名称
+     */
+    private String prodName;
+    /**
+     * 物料型号
+     */
+    private String prodOrispeccode;
+    /**
+     * 物料规格
+     */
+    private String prodSpec;
+    /**
+     * 物料单位
+     */
+    private String prodUnit;
+    /**
+     * 采购数量
+     */
+    private Double needQty;
+    /**
+     * 发布日期
+     */
+    private Date startDate;
+    /**
+     * 截止日期
+     */
+    private Date endDate;
+
+    public String getCustName() {
+        return custName;
+    }
+
+    public void setCustName(String custName) {
+        this.custName = custName;
+    }
+
+    public String getProdBrand() {
+        return prodBrand;
+    }
+
+    public void setProdBrand(String prodBrand) {
+        this.prodBrand = prodBrand;
+    }
+
+    public String getProdName() {
+        return prodName;
+    }
+
+    public void setProdName(String prodName) {
+        this.prodName = prodName;
+    }
+
+    public String getProdOrispeccode() {
+        return prodOrispeccode;
+    }
+
+    public void setProdOrispeccode(String prodOrispeccode) {
+        this.prodOrispeccode = prodOrispeccode;
+    }
+
+    public String getProdSpec() {
+        return prodSpec;
+    }
+
+    public void setProdSpec(String prodSpec) {
+        this.prodSpec = prodSpec;
+    }
+
+    public String getProdUnit() {
+        return prodUnit;
+    }
+
+    public void setProdUnit(String prodUnit) {
+        this.prodUnit = prodUnit;
+    }
+
+    public Double getNeedQty() {
+        return needQty;
+    }
+
+    public void setNeedQty(Double needQty) {
+        this.needQty = needQty;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+}

applications/sale/sale-server/pom.xml

@@ -40,6 +40,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/sale/sale-server/src/main/java/com/usoftchina/saas/sale/SaleApplication.java

@@ -17,7 +17,8 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication
 @MapperScan("com.usoftchina.saas.sale.mapper")
 @EnableEurekaClient
-@EnableFeignClients("com.usoftchina.saas")
+@EnableFeignClients({"com.usoftchina.saas",
+                    "com.usoftchina.inquiry"})
 @EnableAuthClient
 @EnableDynamicDataSource
 @ComponentScan(basePackages = {"com.usoftchina.saas"})

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -1,11 +1,14 @@
 package com.usoftchina.saas.sale.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.sale.dto.RemindReqDTO;
+import com.usoftchina.saas.sale.dto.RemindRspDTO;
 import com.usoftchina.saas.sale.dto.SaleFormDTO;
 import com.usoftchina.saas.sale.po.SaleList;
 import com.usoftchina.saas.sale.service.SaleService;
@@ -192,8 +195,24 @@ public class SaleController {
         return Result.success(baseDTO);
     }
 
-  @GetMapping("/test")
-    public String test() {
-        return "配置构建success-1";
+    /**
+     * 企业商机
+     * @param remindReqDTO
+     * @return
+     */
+    @GetMapping("/enterprise/businessChance")
+    public Result getEnremind(RemindReqDTO remindReqDTO){
+        IPage<RemindRspDTO> remindRspDTOIPage =  saleService.getEnremind(remindReqDTO);
+        return Result.success(remindRspDTOIPage);
+    }
+
+    /**
+     * 个人商机
+     * @return
+     */
+    @GetMapping("/personal/businessChance")
+    public Result getPersonalBusinessChance(RemindReqDTO remindReqDTO){
+        IPage<RemindRspDTO> remindRspDTOIPage = saleService.findRemindByUserInfo(remindReqDTO);
+        return Result.success(remindRspDTOIPage);
     }
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/SaleService.java

@@ -1,11 +1,13 @@
 package com.usoftchina.saas.sale.service;
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.saas.base.service.CommonBaseService;
+import com.usoftchina.inquiry.po.inquiry.IPage;
 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.sale.dto.RemindReqDTO;
+import com.usoftchina.saas.sale.dto.RemindRspDTO;
 import com.usoftchina.saas.sale.dto.SaleFormDTO;
 import com.usoftchina.saas.sale.po.SaleList;
 
@@ -46,4 +48,8 @@ public interface SaleService {
     void batchOpen(BatchDealBaseDTO baseDTOs);
 
     DocBaseDTO saleTurnPurchase(Long id);
+
+    IPage<RemindRspDTO> getEnremind(RemindReqDTO remindReqDTO);
+
+    IPage<RemindRspDTO> findRemindByUserInfo(RemindReqDTO remindReqDTO);
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -2,6 +2,12 @@ package com.usoftchina.saas.sale.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.inquiry.api.InquiryApi;
+import com.usoftchina.inquiry.po.inquiry.IPage;
+import com.usoftchina.inquiry.po.inquiry.InquiryEnRemind;
+import com.usoftchina.inquiry.po.inquiry.InquiryRemind;
+import com.usoftchina.saas.account.api.AccountApi;
+import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
@@ -28,7 +34,9 @@ import com.usoftchina.saas.sale.service.SaleService;
 import com.usoftchina.saas.storage.po.ProdIODetail;
 import com.usoftchina.saas.storage.po.ProdInOut;
 import com.usoftchina.saas.utils.BeanMapper;
+import com.usoftchina.saas.utils.CollectionUtils;
 import com.usoftchina.saas.utils.DateUtils;
+import com.usoftchina.saas.utils.JsonUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +71,12 @@ public class SaleServiceImpl implements SaleService{
     private CommonService commonService;
     @Autowired
     private PurchaseService purchaseService;
+    @Autowired
+    private InquiryApi inquiryApi;
+    @Autowired
+    private AccountApi accountApi;
+    @Autowired
+    private CompanyApi companyApi;
 
     @Override
     public PageInfo<SaleList> getListData(@PageDefault(size = 10) PageRequest page, ListReqDTO req) {
@@ -650,6 +664,101 @@ public class SaleServiceImpl implements SaleService{
         return baseDTO;
     }
 
+    /**
+     * 获取企业商机
+     * @param remindReqDTO
+     * @return
+     */
+    @Override
+    public IPage<RemindRspDTO> getEnremind(RemindReqDTO remindReqDTO) {
+        Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
+        if (userUU == null){
+            userUU = 0L;
+        }
+        Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
+        //Long userUU = 1000002503L, enUU = 10041559L;
+        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, remindReqDTO.getPageNumber(),
+                remindReqDTO.getPageSize(), remindReqDTO.getEnableOffer(), remindReqDTO.getKeyword(), /*remindReqDTO.getQuoted(),*/
+                remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
+        List<InquiryEnRemind> inquiryEnRemindList = inquiryEnRemindIPage.getContent();
+        if (CollectionUtils.isEmpty(inquiryEnRemindList)){
+            return null;
+        }
+        List<RemindRspDTO> remindRspDTOList = convertToRemindRspDTO(JsonUtils.toJsonString(inquiryEnRemindList), "enterprise");
+        //转换成分页对象
+        IPage<RemindRspDTO> remindRspDTOIPage = new IPage<RemindRspDTO>(inquiryEnRemindIPage.getNumber(), inquiryEnRemindIPage.getSize(),
+                inquiryEnRemindIPage.getNumberOfElements(),remindRspDTOList, inquiryEnRemindIPage.isFirst(), inquiryEnRemindIPage.isLast(),
+                inquiryEnRemindIPage.getTotalElements());
+        return remindRspDTOIPage;
+    }
+
+    /**
+     * 获取个人商机
+     * @param remindReqDTO
+     * @return
+     */
+    @Override
+    public IPage<RemindRspDTO> findRemindByUserInfo(RemindReqDTO remindReqDTO) {
+        Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
+        Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
+        IPage<InquiryRemind> inquiryRemindIpage = inquiryApi.findRemindByUserInfo(userUU, enUU, remindReqDTO.getPageNumber(), remindReqDTO.getPageSize(),
+                remindReqDTO.getEnableOffer(),remindReqDTO.getKeyword(), remindReqDTO.getQuoted(),
+                remindReqDTO.getFromDate(), remindReqDTO.getEndDate());
+        List<InquiryRemind> inquiryRemindList = inquiryRemindIpage.getContent();
+        if (CollectionUtils.isEmpty(inquiryRemindList)){
+            return null;
+        }
+        List<RemindRspDTO> remindRspDTOList = convertToRemindRspDTO(JsonUtils.toJsonString(inquiryRemindList), "personal");
+        //转换成分页对象
+        IPage<RemindRspDTO> remindRspDTOIPage = new IPage<RemindRspDTO>(inquiryRemindIpage.getNumber(), inquiryRemindIpage.getSize(),
+                inquiryRemindIpage.getNumberOfElements(),remindRspDTOList, inquiryRemindIpage.isFirst(), inquiryRemindIpage.isLast(),
+                inquiryRemindIpage.getTotalElements());
+        return remindRspDTOIPage;
+    }
+
+    /**
+     * 将平台返回的结果集转成SAAS的传输对象
+     * @param data
+     * @param type
+     * @return
+     */
+    private List<RemindRspDTO> convertToRemindRspDTO(String data, String type) {
+        List<RemindRspDTO> remindRspDTOList = new ArrayList<RemindRspDTO>();
+        RemindRspDTO remindRspDTO = null;
+        if ("enterprise".equals(type)){
+            List<InquiryEnRemind> inquiryEnRemindList = JsonUtils.fromJsonArray(data, InquiryEnRemind.class);
+            for (InquiryEnRemind inquiryEnRemind : inquiryEnRemindList){
+                remindRspDTO = new RemindRspDTO();
+                remindRspDTO.setCustName(inquiryEnRemind.getEnName());
+                remindRspDTO.setProdBrand(inquiryEnRemind.getInbrand());
+                remindRspDTO.setProdName(inquiryEnRemind.getProdTitle());
+                remindRspDTO.setProdOrispeccode(inquiryEnRemind.getCmpCode());
+                remindRspDTO.setProdSpec(inquiryEnRemind.getSpec());
+                remindRspDTO.setProdUnit("PCS");
+                remindRspDTO.setNeedQty(inquiryEnRemind.getNeedQty());
+                remindRspDTO.setStartDate(inquiryEnRemind.getReDate());
+                remindRspDTO.setEndDate(inquiryEnRemind.getEndDate());
+                remindRspDTOList.add(remindRspDTO);
+            }
+        }else if("personal".equals(type)){
+            List<InquiryRemind> inquiryRemindList = JsonUtils.fromJsonArray(data, InquiryRemind.class);
+            for (InquiryRemind inquiryRemind : inquiryRemindList){
+                remindRspDTO = new RemindRspDTO();
+                remindRspDTO.setCustName(inquiryRemind.getEnName());
+                remindRspDTO.setProdBrand(inquiryRemind.getInbrand());
+                remindRspDTO.setProdName(inquiryRemind.getProdTitle());
+                remindRspDTO.setProdOrispeccode(inquiryRemind.getCmpCode());
+                remindRspDTO.setProdSpec(inquiryRemind.getSpec());
+                remindRspDTO.setProdUnit("PCS");
+                remindRspDTO.setNeedQty(inquiryRemind.getNeedQty());
+                remindRspDTO.setStartDate(inquiryRemind.getReDate());
+                remindRspDTO.setEndDate(inquiryRemind.getEndDate());
+                remindRspDTOList.add(remindRspDTO);
+            }
+        }
+        return remindRspDTOList;
+    }
+
     //更新最新销售总额
     private void updateTotal(Long id) {
         if (null == id) {

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

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

applications/transfers/mall-api/pom.xml

@@ -10,7 +10,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>mall-api</artifactId>
-
     <description>mall api</description>
 
     <dependencies>
@@ -38,11 +37,6 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-            <version>RELEASE</version>
-        </dependency>
     </dependencies>
 
 </project>

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

@@ -1,8 +1,7 @@
 package com.usoftchina.inquiry.api;
 
-import com.usoftchina.inquiry.po.*;
+import com.usoftchina.inquiry.po.inquiry.*;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,12 +26,18 @@ public interface InquiryApi {
      * @param pageNumber
      * @param pageSize
      * @param enableOffer   是否能报价的:1为是 0为否,作为搜索条件。  值为0或null时,筛选所有
+     * @param keyword       关键词
+     * @param quoted        1是已报价 0是未报价 查看全部不传
+     * @param fromDate      起始时间
+     * @param endDate       截止时间
      * @return
      */
     @GetMapping("/sale/enremind")
     IPage<InquiryEnRemind> findEnRemind(@RequestParam("useruu") Long useruu, @RequestParam("enuu") Long enuu,
                                         @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
-                                        @RequestParam("enableOffer") Integer enableOffer);
+                                        @RequestParam("enableOffer") Integer enableOffer, @RequestParam("keyword") String keyword,
+                                        /*@RequestParam("quoted") Integer quoted, */@RequestParam("fromDate") Long fromDate,
+                                        @RequestParam("endDate") Long endDate);
 
     /**
      * 查看（个人商机）
@@ -42,12 +47,17 @@ public interface InquiryApi {
      * @param pageSize
      * @param enableOffer   是否能报价的:1为是 0为否,作为搜索条件。  值为0或null时,筛选所有
      * @param keyword       关键词,做筛选用
+     * @param quoted        1是已报价 0是未报价 查看全部不传
+     * @param fromDate      起始时间
+     * @param endDate       截止时间
      * @return
      */
     @GetMapping("/sale/remind")
-    IPage<InquiryRemind> findByUserInfo(@RequestParam("useruu") Long useruu, @RequestParam("enuu") Long enuu,
-                                        @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
-                                        @RequestParam("enableOffer") Integer enableOffer, @RequestParam("keyword") String keyword);
+    IPage<InquiryRemind> findRemindByUserInfo(@RequestParam("useruu") Long useruu, @RequestParam("enuu") Long enuu,
+                                              @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
+                                              @RequestParam("enableOffer") Integer enableOffer, @RequestParam("keyword") String keyword,
+                                              @RequestParam("quoted") Integer quoted, @RequestParam("fromDate") Long fromDate,
+                                              @RequestParam("endDate") Long endDate);
 
     /**
      * 保存报价接口
@@ -76,14 +86,21 @@ public interface InquiryApi {
      */
     @GetMapping("/buyer/list")
     IPage<PurcInquiryItemInfo> getInquiryList(@RequestParam("enUU") Long enUU, @RequestParam("overdue") Integer overdue,
-                                             @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
-                                             @RequestParam("state") String state);
+                                              @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
+                                              @RequestParam("state") String state);
 
-    /*@GetMapping("/buyer/quotations")
+    /**
+     * 查看已报价列表
+     * @param state         defaultValue: done
+     * @param enUU
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/buyer/quotations")
     IPage<PurcInquiryItemInfo> findQuotationsByPage(@RequestParam(value = "state", defaultValue = "done") String state,
-                                                   @RequestParam("enUU") Long enUU,
-                                                   @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize);
-    */
+                                                    @RequestParam("enUU") Long enUU,
+                                                    @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize);
 
     /**
      * 采纳

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

@@ -0,0 +1,25 @@
+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.*;
+
+@FeignClient(url = "${Component.base-url}", name = "search-server")
+@RequestMapping("/search")
+public interface SearchApi {
+
+    /**
+     * 器件查询
+     * @param keyword
+     * @param count
+     * @param sorting
+     * @param type
+     * @param page
+     * @param filter
+     * @return
+     */
+    @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);
+}

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

@@ -1,13 +0,0 @@
-package com.usoftchina.inquiry.config;
-
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Author chenwei
- * @Date 2019/01/04
- */
-public class InquiryFeignConfig {
-
-    private String baseUrl;
-
-}

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/Attach.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/Attach.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/Enterprise.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/Enterprise.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/IPage.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/IPage.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.List;
@@ -60,4 +60,16 @@ public class IPage<T> implements Serializable {
         this.last = last;
     }
 
+    public IPage(int number, int size, int numberOfElements, List<T> content, boolean first, boolean last, long totalElements) {
+        this.number = number;
+        this.size = size;
+        this.numberOfElements = numberOfElements;
+        this.content = content;
+        this.first = first;
+        this.last = last;
+        this.totalElements = totalElements;
+    }
+
+    public IPage() {
+    }
 }

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/InquiryEnRemind.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/InquiryEnRemind.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/InquiryRemind.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/InquiryRemind.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/Product.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/Product.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.util.Date;
 import java.util.Set;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/ProductMatchResult.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/ProductMatchResult.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 
 import java.io.Serializable;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PublicInquiry.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PublicInquiry.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PublicInquiryItem.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PublicInquiryItem.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import org.springframework.util.CollectionUtils;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PublicInquiryReply.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PublicInquiryReply.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PurcInquiry.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiry.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PurcInquiryInfo.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiryInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 
 import java.io.Serializable;

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PurcInquiryItem.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiryItem.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.util.*;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PurcInquiryItemInfo.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiryItemInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.util.*;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/PurchaseInquiryReply.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurchaseInquiryReply.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/User.java → applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/User.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po;
+package com.usoftchina.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/FuturesEntity.java

@@ -0,0 +1,57 @@
+package com.usoftchina.inquiry.po.search;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 特征信息
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class FuturesEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long total; // 搜索结果总数
+
+    private Long page; // 页码
+
+    private Long size; // 分页大小
+
+    private List<ProductEntity> content; // 期货物料列表
+
+
+    public Long getTotal() {
+        return total;
+    }
+
+    public void setTotal(Long total) {
+        this.total = total;
+    }
+
+    public Long getPage() {
+        return page;
+    }
+
+    public void setPage(Long page) {
+        this.page = page;
+    }
+
+    public Long getSize() {
+        return size;
+    }
+
+    public void setSize(Long size) {
+        this.size = size;
+    }
+
+    public List<ProductEntity> getContent() {
+        return content;
+    }
+
+    public void setContent(List<ProductEntity> content) {
+        this.content = content;
+    }
+}

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/GoodsEntity.java

@@ -0,0 +1,217 @@
+package com.usoftchina.inquiry.po.search;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 商品信息
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class GoodsEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // 商品id
+
+    private Long brandid; // 商城标准品牌id，如果商品时非标产品，则无值
+
+    private String branduuid; // 商城标准品牌uuid，如果商品时非标产品，则无值
+
+    private String brandNameCn; // 中文品牌名称
+
+    private String brandNameEn; // 英文品牌名称，建议展示使用规则：如果中文存在用中文，不存在则用英文
+
+    private Long kindUuid; // 商城标准类目id，如果商品时非标产品，则无值
+
+    private String kindNameCn; // 产品名称
+
+    private String code; // 产品型号
+
+    private String uuid; // 商城标准产品uuid，如果商品时非标产品，则无值
+
+    private String spec; // 产品规格
+
+    private String packaging; // 包装方式
+
+    private String storeName; // 店铺名称
+
+    private String storeid; // 店铺uuid
+
+    private Double reserve; // 商品库存
+
+    private Double minBuyQty; // 最小起订量
+
+    private Boolean breakUp; // 是否可拆卖
+
+    private Long b2cMinDelivery; // 最小交期
+
+    private Long b2cMaxDelivery; // 最大交期
+
+    private String attach; // 商品规格书，如果有
+
+    private List<QtyPrice> prices; // 分段价格
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getBrandid() {
+        return brandid;
+    }
+
+    public void setBrandid(Long brandid) {
+        this.brandid = brandid;
+    }
+
+    public String getBranduuid() {
+        return branduuid;
+    }
+
+    public void setBranduuid(String branduuid) {
+        this.branduuid = branduuid;
+    }
+
+    public String getBrandNameCn() {
+        return brandNameCn;
+    }
+
+    public void setBrandNameCn(String brandNameCn) {
+        this.brandNameCn = brandNameCn;
+    }
+
+    public String getBrandNameEn() {
+        return brandNameEn;
+    }
+
+    public void setBrandNameEn(String brandNameEn) {
+        this.brandNameEn = brandNameEn;
+    }
+
+    public Long getKindUuid() {
+        return kindUuid;
+    }
+
+    public void setKindUuid(Long kindUuid) {
+        this.kindUuid = kindUuid;
+    }
+
+    public String getKindNameCn() {
+        return kindNameCn;
+    }
+
+    public void setKindNameCn(String kindNameCn) {
+        this.kindNameCn = kindNameCn;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getPackaging() {
+        return packaging;
+    }
+
+    public void setPackaging(String packaging) {
+        this.packaging = packaging;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStoreid() {
+        return storeid;
+    }
+
+    public void setStoreid(String storeid) {
+        this.storeid = storeid;
+    }
+
+    public Double getReserve() {
+        return reserve;
+    }
+
+    public void setReserve(Double reserve) {
+        this.reserve = reserve;
+    }
+
+    public Double getMinBuyQty() {
+        return minBuyQty;
+    }
+
+    public void setMinBuyQty(Double minBuyQty) {
+        this.minBuyQty = minBuyQty;
+    }
+
+    public Boolean getBreakUp() {
+        return breakUp;
+    }
+
+    public void setBreakUp(Boolean breakUp) {
+        this.breakUp = breakUp;
+    }
+
+    public Long getB2cMinDelivery() {
+        return b2cMinDelivery;
+    }
+
+    public void setB2cMinDelivery(Long b2cMinDelivery) {
+        this.b2cMinDelivery = b2cMinDelivery;
+    }
+
+    public Long getB2cMaxDelivery() {
+        return b2cMaxDelivery;
+    }
+
+    public void setB2cMaxDelivery(Long b2cMaxDelivery) {
+        this.b2cMaxDelivery = b2cMaxDelivery;
+    }
+
+    public String getAttach() {
+        return attach;
+    }
+
+    public void setAttach(String attach) {
+        this.attach = attach;
+    }
+
+    public List<QtyPrice> getPrices() {
+        return prices;
+    }
+
+    public void setPrices(List<QtyPrice> prices) {
+        this.prices = prices;
+    }
+}

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/ProductEntity.java

@@ -0,0 +1,140 @@
+package com.usoftchina.inquiry.po.search;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 物料信息
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class ProductEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id; // 物料id
+
+    private String prodNum; // 物料编号（客户ERP里面的编号）
+
+    private String spec; // 物料规格
+
+    private String unit; // 物料单位
+
+    private Long enUU; // 物料所属企业uu号
+
+    private String enName; // 企业名称
+
+    private String kind; // 物料名称
+
+    private String pcmpcode; // 物料型号
+
+    private String pbranden; // 物料品牌
+
+    private String packaging; // 包装方式
+
+    private Long createTime; // 创建时间
+
+    private Double erpReserve; // 库存
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getProdNum() {
+        return prodNum;
+    }
+
+    public void setProdNum(String prodNum) {
+        this.prodNum = prodNum;
+    }
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public Long getEnUU() {
+        return enUU;
+    }
+
+    public void setEnUU(Long enUU) {
+        this.enUU = enUU;
+    }
+
+    public String getEnName() {
+        return enName;
+    }
+
+    public void setEnName(String enName) {
+        this.enName = enName;
+    }
+
+    public String getKind() {
+        return kind;
+    }
+
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    public String getPcmpcode() {
+        return pcmpcode;
+    }
+
+    public void setPcmpcode(String pcmpcode) {
+        this.pcmpcode = pcmpcode;
+    }
+
+    public String getPbranden() {
+        return pbranden;
+    }
+
+    public void setPbranden(String pbranden) {
+        this.pbranden = pbranden;
+    }
+
+    public String getPackaging() {
+        return packaging;
+    }
+
+    public void setPackaging(String packaging) {
+        this.packaging = packaging;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public Double getErpReserve() {
+        return erpReserve;
+    }
+
+    public void setErpReserve(Double erpReserve) {
+        this.erpReserve = erpReserve;
+    }
+}

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/QtyPrice.java

@@ -0,0 +1,80 @@
+package com.usoftchina.inquiry.po.search;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 分段数量
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class QtyPrice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Double start; // 分段起始数量
+
+    private Double end; // 分段截止数量
+
+    private Double rMBPrice; // 人民币含税价格，人民币和美金二者只会有其一
+
+    private Double rMBNTPrice; // 人民币不含税价格，，人民币和美金二者只会有其一
+
+    private Double uSDPrice; // 美金含税价格，人民币和美金二者只会有其一
+
+    private Double uSDNTPrice; // 美金不含税价格，人民币和美金二者只会有其一
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Double getStart() {
+        return start;
+    }
+
+    public void setStart(Double start) {
+        this.start = start;
+    }
+
+    public Double getEnd() {
+        return end;
+    }
+
+    public void setEnd(Double end) {
+        this.end = end;
+    }
+
+    public Double getrMBPrice() {
+        return rMBPrice;
+    }
+
+    public void setrMBPrice(Double rMBPrice) {
+        this.rMBPrice = rMBPrice;
+    }
+
+    public Double getrMBNTPrice() {
+        return rMBNTPrice;
+    }
+
+    public void setrMBNTPrice(Double rMBNTPrice) {
+        this.rMBNTPrice = rMBNTPrice;
+    }
+
+    public Double getuSDPrice() {
+        return uSDPrice;
+    }
+
+    public void setuSDPrice(Double uSDPrice) {
+        this.uSDPrice = uSDPrice;
+    }
+
+    public Double getuSDNTPrice() {
+        return uSDNTPrice;
+    }
+
+    public void setuSDNTPrice(Double uSDNTPrice) {
+        this.uSDNTPrice = uSDNTPrice;
+    }
+}

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/SearchComponentResp.java

@@ -0,0 +1,33 @@
+package com.usoftchina.inquiry.po.search;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 器件查询
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class SearchComponentResp implements Serializable {
+
+    private StockEntity stock; // 现货
+
+    private FuturesEntity futures; // 期货
+
+    public StockEntity getStock() {
+        return stock;
+    }
+
+    public void setStock(StockEntity stock) {
+        this.stock = stock;
+    }
+
+    public FuturesEntity getFutures() {
+        return futures;
+    }
+
+    public void setFutures(FuturesEntity futures) {
+        this.futures = futures;
+    }
+}

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/StockEntity.java

@@ -0,0 +1,56 @@
+package com.usoftchina.inquiry.po.search;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 仓库信息
+ *
+ * @author hey
+ * @since 2019/1/7 13:56
+ */
+public class StockEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long total; // 搜索结果总数
+
+    private Long page; // 页码
+
+    private Long size; // 分页大小
+
+    private List<GoodsEntity> content; // 现货在售商品列表
+
+    public Long getTotal() {
+        return total;
+    }
+
+    public void setTotal(Long total) {
+        this.total = total;
+    }
+
+    public Long getPage() {
+        return page;
+    }
+
+    public void setPage(Long page) {
+        this.page = page;
+    }
+
+    public Long getSize() {
+        return size;
+    }
+
+    public void setSize(Long size) {
+        this.size = size;
+    }
+
+    public List<GoodsEntity> getContent() {
+        return content;
+    }
+
+    public void setContent(List<GoodsEntity> content) {
+        this.content = content;
+    }
+}

applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/InquiryApiTest.java

@@ -1,7 +1,7 @@
 package com.usoftchina.inquiry.test;
 
 import com.usoftchina.inquiry.api.InquiryApi;
-import com.usoftchina.inquiry.po.*;
+import com.usoftchina.inquiry.po.inquiry.*;
 import com.usoftchina.saas.utils.JsonUtils;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -9,11 +9,13 @@ import org.junit.runner.RunWith;
 import org.junit.runners.MethodSorters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.domain.Page;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.ui.ModelMap;
 
 import javax.naming.directory.InvalidSearchFilterException;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * 询报价接口测试
@@ -42,13 +44,13 @@ public class InquiryApiTest {
 
     @Test
     public void testB_findEnRemind(){
-        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, pageNum, pageSize, 1);
+        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, pageNum, pageSize, 0, "", /*0,*/ null, null);
         System.out.println(JsonUtils.toJsonString(inquiryEnRemindIPage));
     }
 
     @Test
     public void testC_findByUserInfo(){
-        IPage<InquiryRemind> inquiryRemindIPage = inquiryApi.findByUserInfo(userUU, enUU, pageNum, pageSize, 1, "1");
+        IPage<InquiryRemind> inquiryRemindIPage = inquiryApi.findRemindByUserInfo(userUU, enUU, pageNum, pageSize, 1, "1", 0, null, null);
         System.out.println(JsonUtils.toJsonString(inquiryRemindIPage));
     }
 
@@ -60,8 +62,42 @@ public class InquiryApiTest {
     }
 
     @Test
-    public void testE_saveQuote(){
+    public void testE_saveInquiry(){
         PurcInquiry purcInquiry = new PurcInquiry();
+        purcInquiry.setEnUU(10050573L);
+        //企业信息
+        Enterprise enterprise = new Enterprise();
+        enterprise.setAdminUU(1000012297L);
+        enterprise.setBusinesscode("SAASTRADE201812121465");
+        enterprise.setEnAddress("江苏省南京市玄武区峡谷之巅");
+        enterprise.setEnName("何炎");
+        enterprise.setEnTel("13978887888");
+        enterprise.setUu(10050573L);
+
+        purcInquiry.setEnterprise(enterprise);
+        purcInquiry.setEnName("何炎");
+        purcInquiry.setRecorderUU(1000012297L);
+        purcInquiry.setDate(new Date());
+        purcInquiry.setRecorder("何炎");
+        purcInquiry.setEndDate(new Date(System.currentTimeMillis() + 3 * 24 * 60 * 60 * 1000));
+        purcInquiry.setSourceapp("sp");
+        purcInquiry.setShip("江苏省南京市玄武区峡谷之巅");
+
+        //询价明细
+        PurcInquiryItem purcInquiryItem = new PurcInquiryItem();
+        purcInquiryItem.setCmpCode("MT8783V");
+        purcInquiryItem.setUserUU(1000012297L);
+        purcInquiryItem.setUserName("何炎");
+        purcInquiryItem.setUserTel("13978887888");
+        purcInquiryItem.setProdCode("CPU0000001");
+        purcInquiryItem.setProdTitle("控制器IC");
+        purcInquiryItem.setSpec("MT8783V/CT,VFBGA641,SMD,无卤");
+        purcInquiryItem.setInbrand("MTK");
+
+        Set<PurcInquiryItem> purcInquiryItemSet = new HashSet<PurcInquiryItem>();
+        purcInquiryItemSet.add(purcInquiryItem);
+        purcInquiry.setInquiryItems(purcInquiryItemSet);
+
         PurcInquiry result = inquiryApi.saveInquiry(purcInquiry);
         System.out.println(JsonUtils.toJsonString(result));
     }

applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/SearchApiTest.java

@@ -0,0 +1,44 @@
+package com.usoftchina.inquiry.test;
+
+import com.usoftchina.inquiry.api.SearchApi;
+import com.usoftchina.inquiry.po.search.SearchComponentResp;
+import com.usoftchina.saas.utils.JsonUtils;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 询报价接口测试
+ * @Author chenwei
+ * @Date 2019/01/04
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class SearchApiTest {
+
+    @Autowired
+    private SearchApi searchApi;
+
+    private static final Long userUU = 1000002503L;
+    private static final Long enUU = 10041559L;
+    private static final int pageNum = 1;
+    private static final int pageSize = 5;
+
+
+
+    @Test
+    public void testA_search(){
+        Map<String,Object> a = new HashMap<String,Object>();
+        a.put("PRICE","ASC");
+        SearchComponentResp result = searchApi.getInquiry("1",5,JsonUtils.toJsonString(a),"component",1,null);
+        System.out.println(JsonUtils.toJsonString(result));
+    }
+}

applications/transfers/transfers-server/pom.xml

@@ -48,6 +48,19 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-dto</artifactId>
+        </dependency>
+        <!-- db -->
+        <dependency>
+            <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/config/ExpirationMessagePostProcessor.java

@@ -0,0 +1,25 @@
+package com.usoftchina.saas.transfers.config;
+
+import org.springframework.amqp.AmqpException;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessagePostProcessor;
+
+/**
+ * @author: guq
+ * @create: 2019-01-07 18:27
+ **/
+public class ExpirationMessagePostProcessor implements MessagePostProcessor {
+
+    private final Long ttl; // 毫秒
+
+    public ExpirationMessagePostProcessor(Long ttl) {
+        this.ttl = ttl;
+    }
+
+    @Override
+    public Message postProcessMessage(Message message) throws AmqpException {
+        message.getMessageProperties() .setExpiration(ttl.toString());
+        // 设置message的失效时间
+        return message;
+    }
+}

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

@@ -1,6 +1,8 @@
 package com.usoftchina.saas.transfers.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
 
 import java.io.Serializable;
 
@@ -9,57 +11,67 @@ import java.io.Serializable;
  * @Author chenwei
  * @Date 2018/12/28
  */
-@ConfigurationProperties("spring.rabbitmq")
+@ConfigurationProperties(prefix = "rabbit.config")
 public class RabbitConfig implements Serializable {
 
-//    @Value("${spring.rabbitmq.host}")
-    private String host;
-//    @Value("${spring.rabbitmq.port}")
-    private int port;
-//    @Value("${spring.rabbitmq.username}")
-    private String username;
-//    @Value("${spring.rabbitmq.password}")
-    private String password;
-//    @Value("${spring.rabbitmq.virtual-host}")
-    private String virtualHost;
-
-    public String getHost() {
-        return host;
+    private String exchange;
+
+    private String dlexchange;
+
+    private String queue;
+
+    private String dlqueue;
+
+    private String routingkey;
+
+    private Long expired;
+
+    public String getExchange() {
+        return exchange;
     }
 
-    public void setHost(String host) {
-        this.host = host;
+    public void setExchange(String exchange) {
+        this.exchange = exchange;
     }
 
-    public int getPort() {
-        return port;
+    public String getDlexchange() {
+        return dlexchange;
     }
 
-    public void setPort(int port) {
-        this.port = port;
+    public void setDlexchange(String dlexchange) {
+        this.dlexchange = dlexchange;
     }
 
-    public String getUsername() {
-        return username;
+    public String getQueue() {
+        return queue;
     }
 
-    public void setUsername(String username) {
-        this.username = username;
+    public void setQueue(String queue) {
+        this.queue = queue;
     }
 
-    public String getPassword() {
-        return password;
+    public Long getExpired() {
+        return expired;
+    }
+
+    public void setExpired(Long expired) {
+        this.expired = expired;
+    }
+
+    public String getDlqueue() {
+
+        return dlqueue;
     }
 
-    public void setPassword(String password) {
-        this.password = password;
+    public void setDlqueue(String dlqueue) {
+        this.dlqueue = dlqueue;
     }
 
-    public String getVirtualHost() {
-        return virtualHost;
+    public String getRoutingkey() {
+        return routingkey;
     }
 
-    public void setVirtualHost(String virtualHost) {
-        this.virtualHost = virtualHost;
+    public void setRoutingkey(String routingkey) {
+        this.routingkey = routingkey;
     }
 }

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

@@ -1,29 +1,27 @@
-package com.usoftchina.saas.transfers;
+package com.usoftchina.saas.transfers.controller;
 
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.transfers.po.MessageInfo;
-import com.usoftchina.saas.transfers.service.ReceiveService;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.xml.ws.handler.MessageContext;
-
 /**
  * @author: guq
  * @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/mapper/BrokerMessageLogMapper.java

@@ -0,0 +1,31 @@
+package com.usoftchina.saas.transfers.mapper;
+
+import com.usoftchina.saas.transfers.po.BrokerMessagelog;
+
+/**
+ * @author: guq
+ * @create: 2019-01-07 20:37
+ **/
+public interface BrokerMessageLogMapper {
+    BrokerMessagelog getMessage(String msgId);
+
+    BrokerMessagelog getLiveMessage(String msgId);
+
+    BrokerMessagelog getDeadMessage(String msgId);
+
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(BrokerMessagelog record);
+
+    int insertSelective(BrokerMessagelog record);
+
+    BrokerMessagelog selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(BrokerMessagelog record);
+
+    int updateByPrimaryKey(BrokerMessagelog record);
+
+    int updateMessageLogandAddRetry(BrokerMessagelog record);
+
+    void updateSuccess(String msgId);
+}