基本订单和经销商

pom.xml

@@ -29,6 +29,7 @@
 		<oshi.version>3.9.1</oshi.version>
 		<commons.io.version>2.5</commons.io.version>
 		<commons.fileupload.version>1.3.3</commons.fileupload.version>
+        <httpclient.version>4.5.5</httpclient.version>
 		<poi.version>3.17</poi.version>
 		<velocity.version>1.7</velocity.version>
         <lombok.version>1.16.10</lombok.version>
@@ -168,6 +169,11 @@
 				<artifactId>fastjson</artifactId>
 				<version>${fastjson.version}</version>
 			</dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${httpclient.version}</version>
+            </dependency>
 
 
             <!--lombok 注解-->
@@ -222,6 +228,11 @@
                 <artifactId>suishenbang-apiframework</artifactId>
                 <version>${dgtly.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.dgtly</groupId>
+                <artifactId>suishenbang-order</artifactId>
+                <version>${dgtly.version}</version>
+            </dependency>
 
 
         </dependencies>
@@ -237,6 +248,7 @@
         <module>suishenbang-common</module>
         <module>suishenbang-api</module>
         <module>suishenbang-wxportal</module>
+        <module>suishenbang-order</module>
     </modules>
     <packaging>pom</packaging>
 

suishenbang-admin/pom.xml

@@ -87,6 +87,11 @@
             <version>4.0.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>suishenbang-order</artifactId>
+        </dependency>
+
 
 
     </dependencies>

suishenbang-admin/src/main/java/com/dgtly/DgtlyApplication.java

@@ -1,8 +1,12 @@
 package com.dgtly;
 
+import org.apache.http.client.HttpClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.RestTemplate;
 
 /**
  * 启动程序
@@ -27,4 +31,10 @@ public class DgtlyApplication
                 "(♥◠‿◠)ﾉﾞ 通誉企业云平台  ლ(´ڡ`ლ)ﾞ"
         );
     }
+
+    @Bean
+    public RestTemplate restTemplate() {
+
+         return new RestTemplate();
+    }
 }

suishenbang-admin/src/main/resources/application-dev-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.32.2.212:3306/suishenbang-oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://10.32.2.212:3306/suishenbang_oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: libang
             # 从库数据源

suishenbang-admin/src/main/resources/application-dev.yml

@@ -12,6 +12,7 @@ ruoyi:
   profile: D:/home
   # 获取ip地址开关
   addressEnabled: true
+  cloudPath: http://127.0.0.1:8010
 
 # 开发环境配置
 server:

suishenbang-admin/src/main/resources/application-test-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                  url: jdbc:mysql://10.32.2.212:3306/suishenbang-oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                  url: jdbc:mysql://10.32.2.212:3306/suishenbang_oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                   username: root
                   password: libang
             # 从库数据源

suishenbang-admin/src/main/resources/application-test.yml

@@ -12,6 +12,7 @@ ruoyi:
   profile: /home/suishenbang/file
   # 获取ip地址开关
   addressEnabled: true
+  cloudPath: http://10.32.2.212:8010/
 
 # 开发环境配置
 server:

suishenbang-api/src/main/resources/application-dev-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.32.2.212:3306/suishenbang-oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://10.32.2.212:3306/suishenbang_oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: libang
             # 从库数据源

suishenbang-api/src/main/resources/application-test-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://10.32.2.212:3306/suishenbang-oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://10.32.2.212:3306/suishenbang_oneportal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: libang
             # 从库数据源

suishenbang-common/src/main/java/com/dgtly/common/utils/MapDataUtil.java

@@ -1,5 +1,9 @@
-package com.ruoyi.common.utils;
+package com.dgtly.common.utils;
 
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -47,4 +51,38 @@ public class MapDataUtil
         }
         return returnMap;
     }
+
+    public static MultiValueMap<String, Object> convertMultiValueMap(HttpServletRequest request)
+    {
+        Map<String, String[]> properties = request.getParameterMap();
+        MultiValueMap<String, Object> returnMap = new LinkedMultiValueMap<>();
+        Iterator<?> entries = properties.entrySet().iterator();
+        Map.Entry<?, ?> entry;
+        String name = "";
+        while (entries.hasNext())
+        {
+            entry = (Entry<?, ?>) entries.next();
+            name = (String) entry.getKey();
+            Object valueObj = entry.getValue();
+            ArrayList<Object> temp = new ArrayList<>();
+            if (null == valueObj)
+            {
+                temp = null;
+
+            }
+            else if (valueObj instanceof String[])
+            {
+                String[] values = (String[]) valueObj;
+                for(String s:values){
+                    temp.add(s);
+                }
+            }
+            else
+            {
+                temp.add(valueObj);
+            }
+            returnMap.put(name, temp);
+        }
+        return returnMap;
+    }
 }

suishenbang-framework/pom.xml

@@ -93,6 +93,11 @@
 			<artifactId>jna-platform</artifactId>
 		</dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+
     </dependencies>
     
 </project>

suishenbang-order/pom.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>suishenbang-oneportal</artifactId>
+        <groupId>com.dgtly</groupId>
+        <version>4.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>suishenbang-order</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>suishenbang-framework</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>suishenbang-common</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

suishenbang-order/src/main/java/com/dgtly/order/controller/OrderBaseController.java

@@ -0,0 +1,82 @@
+package com.dgtly.order.controller;
+
+import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.dgtly.common.utils.MapDataUtil;
+import com.dgtly.order.domain.OrderBase;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.dgtly.common.core.controller.BaseController;
+import org.springframework.web.client.RestTemplate;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 订单基础 订单的基础信息Controller
+ * 
+ * @author qxp
+ * @date 2020-07-10
+ */
+@Controller
+@RequestMapping("/order/orderbase")
+public class OrderBaseController extends BaseController {
+    private String prefix = "order/orderbase";
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Value(value = "${ruoyi.cloudPath}")
+    private String cloudPath;
+
+
+    @RequiresPermissions("order:orderbase:view")
+    @GetMapping()
+    public String orderbase() {
+        return prefix + "/orderbase";
+    }
+
+    /**
+     * 查询订单基础 订单的基础信息列表
+     */
+    @RequiresPermissions("order:orderbase:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(HttpServletRequest request) {
+        //设置为form方式
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        MultiValueMap<String, Object> map = MapDataUtil.convertMultiValueMap(request);
+            HttpEntity<Object> requestEntity
+                = new HttpEntity<>(map, headers);
+        String str = restTemplate.postForObject(cloudPath + request.getRequestURI(), requestEntity, String.class);
+        return str;
+    }
+
+
+    /**
+     * 修改订单基础 订单的基础信息
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap) {
+        String str = restTemplate.getForObject(cloudPath + "/order/orderbase/info/" + id, String.class);
+        OrderBase orderBase = JSONObject.toJavaObject(JSON.parseObject(str), OrderBase.class);
+        mmap.put("orderBase", orderBase);
+        return prefix + "/edit";
+    }
+}
+
+

suishenbang-order/src/main/java/com/dgtly/order/controller/OrderCustomersController.java

@@ -0,0 +1,84 @@
+package com.dgtly.order.controller;
+
+
+
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.dgtly.common.utils.MapDataUtil;
+import com.dgtly.order.domain.OrderCustomers;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.*;
+import com.dgtly.common.core.controller.BaseController;
+import org.springframework.web.client.RestTemplate;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * 经销商Controller
+ * 
+ * @author qxp
+ * @date 2020-07-09
+ */
+@Controller
+@RequestMapping("/order/customers")
+public class OrderCustomersController extends BaseController
+{
+    private String prefix = "order/customers";
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Value(value = "${ruoyi.cloudPath}")
+    private String cloudPath;
+
+    @RequiresPermissions("system:customers:view")
+    @GetMapping()
+    public String customers()
+    {
+        return prefix + "/customers";
+    }
+
+
+    @RequiresPermissions("system:customers:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public Object list(HttpServletRequest request)
+    {
+
+        //设置为form方式
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+        MultiValueMap<String, Object> map = MapDataUtil.convertMultiValueMap(request);
+
+        HttpEntity<Object> requestEntity
+                = new HttpEntity<>(map, headers);
+        String str = restTemplate.postForObject(cloudPath+request.getRequestURI(),requestEntity,String.class);
+        return str;
+    }
+
+    /**
+     * 查看经销商详情
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        String str = restTemplate.getForObject(cloudPath+"/order/customers/info/"+id,String.class);
+        OrderCustomers orderCustomers =JSONObject.toJavaObject(JSON.parseObject(str),OrderCustomers.class);
+        mmap.put("orderCustomers", orderCustomers);
+        return prefix + "/edit";
+    }
+
+
+}

suishenbang-order/src/main/java/com/dgtly/order/domain/OrderBase.java

@@ -0,0 +1,266 @@
+package com.dgtly.order.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.dgtly.common.annotation.Excel;
+import com.dgtly.common.core.domain.BaseEntity;
+import java.util.Date;
+
+/**
+ * 订单基础 订单的基础信息对象 order_base
+ * 
+ * @author qxp
+ * @date 2020-07-10
+ */
+public class OrderBase extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 是否删除 */
+    private String isDelete;
+
+    /** 订单所属 订单的所属公司 */
+    @Excel(name = "订单所属 订单的所属公司")
+    private String orderBelong;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderNumber;
+
+    /** 订单生成时间 */
+    @Excel(name = "订单生成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date orderCreationTime;
+
+    /** 订单金额 */
+    @Excel(name = "订单金额")
+    private Double orderAmount;
+
+    /** 冻结金额 */
+    @Excel(name = "冻结金额")
+    private Double freezeAmount;
+
+    /** 未清金额 */
+    @Excel(name = "未清金额")
+    private Double unclearAmount;
+
+    /** 发货未过账 */
+    @Excel(name = "发货未过账")
+    private Double shipmentNotPosted;
+
+    /** 发货已过账 */
+    @Excel(name = "发货已过账")
+    private Double shipmentPosted;
+
+    /** 订单状态 */
+    @Excel(name = "订单状态")
+    private Long orderStatus;
+
+    /** 到货地址 */
+    @Excel(name = "到货地址")
+    private String shippingAddress;
+
+    /** 过信用时间 */
+    @Excel(name = "过信用时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date passCreditTime;
+
+    /** 期望到货开始时间 */
+    @Excel(name = "期望到货开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expectedStartTime;
+
+    /** 期望到货结束时间 */
+    @Excel(name = "期望到货结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date expectedEndTime;
+
+    /** 订单结束时间 */
+    @Excel(name = "订单结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date orderEndTime;
+
+    /** 订单所属 */
+    @Excel(name = "订单所属")
+    private String belongTo;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIsDelete(String isDelete) 
+    {
+        this.isDelete = isDelete;
+    }
+
+    public String getIsDelete() 
+    {
+        return isDelete;
+    }
+    public void setOrderBelong(String orderBelong) 
+    {
+        this.orderBelong = orderBelong;
+    }
+
+    public String getOrderBelong() 
+    {
+        return orderBelong;
+    }
+    public void setOrderNumber(String orderNumber) 
+    {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getOrderNumber() 
+    {
+        return orderNumber;
+    }
+    public void setOrderCreationTime(Date orderCreationTime) 
+    {
+        this.orderCreationTime = orderCreationTime;
+    }
+
+    public Date getOrderCreationTime() 
+    {
+        return orderCreationTime;
+    }
+    public void setOrderAmount(Double orderAmount) 
+    {
+        this.orderAmount = orderAmount;
+    }
+
+    public Double getOrderAmount() 
+    {
+        return orderAmount;
+    }
+    public void setFreezeAmount(Double freezeAmount) 
+    {
+        this.freezeAmount = freezeAmount;
+    }
+
+    public Double getFreezeAmount() 
+    {
+        return freezeAmount;
+    }
+    public void setUnclearAmount(Double unclearAmount) 
+    {
+        this.unclearAmount = unclearAmount;
+    }
+
+    public Double getUnclearAmount() 
+    {
+        return unclearAmount;
+    }
+    public void setShipmentNotPosted(Double shipmentNotPosted) 
+    {
+        this.shipmentNotPosted = shipmentNotPosted;
+    }
+
+    public Double getShipmentNotPosted() 
+    {
+        return shipmentNotPosted;
+    }
+    public void setShipmentPosted(Double shipmentPosted) 
+    {
+        this.shipmentPosted = shipmentPosted;
+    }
+
+    public Double getShipmentPosted() 
+    {
+        return shipmentPosted;
+    }
+    public void setOrderStatus(Long orderStatus) 
+    {
+        this.orderStatus = orderStatus;
+    }
+
+    public Long getOrderStatus() 
+    {
+        return orderStatus;
+    }
+    public void setShippingAddress(String shippingAddress) 
+    {
+        this.shippingAddress = shippingAddress;
+    }
+
+    public String getShippingAddress() 
+    {
+        return shippingAddress;
+    }
+    public void setPassCreditTime(Date passCreditTime) 
+    {
+        this.passCreditTime = passCreditTime;
+    }
+
+    public Date getPassCreditTime() 
+    {
+        return passCreditTime;
+    }
+    public void setExpectedStartTime(Date expectedStartTime) 
+    {
+        this.expectedStartTime = expectedStartTime;
+    }
+
+    public Date getExpectedStartTime() 
+    {
+        return expectedStartTime;
+    }
+    public void setExpectedEndTime(Date expectedEndTime) 
+    {
+        this.expectedEndTime = expectedEndTime;
+    }
+
+    public Date getExpectedEndTime() 
+    {
+        return expectedEndTime;
+    }
+    public void setOrderEndTime(Date orderEndTime) 
+    {
+        this.orderEndTime = orderEndTime;
+    }
+
+    public Date getOrderEndTime() 
+    {
+        return orderEndTime;
+    }
+    public void setBelongTo(String belongTo) 
+    {
+        this.belongTo = belongTo;
+    }
+
+    public String getBelongTo() 
+    {
+        return belongTo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDelete", getIsDelete())
+            .append("orderBelong", getOrderBelong())
+            .append("orderNumber", getOrderNumber())
+            .append("orderCreationTime", getOrderCreationTime())
+            .append("orderAmount", getOrderAmount())
+            .append("freezeAmount", getFreezeAmount())
+            .append("unclearAmount", getUnclearAmount())
+            .append("shipmentNotPosted", getShipmentNotPosted())
+            .append("shipmentPosted", getShipmentPosted())
+            .append("orderStatus", getOrderStatus())
+            .append("shippingAddress", getShippingAddress())
+            .append("passCreditTime", getPassCreditTime())
+            .append("expectedStartTime", getExpectedStartTime())
+            .append("expectedEndTime", getExpectedEndTime())
+            .append("orderEndTime", getOrderEndTime())
+            .append("belongTo", getBelongTo())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

suishenbang-order/src/main/java/com/dgtly/order/domain/OrderCustomers.java

@@ -0,0 +1,180 @@
+package com.dgtly.order.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.dgtly.common.annotation.Excel;
+import com.dgtly.common.core.domain.BaseEntity;
+
+/**
+ * 经销商对象 order_customers
+ * 
+ * @author qxp
+ * @date 2020-07-09
+ */
+public class OrderCustomers extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 是否删除 */
+    private String isDelete;
+
+    /** 经销商 */
+    @Excel(name = "经销商")
+    private String chainsName;
+
+    /** 经销商代号 */
+    @Excel(name = "经销商代号")
+    private String chainsCode;
+
+    /** 省份 */
+    @Excel(name = "省份")
+    private String stateName;
+
+    /** 市 */
+    @Excel(name = "市")
+    private String cityName;
+
+    /** 区 */
+    @Excel(name = "区")
+    private String districtName;
+
+    /** 用户账号 */
+    @Excel(name = "用户账号")
+    private String userAccount;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    /** 用户号 */
+    @Excel(name = "用户号")
+    private String userNo;
+
+    /** 信用分 */
+    @Excel(name = "信用分")
+    private Long creditScore;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setIsDelete(String isDelete) 
+    {
+        this.isDelete = isDelete;
+    }
+
+    public String getIsDelete() 
+    {
+        return isDelete;
+    }
+    public void setChainsName(String chainsName) 
+    {
+        this.chainsName = chainsName;
+    }
+
+    public String getChainsName() 
+    {
+        return chainsName;
+    }
+    public void setChainsCode(String chainsCode) 
+    {
+        this.chainsCode = chainsCode;
+    }
+
+    public String getChainsCode() 
+    {
+        return chainsCode;
+    }
+    public void setStateName(String stateName) 
+    {
+        this.stateName = stateName;
+    }
+
+    public String getStateName() 
+    {
+        return stateName;
+    }
+    public void setCityName(String cityName) 
+    {
+        this.cityName = cityName;
+    }
+
+    public String getCityName() 
+    {
+        return cityName;
+    }
+    public void setDistrictName(String districtName) 
+    {
+        this.districtName = districtName;
+    }
+
+    public String getDistrictName() 
+    {
+        return districtName;
+    }
+    public void setUserAccount(String userAccount) 
+    {
+        this.userAccount = userAccount;
+    }
+
+    public String getUserAccount() 
+    {
+        return userAccount;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setUserNo(String userNo) 
+    {
+        this.userNo = userNo;
+    }
+
+    public String getUserNo() 
+    {
+        return userNo;
+    }
+    public void setCreditScore(Long creditScore) 
+    {
+        this.creditScore = creditScore;
+    }
+
+    public Long getCreditScore() 
+    {
+        return creditScore;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDelete", getIsDelete())
+            .append("chainsName", getChainsName())
+            .append("chainsCode", getChainsCode())
+            .append("stateName", getStateName())
+            .append("cityName", getCityName())
+            .append("districtName", getDistrictName())
+            .append("userAccount", getUserAccount())
+            .append("userName", getUserName())
+            .append("userNo", getUserNo())
+            .append("creditScore", getCreditScore())
+            .toString();
+    }
+}

suishenbang-order/src/main/resources/templates/order/customers/add.html

@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增经销商')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-customers-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否删除：</label>
+                <div class="col-sm-8">
+                    <input name="isDelete" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">经销商：</label>
+                <div class="col-sm-8">
+                    <input name="chainsName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">经销商代号：</label>
+                <div class="col-sm-8">
+                    <input name="chainsCode" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">省份：</label>
+                <div class="col-sm-8">
+                    <input name="stateName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">市：</label>
+                <div class="col-sm-8">
+                    <input name="cityName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">区：</label>
+                <div class="col-sm-8">
+                    <input name="districtName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户账号：</label>
+                <div class="col-sm-8">
+                    <input name="userAccount" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户名称：</label>
+                <div class="col-sm-8">
+                    <input name="userName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户号：</label>
+                <div class="col-sm-8">
+                    <input name="userNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">信用分：</label>
+                <div class="col-sm-8">
+                    <input name="creditScore" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script type="text/javascript">
+        var prefix = ctx + "order/customers"
+        $("#form-customers-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-customers-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

suishenbang-order/src/main/resources/templates/order/customers/customers.html

@@ -0,0 +1,133 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('经销商列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <p>经销商：</p>
+                                <input type="text" name="chainsName"/>
+                            </li>
+                            <li>
+                                <p>经销商代号：</p>
+                                <input type="text" name="chainsCode"/>
+                            </li>
+                            <li>
+                                <p>用户账号：</p>
+                                <input type="text" name="userAccount"/>
+                            </li>
+                            <li>
+                                <p>用户名称：</p>
+                                <input type="text" name="userName"/>
+                            </li>
+                            <li>
+                                <p>用户号：</p>
+                                <input type="text" name="userNo"/>
+                            </li>
+                            <li>
+                                <p>信用分：</p>
+                                <input type="text" name="creditScore"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:customers:add">-->
+                    <!--<i class="fa fa-plus"></i> 添加-->
+                <!--</a>-->
+                <!--<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:customers:edit">-->
+                    <!--<i class="fa fa-edit"></i> 修改-->
+                <!--</a>-->
+                <!--<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:customers:remove">-->
+                    <!--<i class="fa fa-remove"></i> 删除-->
+                <!--</a>-->
+                <!--<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:customers:export">-->
+                    <!--<i class="fa fa-download"></i> 导出-->
+                 <!--</a>-->
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('order:customers:info')}]];
+        var prefix = ctx + "order/customers";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                updateUrl: prefix + "/edit/{id}",
+                modalName: "经销商",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field : 'id', 
+                    title : 'id',
+                    visible: false
+                },
+                {
+                    field : 'chainsName', 
+                    title : '经销商'
+                },
+                {
+                    field : 'chainsCode', 
+                    title : '经销商代号'
+                },
+                {
+                    field : 'stateName', 
+                    title : '省份'
+                },
+                {
+                    field : 'cityName', 
+                    title : '市'
+                },
+                {
+                    field : 'districtName', 
+                    title : '区'
+                },
+                {
+                    field : 'userAccount', 
+                    title : '用户账号'
+                },
+                {
+                    field : 'userName', 
+                    title : '用户名称'
+                },
+                {
+                    field : 'userNo', 
+                    title : '用户号'
+                },
+                {
+                    field : 'creditScore', 
+                    title : '信用分'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

suishenbang-order/src/main/resources/templates/order/customers/edit.html

@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('经销商详情')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-customers-edit" th:object="${orderCustomers}" disabled>
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">经销商：</label>
+                <div class="col-sm-8">
+                    <input name="chainsName" th:field="*{chainsName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">经销商代号：</label>
+                <div class="col-sm-8">
+                    <input name="chainsCode" th:field="*{chainsCode}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">省份：</label>
+                <div class="col-sm-8">
+                    <input name="stateName" th:field="*{stateName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">市：</label>
+                <div class="col-sm-8">
+                    <input name="cityName" th:field="*{cityName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">区：</label>
+                <div class="col-sm-8">
+                    <input name="districtName" th:field="*{districtName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户账号：</label>
+                <div class="col-sm-8">
+                    <input name="userAccount" th:field="*{userAccount}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户名称：</label>
+                <div class="col-sm-8">
+                    <input name="userName" th:field="*{userName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">用户号：</label>
+                <div class="col-sm-8">
+                    <input name="userNo" th:field="*{userNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">信用分：</label>
+                <div class="col-sm-8">
+                    <input name="creditScore" th:field="*{creditScore}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script type="text/javascript">
+
+        function submitHandler() {
+
+        }
+    </script>
+</body>
+</html>

suishenbang-order/src/main/resources/templates/order/orderbase/add.html

@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增订单基础 订单的基础信息')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-orderbase-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">是否删除：</label>
+                <div class="col-sm-8">
+                    <input name="isDelete" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单所属 订单的所属公司：</label>
+                <div class="col-sm-8">
+                    <input name="orderBelong" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单号：</label>
+                <div class="col-sm-8">
+                    <input name="orderNumber" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单生成时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="orderCreationTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单金额：</label>
+                <div class="col-sm-8">
+                    <input name="orderAmount" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">冻结金额：</label>
+                <div class="col-sm-8">
+                    <input name="freezeAmount" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">未清金额：</label>
+                <div class="col-sm-8">
+                    <input name="unclearAmount" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发货未过账：</label>
+                <div class="col-sm-8">
+                    <input name="shipmentNotPosted" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发货已过账：</label>
+                <div class="col-sm-8">
+                    <input name="shipmentPosted" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单状态：</label>
+                <div class="col-sm-8">
+                    <select name="orderStatus" class="form-control m-b" th:with="type=${@dict.getType('order_type')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">到货地址：</label>
+                <div class="col-sm-8">
+                    <input name="shippingAddress" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">过信用时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="passCreditTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">期望到货开始时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="expectedStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">期望到货结束时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="expectedEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单结束时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="orderEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单所属：</label>
+                <div class="col-sm-8">
+                    <input name="belongTo" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script type="text/javascript">
+        var prefix = ctx + "order/orderbase"
+        $("#form-orderbase-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-orderbase-add').serialize());
+            }
+        }
+
+        $("input[name='orderCreationTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='passCreditTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='expectedStartTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='expectedEndTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $("input[name='orderEndTime']").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

suishenbang-order/src/main/resources/templates/order/orderbase/edit.html

@@ -0,0 +1,164 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改订单基础 订单的基础信息')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-orderbase-edit" th:object="${orderBase}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单所属 订单的所属公司：</label>
+                <div class="col-sm-8">
+                    <input name="orderBelong" th:field="*{orderBelong}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单号：</label>
+                <div class="col-sm-8">
+                    <input name="orderNumber" th:field="*{orderNumber}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单生成时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="orderCreationTime" th:value="${#dates.format(orderBase.orderCreationTime, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单金额：</label>
+                <div class="col-sm-8">
+                    <input name="orderAmount" th:field="*{orderAmount}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">冻结金额：</label>
+                <div class="col-sm-8">
+                    <input name="freezeAmount" th:field="*{freezeAmount}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">未清金额：</label>
+                <div class="col-sm-8">
+                    <input name="unclearAmount" th:field="*{unclearAmount}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发货未过账：</label>
+                <div class="col-sm-8">
+                    <input name="shipmentNotPosted" th:field="*{shipmentNotPosted}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">发货已过账：</label>
+                <div class="col-sm-8">
+                    <input name="shipmentPosted" th:field="*{shipmentPosted}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单状态：</label>
+                <div class="col-sm-8">
+                    <select name="orderStatus" class="form-control m-b" th:with="type=${@dict.getType('order_type')}" readonly="true">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{orderStatus}"></option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">到货地址：</label>
+                <div class="col-sm-8">
+                    <input name="shippingAddress" th:field="*{shippingAddress}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">过信用时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="passCreditTime" th:value="${#dates.format(orderBase.passCreditTime, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">期望到货开始时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="expectedStartTime" th:value="${#dates.format(orderBase.expectedStartTime, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">期望到货结束时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="expectedEndTime" th:value="${#dates.format(orderBase.expectedEndTime, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单结束时间：</label>
+                <div class="col-sm-8">
+                    <div class="input-group date">
+                        <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <input name="orderEndTime" th:value="${#dates.format(orderBase.orderEndTime, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
+                    </div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">订单所属：</label>
+                <div class="col-sm-8">
+                    <input name="belongTo" th:field="*{belongTo}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: datetimepicker-js" />
+    <script type="text/javascript">
+        $('input').attr('disabled',true);
+        var prefix = ctx + "order/orderbase";
+        $("#form-orderbase-edit").validate({
+            focusCleanup: true
+        });
+        function submitHandler() {
+            $.modal.close();
+        }
+
+
+        $("input[name='orderCreationTime']").datetimepicker({
+            format: "yyyy-MM-dd HH:mm:ss",
+            minView: "day",
+            autoclose: true
+        });
+
+        $("input[name='passCreditTime']").datetimepicker({
+            format: "yyyy-MM-dd HH:mm:ss",
+            minView: "day",
+            autoclose: true
+        });
+
+        $("input[name='expectedStartTime']").datetimepicker({
+            format: "yyyy-MM-dd HH:mm:ss",
+            minView: "day",
+            autoclose: true
+        });
+
+        $("input[name='expectedEndTime']").datetimepicker({
+            format: "yyyy-MM-dd HH:mm:ss",
+            minView: "day",
+            autoclose: true
+        });
+
+        $("input[name='orderEndTime']").datetimepicker({
+            format: "yyyy-MM-dd HH:mm:ss",
+            minView: "day",
+            autoclose: true
+        });
+    </script>
+</body>
+</html>

suishenbang-order/src/main/resources/templates/order/orderbase/orderbase.html

@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('订单基础 订单的基础信息列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <p>订单所属 订单的所属公司：</p>
+                                <input type="text" name="orderBelong"/>
+                            </li>
+                            <li>
+                                <p>订单号：</p>
+                                <input type="text" name="orderNumber"/>
+                            </li>
+                            <li class="select-time">
+                                <p>订单生成时间：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOrderCreationTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOrderCreationTime]"/>
+                            </li>
+                            <li>
+                                <p>订单状态：</p>
+                                <select name="orderStatus" th:with="type=${@dict.getType('order_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <p>到货地址：</p>
+                                <input type="text" name="shippingAddress"/>
+                            </li>
+                            <li class="select-time">
+                                <p>过信用时间：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginPassCreditTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endPassCreditTime]"/>
+                            </li>
+                            <li class="select-time">
+                                <p>期望到货开始时间：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginExpectedStartTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endExpectedStartTime]"/>
+                            </li>
+                            <li class="select-time">
+                                <p>期望到货结束时间：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginExpectedEndTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endExpectedEndTime]"/>
+                            </li>
+                            <li class="select-time">
+                                <p>订单结束时间：</p>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginOrderEndTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endOrderEndTime]"/>
+                            </li>
+                            <li>
+                                <p>订单所属：</p>
+                                <input type="text" name="belongTo"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="order:orderbase:add">-->
+                    <!--<i class="fa fa-plus"></i> 添加-->
+                <!--</a>-->
+                <!--<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="order:orderbase:edit">-->
+                    <!--<i class="fa fa-edit"></i> 修改-->
+                <!--</a>-->
+                <!--<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="order:orderbase:remove">-->
+                    <!--<i class="fa fa-remove"></i> 删除-->
+                <!--</a>-->
+                <!--<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="order:orderbase:export">-->
+                    <!--<i class="fa fa-download"></i> 导出-->
+                 <!--</a>-->
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('order:orderbase:edit')}]];
+        //var removeFlag = [[${@permission.hasPermi('order:orderbase:remove')}]];
+        var orderStatusDatas = [[${@dict.getType('order_type')}]];
+        var prefix = ctx + "order/orderbase";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                modalName: "订单基础 订单的基础信息",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field : 'id', 
+                    title : 'id',
+                    visible: false
+                },
+                {
+                    field : 'orderBelong', 
+                    title : '订单所属 订单的所属公司'
+                },
+                {
+                    field : 'orderNumber', 
+                    title : '订单号'
+                },
+                {
+                    field : 'orderCreationTime', 
+                    title : '订单生成时间'
+                },
+                {
+                    field : 'orderAmount', 
+                    title : '订单金额'
+                },
+                {
+                    field : 'freezeAmount', 
+                    title : '冻结金额'
+                },
+                {
+                    field : 'unclearAmount', 
+                    title : '未清金额'
+                },
+                {
+                    field : 'shipmentNotPosted', 
+                    title : '发货未过账'
+                },
+                {
+                    field : 'shipmentPosted', 
+                    title : '发货已过账'
+                },
+                {
+                    field : 'orderStatus', 
+                    title : '订单状态',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(orderStatusDatas, value);
+                    }
+                },
+                // {
+                //     field : 'shippingAddress',
+                //     title : '到货地址'
+                // },
+                // {
+                //     field : 'passCreditTime',
+                //     title : '过信用时间'
+                // },
+                // {
+                //     field : 'expectedStartTime',
+                //     title : '期望到货开始时间'
+                // },
+                // {
+                //     field : 'expectedEndTime',
+                //     title : '期望到货结束时间'
+                // },
+                // {
+                //     field : 'orderEndTime',
+                //     title : '订单结束时间'
+                // },
+                {
+                    field : 'belongTo', 
+                    title : '订单所属'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

suishenbang-quartz/src/main/java/com/dgtly/quartz/config/ScheduleConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.quartz.config;
+package com.dgtly.quartz.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/SynchronizationTask.java

@@ -0,0 +1,12 @@
+package com.dgtly.quartz.task;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 同步用户或部门的定时任务
+ */
+@Component("synchronizationTask")
+public class SynchronizationTask {
+
+
+}