Merge remote-tracking branch 'origin/dev' into dev

topsun-xt/src/main/webapp/biz/topsun/customer/customerDetail.jsp

@@ -31,21 +31,33 @@
     <div style="margin: 10px;">
         <div class="hg-form-cols">
             <x:hidden name="customerId"/>
+            <x:hidden name="customerBankId"/>
+<%--            <x:hidden name="customerId"/>--%>
             <x:inputC name="customerCode" label="客户编码" labelCol="1" fieldCol="2"/>
-            <x:inputC name="customerName" label="客户全称" labelCol="1" fieldCol="2" required="true"/>
+            <x:inputC name="customerName" label="客户全称" labelCol="1" fieldCol="2"/>
             <x:inputC name="customerShortName" label="客户简称" labelCol="1" fieldCol="2"/>
             <x:inputC name="customerWorkTime" label="客户工作时间" wrapper="date" labelCol="1" fieldCol="2"/>
             <x:inputC name="customerEnName" label="英文名称" labelCol="1" fieldCol="2"/>
             <x:inputC name="customerEnShortName" label="英文名简称" labelCol="1" fieldCol="2"/>
-            <x:inputC name="provinceInfo" label="所属地区" maxLength="32" labelCol="1"
-                      fieldCol="2" readonly="true"/>
-            <x:inputC name="customerLevel" label="客户等级" maxLength="32" labelCol="1"
-                      fieldCol="2"/>
+            <x:inputC name="provinceInfo" label="所属地区" maxLength="32" labelCol="1" fieldCol="2" readonly="true"/>
+            <x:inputC name="customerLevel" label="客户等级" maxLength="32" labelCol="1" fieldCol="2"/>
             <x:inputC name="customerFactoryCode" label="工厂代号" maxLength="32" labelCol="1" fieldCol="2"/>
             <x:inputC name="customerAddress" label="地址" maxLength="32" labelCol="1" fieldCol="2"/>
             <x:inputC name="customerGroup" label="所属集团" maxLength="32" labelCol="1" fieldCol="2"/>
-            <x:inputC name="customerZipCode" label="邮编" maxLength="32" labelCol="1"
-                      fieldCol="2"/>
+            <x:inputC name="customerZipCode" label="邮编" maxLength="32" labelCol="1" fieldCol="2"/>
+            <x:inputC name="customerBankDeposit" label="开户银行" maxLength="32" labelCol="1" fieldCol="2"/>
+            <x:inputC name="customerAccountNo" label="银行账户" maxLength="32" labelCol="1" fieldCol="2"/>
+            <x:inputC name="customerAccountName" label="户名" maxLength="32" labelCol="1" fieldCol="2"/>
+            <x:inputC name="customerCorporation" label="公司法人" maxLength="32" labelCol="1" fieldCol="2"/>
+            <x:inputC name="businessRegistrationNumber" label="工商注册号" maxLength="32" labelCol="1" fieldCol="2"/>
+            <x:inputC name="nationalTaxRegistrationNumber" label="国税注册号" maxLength="32" labelCol="1" fieldCol="2"/>
+<%--            <x:inputC name="nationalTaxRegistrationNumber" label="订单性质" maxLength="32" labelCol="1" fieldCol="2"/>--%>
+<%--            <x:inputC name="nationalTaxRegistrationNumber" label="品牌" maxLength="32" labelCol="1" fieldCol="2"/>--%>
+<%--            <x:inputC name="nationalTaxRegistrationNumber" label="做账难度等级" maxLength="32" labelCol="1" fieldCol="2"/>--%>
+<%--            <x:inputC name="nationalTaxRegistrationNumber" label="月结方式" maxLength="32" labelCol="1" fieldCol="2"/>--%>
+<%--            <x:inputC name="nationalTaxRegistrationNumber" label="扣款" maxLength="32" labelCol="1" fieldCol="2"/>--%>
+<%--            <x:inputC name="nationalTaxRegistrationNumber" label="月结方式" maxLength="32" labelCol="1" fieldCol="2"/>--%>
+
         </div>
     </div>
 

topsun/src/main/java/com/huigou/topsun/customer/application/CustomerBaseInfoApplication.java

 package com.huigou.topsun.customer.application;
 
+import com.huigou.topsun.customer.domain.CustomerBank;
+import com.huigou.topsun.customer.domain.CustomerContact;
 import com.huigou.topsun.customer.domain.Province;
 import com.huigou.topsun.customer.domain.vo.CustomerVo;
 
@@ -13,4 +15,8 @@ public interface CustomerBaseInfoApplication {
     List<Province> findByProvinceCode(String provinceCode);
 
     CustomerVo findCustomerByCustomerId(String customerId);
+
+    CustomerBank findCustomerBankByCustomerId(String customerId);
+
+    List<CustomerContact> findCustomerContactByCustomerId(String customerId);
 }

topsun/src/main/java/com/huigou/topsun/customer/application/Impl/CustomerApplicationImpl.java

@@ -17,8 +17,6 @@ import java.util.Map;
 public class CustomerApplicationImpl extends BaseApplication implements CustomerApplication {
     public static final String QUERY_XML_FILE_PATH = "config/topsun/customer/customerMapper.xml";
 
-    @Autowired
-    private CustomerRepository customerRepository;
 
     /**
      * 分页查询客户信息数据
@@ -29,7 +27,6 @@ public class CustomerApplicationImpl extends BaseApplication implements Customer
     public Map<String, Object> findCustomerByPage(CustomerQueryRequest customerQueryRequest) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "customerList");
         QueryModel model = this.sqlExecutorDao.getQueryModel(queryDescriptor, customerQueryRequest);
-        model.putDictionary("processType", DictUtil.getDictionary("processType"));
         return this.sqlExecutorDao.executeSlicedQuery(model);
     }
 }

topsun/src/main/java/com/huigou/topsun/customer/application/Impl/CustomerBaseInfoApplicationImpl.java

@@ -2,8 +2,12 @@ package com.huigou.topsun.customer.application.Impl;
 
 import com.huigou.topsun.customer.application.CustomerBaseInfoApplication;
 import com.huigou.topsun.customer.domain.Customer;
+import com.huigou.topsun.customer.domain.CustomerBank;
+import com.huigou.topsun.customer.domain.CustomerContact;
 import com.huigou.topsun.customer.domain.Province;
 import com.huigou.topsun.customer.domain.vo.CustomerVo;
+import com.huigou.topsun.customer.repository.CustomerBankRepository;
+import com.huigou.topsun.customer.repository.CustomerContactRepository;
 import com.huigou.topsun.customer.repository.CustomerRepository;
 import com.huigou.topsun.customer.repository.ProvinceRepository;
 import org.springframework.beans.BeanUtils;
@@ -19,6 +23,10 @@ public class CustomerBaseInfoApplicationImpl implements CustomerBaseInfoApplicat
     private ProvinceRepository provinceRepository;
     @Autowired
     private CustomerRepository customerRepository;
+    @Autowired
+    private CustomerBankRepository customerBankRepository;
+    @Autowired
+    private CustomerContactRepository customerContactRepository;
 
 
     @Override
@@ -61,6 +69,19 @@ public class CustomerBaseInfoApplicationImpl implements CustomerBaseInfoApplicat
         return customerVo;
     }
 
+    @Override
+    public CustomerBank findCustomerBankByCustomerId(String customerId) {
+        CustomerBank customerBank = customerBankRepository.findCustomerBankByCustomerId(customerId);
+        return customerBank;
+    }
+
+    @Override
+    public List<CustomerContact> findCustomerContactByCustomerId(String customerId) {
+        List<CustomerContact> customerContactList = customerContactRepository.findCustomerContactByCustomerId(customerId);
+        return customerContactList;
+
+    }
+
 //    /**
 //     * @param provinceCode
 //     * @return provinceList

topsun/src/main/java/com/huigou/topsun/customer/controller/CustomerController.java

 package com.huigou.topsun.customer.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.huigou.topsun.customer.application.CustomerBaseInfoApplication;
 import com.huigou.topsun.customer.application.CustomerApplication;
+import com.huigou.topsun.customer.domain.CustomerBank;
+import com.huigou.topsun.customer.domain.CustomerContact;
 import com.huigou.topsun.customer.domain.query.CustomerQueryRequest;
 import com.huigou.topsun.customer.domain.Province;
 import com.huigou.topsun.customer.domain.vo.CustomerVo;
@@ -9,6 +12,7 @@ import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.client.CommonController;
 import com.huigou.util.SDO;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 
@@ -34,6 +38,7 @@ public class CustomerController extends CommonController {
 
     /**
      * 转跳到客户信息列表页面
+     *
      * @return
      */
     public String forwardCustomerList() {
@@ -42,6 +47,7 @@ public class CustomerController extends CommonController {
 
     /**
      * 分页展示客户信息列表
+     *
      * @return
      */
     public String findCustomer() {
@@ -52,19 +58,24 @@ public class CustomerController extends CommonController {
     }
 
 
-
     /**
      * 转跳到客户详细信息页面
+     *
      * @return
      */
     public String forwardCustomerDetail() {
 
-        CustomerVo customerVo = loadProductDetail();
-        return forward("customerDetail", customerVo);
+        CustomerVo customerVo = loadCustomerDetail();
+        CustomerBank customerBank = loadCustomerBank();
+        BeanUtils.copyProperties(customerBank,customerVo);
+
+        return forward("customerDetail",customerVo);
     }
+
     /**
      * 展示客户省市数据，如果客户的省份编码是省级行政单位，直接返回省份数据，
      * 如果客户的省份编码是二级或者三级行政单位，则需要返回对应的省级或者市级行政单位
+     *
      * @return
      */
     public String findProvince() {
@@ -77,20 +88,53 @@ public class CustomerController extends CommonController {
         }
         List<String> provinceNameList = provinceList.stream().map(province -> province.getProvinceName()).collect(Collectors.toList());
         Map<Object, Object> map = new HashMap<>();
-        map.put("provinceNameList",provinceNameList);
+        map.put("provinceNameList", provinceNameList);
         return toResult(map);
     }
 
     /**
      * 客户详细信息展示
+     *
      * @return
      */
-    public CustomerVo loadProductDetail() {
+    public CustomerVo loadCustomerDetail() {
         SDO sdo = getSDO();
         String customerId = sdo.getString("customerId");
         CustomerVo customerVo = customerBaseInfoApplication.findCustomerByCustomerId(customerId);
         return customerVo;
     }
 
+    /**
+     * 加载客户银行信息
+     *
+     * @return
+     */
+    public CustomerBank loadCustomerBank() {
+        SDO sdo = getSDO();
+        String customerId = sdo.getString("customerId");
+        CustomerBank customerBank = customerBaseInfoApplication.findCustomerBankByCustomerId(customerId);
+        return customerBank;
+    }
+
+    /**
+     * 加载客户联系人信息
+     *
+     * @return
+     */
+    public CustomerContact loadCustomerContact() {
+        SDO sdo = getSDO();
+        String customerId = sdo.getString("customerId");
+        String contactType = sdo.getString("contactType");
+        List<CustomerContact> customerContactList = customerBaseInfoApplication.findCustomerContactByCustomerId(customerId);
+        for (CustomerContact customerContact : customerContactList) {
+            if (!BeanUtil.isEmpty(customerContact)) {
+                if (customerContact.getContactType().equals(contactType)) {
+                    return customerContact;
+                }
+            }
+        }
+        return null;
+    }
+
 
 }

topsun/src/main/java/com/huigou/topsun/customer/domain/CustomerBank.java

+package com.huigou.topsun.customer.domain;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+/**
+ * 客户银行信息
+ * @TableName customer_bank
+ */
+@Table(name="customer_bank")
+@Data
+@Entity
+public class CustomerBank implements Serializable {
+    /**
+     * 
+     */
+    @Id
+    @GeneratedValue(generator = "system-uuid")
+    @GenericGenerator(name = "system-uuid", strategy = "guid")
+    @Column(name = "customer_bank_id")
+    private String customerBankId;
+
+    /**
+     * 客户id
+     */
+    @Column(name = "customer_id")
+    private String customerId;
+
+    /**
+     * 开户银行
+     */
+    @Column(name = "customer_bank_deposit")
+    private String customerBankDeposit;
+
+    /**
+     * 银行账号
+     */
+    @Column(name = "customer_account_no")
+    private String customerAccountNo;
+
+    /**
+     * 户名
+     */
+    @Column(name = "customer_account_name")
+    private String customerAccountName;
+
+    /**
+     * 公司法人
+     */
+    @Column(name = "customer_corporation")
+    private String customerCorporation;
+
+    /**
+     * 工商注册号
+     */
+    @Column(name = "business_registration_number")
+    private String businessRegistrationNumber;
+
+    /**
+     * 国税注册号
+     */
+    @Column(name = "national_tax_registration_number")
+    private String nationalTaxRegistrationNumber;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/customer/domain/CustomerContact.java

+package com.huigou.topsun.customer.domain;
+
+import java.io.Serializable;
+import javax.persistence.*;
+
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+/**
+ * 客户联系人信息
+ * @TableName customer_contact
+ */
+@Table(name="customer_contact")
+@Data
+@Entity
+public class CustomerContact implements Serializable {
+    /**
+     * 客户联系人id
+     */
+    @Id
+    @GeneratedValue(generator = "system-uuid")
+    @GenericGenerator(name = "system-uuid", strategy = "guid")
+    @Column(name = "customer_contact_id")
+    private String customerContactId;
+
+    /**
+     * 客户id
+     */
+    @Column(name = "customer_id")
+    private String customerId;
+
+    /**
+     * 联系人类型
+     */
+    @Column(name = "contact_type")
+    private String contactType;
+
+    /**
+     * 联系人名称
+     */
+    @Column(name = "contact_name")
+    private String contactName;
+
+    /**
+     * 联系人电话
+     */
+    @Column(name = "contact_phone")
+    private String contactPhone;
+
+    /**
+     * 传真
+     */
+    @Column(name = "contact_fax")
+    private String contactFax;
+
+    /**
+     * 邮件
+     */
+    @Column(name = "contact_mail")
+    private String contactMail;
+
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/customer/domain/vo/CustomerVo.java

@@ -79,6 +79,41 @@ public class CustomerVo implements Serializable {
      */
     private String customerZipCode;
 
+    /**
+     *
+     */
+    private String customerBankId;
+
+    /**
+     * 开户银行
+     */
+    private String customerBankDeposit;
+
+    /**
+     * 银行账号
+     */
+    private String customerAccountNo;
+
+    /**
+     * 户名
+     */
+    private String customerAccountName;
+
+    /**
+     * 公司法人
+     */
+    private String customerCorporation;
+
+    /**
+     * 工商注册号
+     */
+    private String businessRegistrationNumber;
+
+    /**
+     * 国税注册号
+     */
+    private String nationalTaxRegistrationNumber;
+
     public String getCustomerId() {
         return customerId;
     }

topsun/src/main/java/com/huigou/topsun/customer/repository/CustomerBankRepository.java

+package com.huigou.topsun.customer.repository;
+
+import com.huigou.topsun.customer.domain.CustomerBank;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface CustomerBankRepository extends JpaRepository<CustomerBank,String> {
+    CustomerBank findCustomerBankByCustomerId(String customerId);
+}

topsun/src/main/java/com/huigou/topsun/customer/repository/CustomerContactRepository.java

+package com.huigou.topsun.customer.repository;
+
+import com.huigou.topsun.customer.domain.CustomerContact;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface CustomerContactRepository extends JpaRepository<CustomerContact,String> {
+    List<CustomerContact> findCustomerContactByCustomerId(String customerId);
+}