订单提交

pine-admin/src/main/java/com/pine/admin/modules/business/controller/OrderController.java

@@ -33,18 +33,6 @@ public class OrderController extends BaseController {
 
     @Autowired
     private OrderService orderService;
-    /**
-     * <p>获取全部记录。</p>
-     */
-    @ApiOperation(value = "获取所有订单表数据", notes = "可以根据条件获取")
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    public Result all(Order record) {
-
-        List<Order> pp = orderService.getAllList(record);
-        return Result.success(true, pp);
-    }
-
-
     /**
      * <p>根据Id。</p>
      */
@@ -55,18 +43,6 @@ public class OrderController extends BaseController {
             Order data = orderService.getById(id);
         return Result.success(true, data);
     }
-
-    /**
-     * <p>根据条件获取。</p>
-     */
-    @ApiOperation(value = "获取订单表数据", notes = "根据条件获取")
-    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
-    public Result getOne(Order record) {
-
-            Order data = orderService.getOne(record);
-        return Result.success(true, data);
-    }
-
     /**
      * <p>分页查询。</p>
      */
@@ -84,20 +60,4 @@ public class OrderController extends BaseController {
     }
 
 
-
-    /**
-     * <p>更新信息。</p>
-     */
-    @ApiOperation(value = "更新一条订单表数据", notes = "更新一条订单表数据")
-    @RequestMapping(value = "/update", method = RequestMethod.PUT)
-    public Result updateOrder(Order record) {
-
-        boolean num = orderService.update(record);
-        if (num) {
-            return Result.success(true, "保存成功");
-        }
-        return Result.error("保存异常");
-    }
-
-
 }

pine-admin/src/main/java/com/pine/admin/modules/business/dao/CustomerDao.java

@@ -0,0 +1,17 @@
+package com.pine.admin.modules.business.dao;
+
+import com.pine.admin.modules.business.entity.Customer;
+import com.pine.admin.modules.base.binder.BaseDao;
+
+/**
+ * 会员表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 09:55:13
+ */
+public interface CustomerDao extends BaseDao<Customer> {
+
+    Customer getById(Long id);
+
+}

pine-admin/src/main/java/com/pine/admin/modules/business/dao/LogisticsCompanyDao.java

@@ -0,0 +1,16 @@
+package com.pine.admin.modules.business.dao;
+
+import com.pine.admin.modules.business.entity.LogisticsCompany;
+import com.pine.admin.modules.base.binder.BaseDao;
+
+/**
+ * 物流公司表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 16:34:09
+ */
+public interface LogisticsCompanyDao extends BaseDao<LogisticsCompany> {
+
+    LogisticsCompany byId(Long id);
+}

pine-admin/src/main/java/com/pine/admin/modules/business/dao/LogisticsTemplateDao.java

@@ -0,0 +1,16 @@
+package com.pine.admin.modules.business.dao;
+
+import com.pine.admin.modules.business.entity.LogisticsTemplate;
+import com.pine.admin.modules.base.binder.BaseDao;
+
+/**
+ * 物流模版表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 16:21:23
+ */
+public interface LogisticsTemplateDao extends BaseDao<LogisticsTemplate> {
+
+     LogisticsTemplate byId(Long id);
+}

pine-admin/src/main/java/com/pine/admin/modules/business/dao/OrderAttrDao.java

@@ -0,0 +1,15 @@
+package com.pine.admin.modules.business.dao;
+
+import com.pine.admin.modules.business.entity.OrderAttr;
+import com.pine.admin.modules.base.binder.BaseDao;
+
+/**
+ * 订单属性表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 10:44:20
+ */
+public interface OrderAttrDao extends BaseDao<OrderAttr> {
+    OrderAttr queryByOrderId(long orderId);
+}

pine-admin/src/main/java/com/pine/admin/modules/business/dao/OrderDao.java

@@ -11,5 +11,5 @@ import com.pine.admin.modules.base.binder.BaseDao;
  * @date 2019-10-11 15:44:20
  */
 public interface OrderDao extends BaseDao<Order> {
-
+        Order getById(Long id);
 }

pine-admin/src/main/java/com/pine/admin/modules/business/dao/OrderSkuDao.java

@@ -0,0 +1,18 @@
+package com.pine.admin.modules.business.dao;
+
+import com.pine.admin.modules.business.entity.OrderSku;
+import com.pine.admin.modules.base.binder.BaseDao;
+
+import java.util.List;
+
+/**
+ * 订单单品表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 10:24:35
+ */
+public interface OrderSkuDao extends BaseDao<OrderSku> {
+   List<OrderSku> queryByOrderId(Long orderId);
+
+}

pine-admin/src/main/java/com/pine/admin/modules/business/entity/Customer.java

@@ -0,0 +1,215 @@
+package com.pine.admin.modules.business.entity;
+
+        import java.math.BigDecimal;
+    import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 会员表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 09:55:13
+ */
+@Data
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@ApiModel(value = "会员表对象", description = "会员表对象")
+public class Customer implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", name = "id")
+    private Long id;
+    /**
+     * 用户名
+     */
+    @ApiModelProperty(value = "用户名", name = "username")
+    private String username;
+    /**
+     * 用户密码
+     */
+    @ApiModelProperty(value = "用户密码", name = "password")
+    private String password;
+    /**
+     * 昵称
+     */
+    @ApiModelProperty(value = "昵称", name = "nickname")
+    private String nickname;
+    /**
+     * 头像地址
+     */
+    @ApiModelProperty(value = "头像地址", name = "image")
+    private String image;
+    /**
+     * 真实姓名
+     */
+    @ApiModelProperty(value = "真实姓名", name = "relename")
+    private String relename;
+    /**
+     * 身份证
+     */
+    @ApiModelProperty(value = "身份证", name = "cardid")
+    private String cardid;
+    /**
+     * 性别  0 保密 1男 2女 默认0
+     */
+    @ApiModelProperty(value = "性别  0 保密 1男 2女 默认0", name = "gender")
+    private String gender;
+    /**
+     * 生日
+     */
+    @ApiModelProperty(value = "生日", name = "birthday")
+    private Date birthday;
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "手机号码", name = "mobile")
+    private String mobile;
+    /**
+     * 邮箱地址
+     */
+    @ApiModelProperty(value = "邮箱地址", name = "email")
+    private String email;
+    /**
+     * 更改中的邮箱（绑定新邮箱使用）
+     */
+    @ApiModelProperty(value = "更改中的邮箱（绑定新邮箱使用）", name = "modifiedEmail")
+    private String modifiedEmail;
+    /**
+     * 校验码（绑定新邮箱时使用）
+     */
+    @ApiModelProperty(value = "校验码（绑定新邮箱时使用）", name = "checkCode")
+    private String checkCode;
+    /**
+     * 省
+     */
+    @ApiModelProperty(value = "省", name = "province")
+    private Long province;
+    /**
+     * 市
+     */
+    @ApiModelProperty(value = "市", name = "city")
+    private Long city;
+    /**
+     * 区
+     */
+    @ApiModelProperty(value = "区", name = "county")
+    private Long county;
+    /**
+     * 详细地址
+     */
+    @ApiModelProperty(value = "详细地址", name = "detailaddress")
+    private String detailaddress;
+    /**
+     * 兴趣爱好
+     */
+    @ApiModelProperty(value = "兴趣爱好", name = "interest")
+    private String interest;
+    /**
+     * 店铺id  平台的为0  默认为平台
+     */
+    @ApiModelProperty(value = "店铺id  平台的为0  默认为平台", name = "storeId")
+    private Long storeId;
+    /**
+     * 1 普通用户 2 商家店铺用户 3 店铺员工
+     */
+    @ApiModelProperty(value = "1 普通用户 2 商家店铺用户 3 店铺员工", name = "type")
+    private String type;
+    /**
+     * 总的消费金额
+     */
+    @ApiModelProperty(value = "总的消费金额", name = "consumptionAmount")
+    private BigDecimal consumptionAmount;
+    /**
+     * 预存款支付密码
+     */
+    @ApiModelProperty(value = "预存款支付密码", name = "paypassword")
+    private String paypassword;
+
+    /**
+     * 用户状态 1 正常 2 冻结  3 未启用 默认1
+     */
+    @ApiModelProperty(value = "用户状态 1 正常 2 冻结  3 未启用 默认1 ", name = "status")
+    private String status;
+    /**
+     * 会员签到次数
+     */
+    @ApiModelProperty(value = "会员签到次数", name = "signNum")
+    private Integer signNum;
+    /**
+     * 手机是否验证  0 否 1 验证 默认0
+     */
+    @ApiModelProperty(value = "手机是否验证  0 否 1 验证 默认0 ", name = "isMobileVerification")
+    private String isMobileVerification;
+    /**
+     * 邮箱是否验证   0 否 1 验证  默认0
+     */
+    @ApiModelProperty(value = "邮箱是否验证   0 否 1 验证  默认0  ", name = "isEmailVerification")
+    private String isEmailVerification;
+    /**
+     * 错误登录的次数
+     */
+    @ApiModelProperty(value = "错误登录的次数", name = "loginErrorCount")
+    private Integer loginErrorCount;
+    /**
+     * 删除标记 0 未删除 1删除 默认0
+     */
+    @ApiModelProperty(value = "删除标记 0 未删除 1删除 默认0 ", name = "delFlag")
+    private String delFlag;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", name = "createTime")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间", name = "modifyTime")
+    private Date modifyTime;
+    /**
+     * 删除时间
+     */
+    @ApiModelProperty(value = "删除时间", name = "delTime")
+    private Date delTime;
+    /**
+     * 锁定时间
+     */
+    @ApiModelProperty(value = "锁定时间", name = "lockTime")
+    private Date lockTime;
+    /**
+     * 最近登陆时间
+     */
+    @ApiModelProperty(value = "最近登陆时间", name = "lastLoginTime")
+    private Date lastLoginTime;
+    /**
+     * 推荐人的会员id  如果没有 则为-1  默认为-1
+     */
+    @ApiModelProperty(value = "推荐人的会员id  如果没有 则为-1  默认为-1", name = "recommended")
+    private Long recommended;
+    /**
+     * 会员自己的推荐码
+     */
+    @ApiModelProperty(value = "会员自己的推荐码", name = "selfRecommendCode")
+    private String selfRecommendCode;
+    /**
+     * 会员的佣金
+     */
+    @ApiModelProperty(value = "会员的佣金", name = "commission")
+    private BigDecimal commission;
+    /**
+     * 会员所属的店铺id
+     */
+    @ApiModelProperty(value = "会员所属的店铺id", name = "beloneStoreId")
+    private Long beloneStoreId;
+
+}

pine-admin/src/main/java/com/pine/admin/modules/business/entity/LogisticsCompany.java

@@ -0,0 +1,72 @@
+package com.pine.admin.modules.business.entity;
+
+    import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 物流公司表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 16:34:09
+ */
+@Data
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@ApiModel(value = "物流公司表对象", description = "物流公司表对象")
+public class LogisticsCompany implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", name = "id")
+    private Long id;
+    /**
+     * 物流公司名称
+     */
+    @ApiModelProperty(value = "物流公司名称", name = "name")
+    private String name;
+    /**
+     * 物流公司代码
+     */
+    @ApiModelProperty(value = "物流公司代码", name = "code")
+    private String code;
+    /**
+     * 快递100 code
+     */
+    @ApiModelProperty(value = "快递100 code", name = "express100Code")
+    private String express100Code;
+    /**
+     * 店铺id   平台的为0  默认为0
+     */
+    @ApiModelProperty(value = "店铺id   平台的为0  默认为0 ", name = "storeId")
+    private Long storeId;
+    /**
+     * 删除标记  0未删除 1 删除  默认0
+     */
+    @ApiModelProperty(value = "删除标记  0未删除 1 删除  默认0	", name = "delFlag")
+    private String delFlag;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", name = "createTime")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间", name = "modifyTime")
+    private Date modifyTime;
+    /**
+     * 删除时间
+     */
+    @ApiModelProperty(value = "删除时间", name = "delTime")
+    private Date delTime;
+
+}

pine-admin/src/main/java/com/pine/admin/modules/business/entity/LogisticsTemplate.java

@@ -0,0 +1,86 @@
+package com.pine.admin.modules.business.entity;
+
+    import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 物流模版表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 16:21:23
+ */
+@Data
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@ApiModel(value = "物流模版表对象", description = "物流模版表对象")
+public class LogisticsTemplate implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", name = "id")
+    private Integer id;
+    /**
+     * 物流公司id
+     */
+    @ApiModelProperty(value = "物流公司id", name = "companyId")
+    private Long companyId;
+    /**
+     * 物流模版名称
+     */
+    @ApiModelProperty(value = "物流模版名称", name = "name")
+    private String name;
+    /**
+     * 是否默认模版 0 是 1 否 默认1
+     */
+    @ApiModelProperty(value = "是否默认模版 0 是 1 否 默认1 ", name = "isDefault")
+    private String isDefault;
+    /**
+     * 谁承担运费 0 买家 1 商家 默认 0 买家
+     */
+    @ApiModelProperty(value = "谁承担运费 0 买家 1 商家 默认 0 买家", name = "freightBear")
+    private String freightBear;
+    /**
+     * 计价方式 0 按件  1 按重量  默认0
+     */
+    @ApiModelProperty(value = "计价方式 0 按件  1 按重量  默认0 ", name = "pricintMethod")
+    private String pricintMethod;
+    /**
+     * 店铺id  平台的为 0
+     */
+    @ApiModelProperty(value = "店铺id  平台的为 0 ", name = "storeId")
+    private Long storeId;
+    /**
+     * 删除标记 0 未删除 1 删除 默认0
+     */
+    @ApiModelProperty(value = "删除标记 0 未删除 1 删除 默认0 ", name = "delFlag")
+    private String delFlag;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", name = "createTime")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间", name = "modifyTime")
+    private Date modifyTime;
+    /**
+     * 删除时间
+     */
+    @ApiModelProperty(value = "删除时间", name = "delTime")
+    private Date delTime;
+    /**
+     * 物流公司
+     */
+    private LogisticsCompany logisticsCompany;
+
+}

pine-admin/src/main/java/com/pine/admin/modules/business/entity/Order.java

@@ -2,6 +2,7 @@ package com.pine.admin.modules.business.entity;
 
 import java.math.BigDecimal;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,9 +10,11 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 订单表
@@ -184,42 +187,58 @@ public class Order implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间", name = "createTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     /**
      * 支付时间
      */
     @ApiModelProperty(value = "支付时间", name = "payTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date payTime;
     /**
      * 发货时间
      */
     @ApiModelProperty(value = "发货时间", name = "deliveryTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date deliveryTime;
     /**
      * 确认收货时间
      */
     @ApiModelProperty(value = "确认收货时间", name = "receivingTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date receivingTime;
     /**
      * 订单取消时间
      */
     @ApiModelProperty(value = "订单取消时间", name = "cancelTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cancelTime;
     /**
      * 修改时间
      */
     @ApiModelProperty(value = "修改时间", name = "modifyTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date modifyTime;
     /**
      * 订单评价时间
      */
     @ApiModelProperty(value = "订单评价时间", name = "evaluationTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date evaluationTime;
     /**
      * 预售订单的时间
      * 对于定金预售 则是第二阶段付款时间 和发货时间 对于全款预售 则是发货时间
      */
     @ApiModelProperty(value = "预售订单的时间", name = "presaleTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date presaleTime;
     /**
      * 是否团长  0 是 1 否  当订单为拼团订单的时候有用
@@ -255,6 +274,8 @@ public class Order implements Serializable {
      * 开团时间
      */
     @ApiModelProperty(value = "开团时间", name = "openGroupTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date openGroupTime;
     /**
      * 拼团订单定时任务处理状态 '0'未处理 '1'已处理 默认'0'
@@ -341,6 +362,12 @@ public class Order implements Serializable {
      */
     @ApiModelProperty(value = "收货人", name = "customerName")
     private String customerName;
+    /**
+     * 收货人手机号
+     */
+    @ApiModelProperty(value = "收货人手机号", name = "customerMobile")
+    private String customerMobile;
+
     /**
      * 开始时间
      */
@@ -351,5 +378,17 @@ public class Order implements Serializable {
      */
     @ApiModelProperty(value = "结束时间", name = "endTime")
     private String endTime;
-
+    /**
+     * 订单商品信息
+     */
+    private List<OrderSku> orderSkus;
+    /**
+     * 订单附属信息
+     */
+    private OrderAttr orderAttr;
+    /**
+     * 物流模板信息
+     * LogisticsTemplate
+     */
+    private LogisticsTemplate logisticsTemplate;
 }

pine-admin/src/main/java/com/pine/admin/modules/business/entity/OrderAttr.java

@@ -0,0 +1,174 @@
+package com.pine.admin.modules.business.entity;
+
+    import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 订单属性表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 10:44:20
+ */
+@Data
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@ApiModel(value = "订单属性表对象", description = "订单属性表对象")
+public class OrderAttr implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", name = "id")
+    private Long id;
+    /**
+     * 订单id  对应ls_order 表中的order_code
+     */
+    @ApiModelProperty(value = "订单id  对应ls_order 表中的order_code", name = "orderId")
+    private Long orderId;
+    /**
+     * 收货人姓名
+     */
+    @ApiModelProperty(value = "收货人姓名", name = "receiptName")
+    private String receiptName;
+    /**
+     * 收货人的地址 （省＋市＋区）
+     */
+    @ApiModelProperty(value = "收货人的地址 （省＋市＋区）", name = "receiptAddress")
+    private String receiptAddress;
+    /**
+     * 收货人的详细地址
+     */
+    @ApiModelProperty(value = "收货人的详细地址", name = "receiptDetailAddress")
+    private String receiptDetailAddress;
+    /**
+     * 收货人的手机号码
+     */
+    @ApiModelProperty(value = "收货人的手机号码", name = "receiptMobile")
+    private String receiptMobile;
+    /**
+     * 收货人的固定电话
+     */
+    @ApiModelProperty(value = "收货人的固定电话", name = "receiptPhone")
+    private String receiptPhone;
+    /**
+     * 收货人的邮编
+     */
+    @ApiModelProperty(value = "收货人的邮编", name = "receiptZipCode")
+    private String receiptZipCode;
+    /**
+     * 发票类型  0 不需要发票 1增值税普票 2增值税专票 默认0
+     */
+    @ApiModelProperty(value = "发票类型  0 不需要发票 1增值税普票 2增值税专票 默认0", name = "invoiceType")
+    private String invoiceType;
+    /**
+     * 发票抬头
+     */
+    @ApiModelProperty(value = "发票抬头", name = "invoiceTitle")
+    private String invoiceTitle;
+    /**
+     * 发票内容
+1:非图书商品
+2:明细
+3:耗材
+4:办公用品
+     */
+    private String invoiceContent;
+    /**
+     * 税号
+     */
+    @ApiModelProperty(value = "税号", name = "invoiceTaxid")
+    private String invoiceTaxid;
+    /**
+     * 订单备注
+     */
+    @ApiModelProperty(value = "订单备注", name = "remark")
+    private String remark;
+    /**
+     * 订单的赠品信息格式为
+[
+    {
+        "num": 1,
+        "skuId": "15096899899251410",
+        "skuName": "平台商品(规格5)",
+        "skuNo": "201711031419380",
+        "specs": "版本:规格5|",
+        "url": "http://lecshop.b0.upaiyun.com/1509689972311.jpg"
+    }
+]
+     */
+    private String giftInfos;
+    /**
+     * 捐赠寄语
+     */
+    @ApiModelProperty(value = "捐赠寄语", name = "donationMessage")
+    private String donationMessage;
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(value = "单位名称", name = "invoiceCompanyName")
+    private String invoiceCompanyName;
+    /**
+     * 注册地址
+     */
+    @ApiModelProperty(value = "注册地址", name = "invoiceRegisterAddress")
+    private String invoiceRegisterAddress;
+    /**
+     * 注册电话
+     */
+    @ApiModelProperty(value = "注册电话", name = "invoiceRegisterMobile")
+    private String invoiceRegisterMobile;
+    /**
+     * 开户银行
+     */
+    @ApiModelProperty(value = "开户银行", name = "invoiceOpenBank")
+    private String invoiceOpenBank;
+    /**
+     * 银行账户
+     */
+    @ApiModelProperty(value = "银行账户", name = "invoiceBankAccount")
+    private String invoiceBankAccount;
+    /**
+     * 抬头类型  1 企业  2 个人
+     */
+    @ApiModelProperty(value = "抬头类型  1 企业  2 个人 ", name = "invoiceTitleType")
+    private String invoiceTitleType;
+    /**
+     * 送达时间 社区团购使用
+     */
+    @ApiModelProperty(value = "送达时间 社区团购使用", name = "deliveryTime")
+    private Date deliveryTime;
+    /**
+     * 所在地区 省+市+区 社区团购使用
+     */
+    @ApiModelProperty(value = "所在地区 省+市+区 社区团购使用", name = "address")
+    private String address;
+    /**
+     * 详细信息 取货小区 社区团购使用
+     */
+    @ApiModelProperty(value = "详细信息 取货小区 社区团购使用", name = "detailAddress")
+    private String detailAddress;
+    /**
+     * 提货点 社区团购使用
+     */
+    @ApiModelProperty(value = "提货点 社区团购使用", name = "pickUpAddress")
+    private String pickUpAddress;
+    /**
+     * 提货方式 1 团长送货上门 2 自提
+     */
+    @ApiModelProperty(value = "提货方式 1 团长送货上门 2 自提", name = "deliveryType")
+    private String deliveryType;
+    /**
+     * 门牌号 社区团购使用
+     */
+    @ApiModelProperty(value = "门牌号 社区团购使用", name = "houseNumber")
+    private String houseNumber;
+
+}

pine-admin/src/main/java/com/pine/admin/modules/business/entity/OrderSku.java

@@ -0,0 +1,103 @@
+package com.pine.admin.modules.business.entity;
+
+        import java.math.BigDecimal;
+    import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 订单单品表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 10:24:35
+ */
+@Data
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
+@ApiModel(value = "订单单品表对象", description = "订单单品表对象")
+public class OrderSku implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", name = "id")
+    private Long id;
+    /**
+     * 订单id  对应ls_order表中的order_code
+     */
+    @ApiModelProperty(value = "订单id  对应ls_order表中的order_code", name = "orderId")
+    private Long orderId;
+    /**
+     * 单品id 对应ls_sku 表中的id
+     */
+    @ApiModelProperty(value = "单品id 对应ls_sku 表中的id", name = "skuId")
+    private String skuId;
+    /**
+     * 购买的数量
+     */
+    @ApiModelProperty(value = "购买的数量", name = "num")
+    private Integer num;
+    /**
+     * 单品的最终价格（原价－优惠价）
+     */
+    @ApiModelProperty(value = "单品的最终价格（原价－优惠价）", name = "price")
+    private BigDecimal price;
+    /**
+     * 单品的价格(详情页的价格)
+     */
+    @ApiModelProperty(value = "单品的价格(详情页的价格)", name = "skuPrice")
+    private BigDecimal skuPrice;
+    /**
+     * 单品的名称
+     */
+    @ApiModelProperty(value = "单品的名称", name = "skuName")
+    private String skuName;
+    /**
+     * 单品的编号
+     */
+    @ApiModelProperty(value = "单品的编号", name = "skuNo")
+    private String skuNo;
+    /**
+     * 单品的图片
+     */
+    @ApiModelProperty(value = "单品的图片", name = "skuImage")
+    private String skuImage;
+    /**
+     * 单品的规格
+     */
+    @ApiModelProperty(value = "单品的规格", name = "skuSpecs")
+    private String skuSpecs;
+    /**
+     * 使用各个优惠减去的价格（这个字段为了方便扩展使用的是json格式）
+     */
+    @ApiModelProperty(value = "使用各个优惠减去的价格（这个字段为了方便扩展使用的是json格式）", name = "priceDetail")
+    private String priceDetail;
+    /**
+     * 单品的分拥比例 0 表示不分佣金
+     */
+    @ApiModelProperty(value = "单品的分拥比例 0 表示不分佣金", name = "commissionRate")
+    private BigDecimal commissionRate;
+    /**
+     * 分类扣率
+     */
+    @ApiModelProperty(value = "分类扣率", name = "cateRate")
+    private BigDecimal cateRate;
+    /**
+     * 单品的原价格（社区团购的时候使用）
+     */
+    @ApiModelProperty(value = "单品的原价格（社区团购的时候使用）", name = "oldPrice")
+    private BigDecimal oldPrice;
+    /**
+     * 供货价格（社区团购使用）
+     */
+    @ApiModelProperty(value = "供货价格（社区团购使用）", name = "supplyPrice")
+    private BigDecimal supplyPrice;
+
+}

pine-admin/src/main/java/com/pine/admin/modules/business/service/CustomerService.java

@@ -0,0 +1,16 @@
+package com.pine.admin.modules.business.service;
+
+import com.pine.admin.modules.business.entity.Customer;
+import com.pine.admin.modules.base.binder.BaseService;
+
+/**
+ * 会员表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 09:55:13
+ */
+public interface CustomerService extends BaseService<Customer> {
+
+}
+

pine-admin/src/main/java/com/pine/admin/modules/business/service/LogisticsTemplateService.java

@@ -0,0 +1,23 @@
+package com.pine.admin.modules.business.service;
+
+import com.pine.admin.modules.business.entity.LogisticsTemplate;
+import com.pine.admin.modules.base.binder.BaseService;
+
+/**
+ * 物流模版表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 16:21:23
+ */
+public interface LogisticsTemplateService extends BaseService<LogisticsTemplate> {
+
+    /**
+     * 查询运费模版信息
+     *
+     * @param id      运费模版id
+     * @return 返回运费模版 (运费模版信息和运费模版的公司信息)
+     */
+    LogisticsTemplate queryLogisticsTemplateWithCompany(long id);
+}
+

pine-admin/src/main/java/com/pine/admin/modules/business/service/OrderAttrService.java

@@ -0,0 +1,17 @@
+package com.pine.admin.modules.business.service;
+
+import com.pine.admin.modules.business.entity.OrderAttr;
+import com.pine.admin.modules.base.binder.BaseService;
+
+/**
+ * 订单属性表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 10:44:20
+ */
+public interface OrderAttrService extends BaseService<OrderAttr> {
+
+    OrderAttr queryByOrderId(long orderId);
+}
+

pine-admin/src/main/java/com/pine/admin/modules/business/service/OrderService.java

@@ -12,5 +12,10 @@ import com.pine.admin.modules.base.binder.BaseService;
  */
 public interface OrderService extends BaseService<Order> {
 
+    /**
+     * 填充订单详细信息
+     * @param order
+     */
+    void FullOrderInfo(Order order);
 }
 

pine-admin/src/main/java/com/pine/admin/modules/business/service/OrderSkuService.java

@@ -0,0 +1,26 @@
+package com.pine.admin.modules.business.service;
+
+import com.pine.admin.modules.business.entity.OrderSku;
+import com.pine.admin.modules.base.binder.BaseService;
+
+import java.util.List;
+
+/**
+ * 订单单品表
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019-10-14 10:24:35
+ */
+public interface OrderSkuService extends BaseService<OrderSku> {
+
+    /**
+     * 根据订单id查询订单商品信息
+     *
+     * @param orderId 订单id
+     * @return 返回订单商品信息
+     */
+
+    List<OrderSku> queryByOrderId(Long orderId);
+}
+

pine-admin/src/main/java/com/pine/admin/modules/business/service/impl/CustomerServiceImpl.java

@@ -0,0 +1,168 @@
+package com.pine.admin.modules.business.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import lombok.extern.slf4j.Slf4j;
+import com.pine.common.dto.Page;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.pine.admin.modules.business.dao.CustomerDao;
+import com.pine.admin.modules.business.entity.Customer;
+import com.pine.admin.modules.business.service.CustomerService;
+
+
+@Service("customerService")
+@Slf4j
+public class CustomerServiceImpl implements CustomerService {
+
+    @Autowired
+    private CustomerDao customerDao;
+
+
+    @Override
+    @Transactional
+    public List<Customer> getAllList(Customer record) {
+
+        log.info("getCustomerList");
+        try {
+
+            return customerDao.queryAll(record);
+        } catch (Exception e) {
+            log.error("getCustomerList", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public List<Customer> getByPage(Page page, Customer record) {
+
+        log.info("getCustomerByPage");
+        try {
+
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put("page", page);
+
+            return customerDao.queryByPage(parameter);
+        } catch (Exception e) {
+            log.error("getCustomerByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public Customer getById(String id) {
+
+        log.info("getCustomerById");
+        try {
+
+            return customerDao.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+            log.error("getCustomerById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public Customer getOne(Customer record) {
+
+        log.info("getCustomer");
+        try {
+
+            return customerDao.queryOne(record);
+        } catch (Exception e) {
+            log.error("getCustomer", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public boolean create(Customer record) {
+
+        log.info("createCustomer");
+        try {
+
+            int updates = customerDao.insertSelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("createCustomer", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean delete(String id) {
+
+        log.info("deleteCustomer");
+        try {
+
+            int updates = customerDao.delete(Integer.valueOf(id));
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("deleteCustomer", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean deltetByIds(String ids) {
+
+        log.info("deleteeCustomer byIDS");
+        try {
+
+            String[] id = ids.split(";");
+            int updates = customerDao.deleteIds(id);
+
+            if (id.length == updates) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("deleteeCustomer byIDS", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean update(Customer record) {
+
+        log.info("updateCustomer");
+        try {
+
+            int updates = customerDao.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("updateCustomer", e);
+        }
+
+        return false;
+    }
+
+}

pine-admin/src/main/java/com/pine/admin/modules/business/service/impl/LogisticsTemplateServiceImpl.java

@@ -0,0 +1,185 @@
+package com.pine.admin.modules.business.service.impl;
+
+import com.pine.admin.modules.business.dao.LogisticsCompanyDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import lombok.extern.slf4j.Slf4j;
+import com.pine.common.dto.Page;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.pine.admin.modules.business.dao.LogisticsTemplateDao;
+import com.pine.admin.modules.business.entity.LogisticsTemplate;
+import com.pine.admin.modules.business.service.LogisticsTemplateService;
+
+
+@Service("logisticsTemplateService")
+@Slf4j
+public class LogisticsTemplateServiceImpl implements LogisticsTemplateService {
+
+    @Autowired
+    private LogisticsTemplateDao logisticsTemplateDao;
+    @Autowired
+    private LogisticsCompanyDao logisticsCompanyDao;
+
+    @Override
+    @Transactional
+    public List<LogisticsTemplate> getAllList(LogisticsTemplate record) {
+
+        log.info("getLogisticsTemplateList");
+        try {
+
+            return logisticsTemplateDao.queryAll(record);
+        } catch (Exception e) {
+            log.error("getLogisticsTemplateList", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public List<LogisticsTemplate> getByPage(Page page, LogisticsTemplate record) {
+
+        log.info("getLogisticsTemplateByPage");
+        try {
+
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put("page", page);
+
+            return logisticsTemplateDao.queryByPage(parameter);
+        } catch (Exception e) {
+            log.error("getLogisticsTemplateByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public LogisticsTemplate getById(String id) {
+
+        log.info("getLogisticsTemplateById");
+        try {
+
+            return logisticsTemplateDao.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+            log.error("getLogisticsTemplateById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public LogisticsTemplate getOne(LogisticsTemplate record) {
+
+        log.info("getLogisticsTemplate");
+        try {
+
+            return logisticsTemplateDao.queryOne(record);
+        } catch (Exception e) {
+            log.error("getLogisticsTemplate", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public boolean create(LogisticsTemplate record) {
+
+        log.info("createLogisticsTemplate");
+        try {
+
+            int updates = logisticsTemplateDao.insertSelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("createLogisticsTemplate", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean delete(String id) {
+
+        log.info("deleteLogisticsTemplate");
+        try {
+
+            int updates = logisticsTemplateDao.delete(Integer.valueOf(id));
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("deleteLogisticsTemplate", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean deltetByIds(String ids) {
+
+        log.info("deleteeLogisticsTemplate byIDS");
+        try {
+
+            String[] id = ids.split(";");
+            int updates = logisticsTemplateDao.deleteIds(id);
+
+            if (id.length == updates) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("deleteeLogisticsTemplate byIDS", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean update(LogisticsTemplate record) {
+
+        log.info("updateLogisticsTemplate");
+        try {
+
+            int updates = logisticsTemplateDao.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("updateLogisticsTemplate", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public LogisticsTemplate queryLogisticsTemplateWithCompany(long id) {
+        log.debug("queryLogisticsTemplateWithCompany and id:{} \r\n storeId;{}", id);
+
+
+        LogisticsTemplate logisticsTemplate = logisticsTemplateDao.byId(id);
+
+        if (Objects.isNull(logisticsTemplate)) {
+            return logisticsTemplate;
+        }
+        System.out.println(">>>>>>>   " +logisticsTemplate.getCompanyId());
+        logisticsTemplate.setLogisticsCompany(logisticsCompanyDao.byId(logisticsTemplate.getCompanyId()));
+        return logisticsTemplate;
+    }
+}

pine-admin/src/main/java/com/pine/admin/modules/business/service/impl/OrderAttrServiceImpl.java

@@ -0,0 +1,174 @@
+package com.pine.admin.modules.business.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import lombok.extern.slf4j.Slf4j;
+import com.pine.common.dto.Page;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.pine.admin.modules.business.dao.OrderAttrDao;
+import com.pine.admin.modules.business.entity.OrderAttr;
+import com.pine.admin.modules.business.service.OrderAttrService;
+
+
+@Service("orderAttrService")
+@Slf4j
+public class OrderAttrServiceImpl implements OrderAttrService {
+
+    @Autowired
+    private OrderAttrDao orderAttrDao;
+
+
+    @Override
+    @Transactional
+    public List<OrderAttr> getAllList(OrderAttr record) {
+
+        log.info("getOrderAttrList");
+        try {
+
+            return orderAttrDao.queryAll(record);
+        } catch (Exception e) {
+            log.error("getOrderAttrList", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    public OrderAttr queryByOrderId(long orderId) {
+        log.debug("queryByOrderId and orderId:{}", orderId);
+        return orderAttrDao.queryByOrderId(orderId);
+    }
+
+    @Override
+    @Transactional
+    public List<OrderAttr> getByPage(Page page, OrderAttr record) {
+
+        log.info("getOrderAttrByPage");
+        try {
+
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put("page", page);
+
+            return orderAttrDao.queryByPage(parameter);
+        } catch (Exception e) {
+            log.error("getOrderAttrByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public OrderAttr getById(String id) {
+
+        log.info("getOrderAttrById");
+        try {
+
+            return orderAttrDao.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+            log.error("getOrderAttrById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public OrderAttr getOne(OrderAttr record) {
+
+        log.info("getOrderAttr");
+        try {
+
+            return orderAttrDao.queryOne(record);
+        } catch (Exception e) {
+            log.error("getOrderAttr", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public boolean create(OrderAttr record) {
+
+        log.info("createOrderAttr");
+        try {
+
+            int updates = orderAttrDao.insertSelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("createOrderAttr", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean delete(String id) {
+
+        log.info("deleteOrderAttr");
+        try {
+
+            int updates = orderAttrDao.delete(Integer.valueOf(id));
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("deleteOrderAttr", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean deltetByIds(String ids) {
+
+        log.info("deleteeOrderAttr byIDS");
+        try {
+
+            String[] id = ids.split(";");
+            int updates = orderAttrDao.deleteIds(id);
+
+            if (id.length == updates) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("deleteeOrderAttr byIDS", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean update(OrderAttr record) {
+
+        log.info("updateOrderAttr");
+        try {
+
+            int updates = orderAttrDao.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("updateOrderAttr", e);
+        }
+
+        return false;
+    }
+
+}

pine-admin/src/main/java/com/pine/admin/modules/business/service/impl/OrderServiceImpl.java

@@ -1,12 +1,20 @@
 package com.pine.admin.modules.business.service.impl;
 
+import com.pine.admin.modules.business.dao.CustomerDao;
+import com.pine.admin.modules.business.entity.Customer;
+import com.pine.admin.modules.business.service.LogisticsTemplateService;
+import com.pine.admin.modules.business.service.OrderAttrService;
+import com.pine.admin.modules.business.service.OrderSkuService;
 import com.pine.admin.shiro.ShiroUtils;
+import com.pine.common.exception.ApiException;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import lombok.extern.slf4j.Slf4j;
 import com.pine.common.dto.Page;
@@ -23,6 +31,14 @@ public class OrderServiceImpl implements OrderService {
 
     @Autowired
     private OrderDao orderDao;
+    @Autowired
+    private CustomerDao customerDao;
+    @Autowired
+    private OrderSkuService orderSkuService;
+    @Autowired
+    private OrderAttrService orderAttrService;
+    @Autowired
+    private LogisticsTemplateService logisticsTemplateService;
 
 
     @Override
@@ -31,7 +47,6 @@ public class OrderServiceImpl implements OrderService {
 
         log.info("getOrderList");
         try {
-
             return orderDao.queryAll(record);
         } catch (Exception e) {
             log.error("getOrderList", e);
@@ -47,7 +62,7 @@ public class OrderServiceImpl implements OrderService {
         log.info("getOrderByPage");
         try {
             if (!ShiroUtils.getShiroUserInfo().getName().contains("超级管理员")) {
-                record.setDealerId(Long.valueOf(ShiroUtils.getShiroUserInfo().getDealerID()));
+                record.setDealerId(ShiroUtils.getShiroUserInfo().getDealerID());
             }
             Map<String, Object> parameter = new HashMap<String, Object>();
             parameter.put("record", record);
@@ -67,14 +82,28 @@ public class OrderServiceImpl implements OrderService {
         log.info("getOrderById");
         try {
 
-            return orderDao.selectByPrimaryKey(Integer.valueOf(id));
+            Order order = orderDao.getById(Long.valueOf(id));
+            if (!ShiroUtils.getShiroUserInfo().getName().contains("超级管理员")) {
+               if (!order.getDealerId().equals(ShiroUtils.getShiroUserInfo().getDealerID())){
+                   throw new ApiException("无权限查看");
+               }
+            }
+            if (Objects.isNull(order)) {
+                log.error("order is not exist");
+                return order;
+            }
+
+            this.FullOrderInfo(order);
+            return order;
         } catch (Exception e) {
+
             log.error("getOrderById", e);
-        }
+            throw new ApiException(e.getMessage());
 
-        return null;
+        }
     }
 
+
     @Override
     @Transactional
     public Order getOne(Order record) {
@@ -167,4 +196,21 @@ public class OrderServiceImpl implements OrderService {
         return false;
     }
 
+    @Override
+    public void FullOrderInfo(Order order) {
+        //填充会员信息
+        Customer customer = customerDao.getById(order.getCustomerId());
+        if (Objects.nonNull(customer)) {
+            order.setCustomerName(customer.getUsername());
+            order.setCustomerMobile(customer.getMobile());
+        } else {
+            order.setCustomerName("");
+            order.setCustomerMobile("");
+        }
+        order.setOrderSkus(orderSkuService.queryByOrderId(order.getId()));
+        // 设置订单的附属信息
+        order.setOrderAttr(orderAttrService.queryByOrderId(order.getId()));
+        //设置物流模板信息
+        order.setLogisticsTemplate(logisticsTemplateService.queryLogisticsTemplateWithCompany(order.getFreightTemplateId()));
+    }
 }

pine-admin/src/main/java/com/pine/admin/modules/business/service/impl/OrderSkuServiceImpl.java

@@ -0,0 +1,173 @@
+package com.pine.admin.modules.business.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import lombok.extern.slf4j.Slf4j;
+import com.pine.common.dto.Page;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.pine.admin.modules.business.dao.OrderSkuDao;
+import com.pine.admin.modules.business.entity.OrderSku;
+import com.pine.admin.modules.business.service.OrderSkuService;
+
+
+@Service("orderSkuService")
+@Slf4j
+public class OrderSkuServiceImpl implements OrderSkuService {
+
+    @Autowired
+    private OrderSkuDao orderSkuDao;
+
+
+    @Override
+    @Transactional
+    public List<OrderSku> getAllList(OrderSku record) {
+
+        log.info("getOrderSkuList");
+        try {
+
+            return orderSkuDao.queryAll(record);
+        } catch (Exception e) {
+            log.error("getOrderSkuList", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public List<OrderSku> getByPage(Page page, OrderSku record) {
+
+        log.info("getOrderSkuByPage");
+        try {
+
+            Map<String, Object> parameter = new HashMap<String, Object>();
+            parameter.put("record", record);
+            parameter.put("page", page);
+
+            return orderSkuDao.queryByPage(parameter);
+        } catch (Exception e) {
+            log.error("getOrderSkuByPage", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public OrderSku getById(String id) {
+
+        log.info("getOrderSkuById");
+        try {
+
+            return orderSkuDao.selectByPrimaryKey(Integer.valueOf(id));
+        } catch (Exception e) {
+            log.error("getOrderSkuById", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public OrderSku getOne(OrderSku record) {
+
+        log.info("getOrderSku");
+        try {
+
+            return orderSkuDao.queryOne(record);
+        } catch (Exception e) {
+            log.error("getOrderSku", e);
+        }
+
+        return null;
+    }
+
+    @Override
+    @Transactional
+    public boolean create(OrderSku record) {
+
+        log.info("createOrderSku");
+        try {
+
+            int updates = orderSkuDao.insertSelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("createOrderSku", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean delete(String id) {
+
+        log.info("deleteOrderSku");
+        try {
+
+            int updates = orderSkuDao.delete(Integer.valueOf(id));
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("deleteOrderSku", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean deltetByIds(String ids) {
+
+        log.info("deleteeOrderSku byIDS");
+        try {
+
+            String[] id = ids.split(";");
+            int updates = orderSkuDao.deleteIds(id);
+
+            if (id.length == updates) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("deleteeOrderSku byIDS", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    @Transactional
+    public boolean update(OrderSku record) {
+
+        log.info("updateOrderSku");
+        try {
+
+            int updates = orderSkuDao.updateByPrimaryKeySelective(record);
+
+            if (updates > 0) {
+                return true;
+            }
+        } catch (Exception e) {
+            log.error("updateOrderSku", e);
+        }
+
+        return false;
+    }
+
+    @Override
+    public List<OrderSku> queryByOrderId(Long orderId) {
+        log.debug("queryByOrderId and orderId:{}", orderId);
+        return orderSkuDao.queryByOrderId(orderId);
+    }
+}

pine-admin/src/main/java/com/pine/admin/modules/system/controller/SysUserLoginController.java

@@ -104,7 +104,7 @@ public class SysUserLoginController {
         } catch (AuthenticationException e) {
             return Result.error("账户验证失败");
         } catch (Exception e) {
-            e.printStackTrace();
+           log.info(e.getMessage());
             throw new ApiException(e.getMessage());
         }
     }

pine-admin/src/main/java/com/pine/admin/shiro/UserRealm.java

@@ -64,7 +64,6 @@ public class UserRealm extends AuthorizingRealm {
         String dealerInfo = (String) token.getPrincipal();
 
         ShiroUserInfo shiroUserInfo = JSONObject.parseObject(dealerInfo, ShiroUserInfo.class);
-
         /**
          * 设置权限
          */

pine-admin/src/main/resources/mapper/business/CustomerDao.xml

@@ -0,0 +1,627 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.pine.admin.modules.business.dao.CustomerDao">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.pine.admin.modules.business.entity.Customer" id="entityMap">
+        <result property="id" column="id"/>
+        <result property="username" column="username"/>
+        <result property="password" column="password"/>
+        <result property="nickname" column="nickname"/>
+        <result property="image" column="image"/>
+        <result property="relename" column="relename"/>
+        <result property="cardid" column="cardid"/>
+        <result property="gender" column="gender"/>
+        <result property="birthday" column="birthday"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                 id,
+                     username,
+--                      password,
+--                      nickname,
+--                      image,
+--                      relename,
+--                      cardid,
+--                      gender,
+--                      birthday,
+--                      monthly_income,
+--                      marriage_status,
+                     mobile,
+--                      email,
+--                      modified_email,
+--                      check_code,
+--                      province,
+--                      city,
+--                      county,
+--                      detailaddress,
+--                      interest,
+--                      store_id,
+--                      type,
+--                      consumption_amount,
+--                      paypassword,
+--                      source,
+--                      status,
+--                      sign_num,
+--                      is_mobile_verification,
+--                      is_email_verification,
+--                      login_error_count,
+--                      del_flag,
+--                      create_time,
+--                      modify_time,
+--                      del_time,
+--                      lock_time,
+--                      last_login_time,
+--                      recommended,
+--                      self_recommend_code,
+--                      commission,
+--                     belone_store_id
+                        </sql>
+    <!-- 根据Id查询-->
+    <select id="selectByPrimaryKey" resultMap="entityMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_customer
+        where id = #{id,jdbcType=INTEGER} and del_flag = '0'
+    </select>
+
+    <!-- 根据Id删除-->
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+		delete from ls_customer
+		where id = #{id,jdbcType=INTEGER}
+	</delete>
+
+    <!-- 插入数据-->
+    <insert id="insertSelective" parameterType="com.pine.admin.modules.business.entity.Customer"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into ls_customer
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="username != null">username,</if>
+            <if test="password != null">password,</if>
+            <if test="nickname != null">nickname,</if>
+            <if test="image != null">image,</if>
+            <if test="relename != null">relename,</if>
+            <if test="cardid != null">cardid,</if>
+            <if test="gender != null">gender,</if>
+            <if test="birthday != null">birthday,</if>
+            <if test="monthlyIncome != null">monthly_income,</if>
+            <if test="marriageStatus != null">marriage_status,</if>
+            <if test="mobile != null">mobile,</if>
+            <if test="email != null">email,</if>
+            <if test="modifiedEmail != null">modified_email,</if>
+            <if test="checkCode != null">check_code,</if>
+            <if test="province != null">province,</if>
+            <if test="city != null">city,</if>
+            <if test="county != null">county,</if>
+            <if test="detailaddress != null">detailaddress,</if>
+            <if test="interest != null">interest,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="type != null">type,</if>
+            <if test="consumptionAmount != null">consumption_amount,</if>
+            <if test="paypassword != null">paypassword,</if>
+            <if test="source != null">source,</if>
+            <if test="status != null">status,</if>
+            <if test="signNum != null">sign_num,</if>
+            <if test="isMobileVerification != null">is_mobile_verification,</if>
+            <if test="isEmailVerification != null">is_email_verification,</if>
+            <if test="loginErrorCount != null">login_error_count,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="modifyTime != null">modify_time,</if>
+            <if test="delTime != null">del_time,</if>
+            <if test="lockTime != null">lock_time,</if>
+            <if test="lastLoginTime != null">last_login_time,</if>
+            <if test="recommended != null">recommended,</if>
+            <if test="selfRecommendCode != null">self_recommend_code,</if>
+            <if test="commission != null">commission,</if>
+            <if test="beloneStoreId != null">belone_store_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="username != null">#{username},</if>
+            <if test="password != null">#{password},</if>
+            <if test="nickname != null">#{nickname},</if>
+            <if test="image != null">#{image},</if>
+            <if test="relename != null">#{relename},</if>
+            <if test="cardid != null">#{cardid},</if>
+            <if test="gender != null">#{gender},</if>
+            <if test="birthday != null">#{birthday},</if>
+            <if test="monthlyIncome != null">#{monthlyIncome},</if>
+            <if test="marriageStatus != null">#{marriageStatus},</if>
+            <if test="mobile != null">#{mobile},</if>
+            <if test="email != null">#{email},</if>
+            <if test="modifiedEmail != null">#{modifiedEmail},</if>
+            <if test="checkCode != null">#{checkCode},</if>
+            <if test="province != null">#{province},</if>
+            <if test="city != null">#{city},</if>
+            <if test="county != null">#{county},</if>
+            <if test="detailaddress != null">#{detailaddress},</if>
+            <if test="interest != null">#{interest},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="type != null">#{type},</if>
+            <if test="consumptionAmount != null">#{consumptionAmount},</if>
+            <if test="paypassword != null">#{paypassword},</if>
+            <if test="source != null">#{source},</if>
+            <if test="status != null">#{status},</if>
+            <if test="signNum != null">#{signNum},</if>
+            <if test="isMobileVerification != null">#{isMobileVerification},</if>
+            <if test="isEmailVerification != null">#{isEmailVerification},</if>
+            <if test="loginErrorCount != null">#{loginErrorCount},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="modifyTime != null">#{modifyTime},</if>
+            <if test="delTime != null">#{delTime},</if>
+            <if test="lockTime != null">#{lockTime},</if>
+            <if test="lastLoginTime != null">#{lastLoginTime},</if>
+            <if test="recommended != null">#{recommended},</if>
+            <if test="selfRecommendCode != null">#{selfRecommendCode},</if>
+            <if test="commission != null">#{commission},</if>
+            <if test="beloneStoreId != null">#{beloneStoreId},</if>
+        </trim>
+    </insert>
+
+    <!-- 更新数据-->
+    <update id="updateByPrimaryKeySelective" parameterType="com.pine.admin.modules.business.entity.Customer">
+        update ls_customer
+        <set>
+            <if test="id != null">id = #{id},</if>
+            <if test="username != null">username = #{username},</if>
+            <if test="password != null">password = #{password},</if>
+            <if test="nickname != null">nickname = #{nickname},</if>
+            <if test="image != null">image = #{image},</if>
+            <if test="relename != null">relename = #{relename},</if>
+            <if test="cardid != null">cardid = #{cardid},</if>
+            <if test="gender != null">gender = #{gender},</if>
+            <if test="birthday != null">birthday = #{birthday},</if>
+            <if test="monthlyIncome != null">monthly_income = #{monthlyIncome},</if>
+            <if test="marriageStatus != null">marriage_status = #{marriageStatus},</if>
+            <if test="mobile != null">mobile = #{mobile},</if>
+            <if test="email != null">email = #{email},</if>
+            <if test="modifiedEmail != null">modified_email = #{modifiedEmail},</if>
+            <if test="checkCode != null">check_code = #{checkCode},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="county != null">county = #{county},</if>
+            <if test="detailaddress != null">detailaddress = #{detailaddress},</if>
+            <if test="interest != null">interest = #{interest},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="consumptionAmount != null">consumption_amount = #{consumptionAmount},</if>
+            <if test="paypassword != null">paypassword = #{paypassword},</if>
+            <if test="source != null">source = #{source},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="signNum != null">sign_num = #{signNum},</if>
+            <if test="isMobileVerification != null">is_mobile_verification = #{isMobileVerification},</if>
+            <if test="isEmailVerification != null">is_email_verification = #{isEmailVerification},</if>
+            <if test="loginErrorCount != null">login_error_count = #{loginErrorCount},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="modifyTime != null">modify_time = #{modifyTime},</if>
+            <if test="delTime != null">del_time = #{delTime},</if>
+            <if test="lockTime != null">lock_time = #{lockTime},</if>
+            <if test="lastLoginTime != null">last_login_time = #{lastLoginTime},</if>
+            <if test="recommended != null">recommended = #{recommended},</if>
+            <if test="selfRecommendCode != null">self_recommend_code = #{selfRecommendCode},</if>
+            <if test="commission != null">commission = #{commission},</if>
+            <if test="beloneStoreId != null">belone_store_id = #{beloneStoreId},</if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <!-- 分页查询-->
+    <select id="queryByPage" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_customer
+        <where>
+            and del_flag = 'N'
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
+            </if>
+            <if test="record.username != null and !&quot;&quot;.equals(record.username)">
+                and username = #{record.username}
+            </if>
+            <if test="record.password != null and !&quot;&quot;.equals(record.password)">
+                and password = #{record.password}
+            </if>
+            <if test="record.nickname != null and !&quot;&quot;.equals(record.nickname)">
+                and nickname = #{record.nickname}
+            </if>
+            <if test="record.image != null and !&quot;&quot;.equals(record.image)">
+                and image = #{record.image}
+            </if>
+            <if test="record.relename != null and !&quot;&quot;.equals(record.relename)">
+                and relename = #{record.relename}
+            </if>
+            <if test="record.cardid != null and !&quot;&quot;.equals(record.cardid)">
+                and cardid = #{record.cardid}
+            </if>
+            <if test="record.gender != null and !&quot;&quot;.equals(record.gender)">
+                and gender = #{record.gender}
+            </if>
+            <if test="record.birthday != null and !&quot;&quot;.equals(record.birthday)">
+                and birthday = #{record.birthday}
+            </if>
+            <if test="record.monthlyIncome != null and !&quot;&quot;.equals(record.monthlyIncome)">
+                and monthly_income = #{record.monthlyIncome}
+            </if>
+            <if test="record.marriageStatus != null and !&quot;&quot;.equals(record.marriageStatus)">
+                and marriage_status = #{record.marriageStatus}
+            </if>
+            <if test="record.mobile != null and !&quot;&quot;.equals(record.mobile)">
+                and mobile = #{record.mobile}
+            </if>
+            <if test="record.email != null and !&quot;&quot;.equals(record.email)">
+                and email = #{record.email}
+            </if>
+            <if test="record.modifiedEmail != null and !&quot;&quot;.equals(record.modifiedEmail)">
+                and modified_email = #{record.modifiedEmail}
+            </if>
+            <if test="record.checkCode != null and !&quot;&quot;.equals(record.checkCode)">
+                and check_code = #{record.checkCode}
+            </if>
+            <if test="record.province != null and !&quot;&quot;.equals(record.province)">
+                and province = #{record.province}
+            </if>
+            <if test="record.city != null and !&quot;&quot;.equals(record.city)">
+                and city = #{record.city}
+            </if>
+            <if test="record.county != null and !&quot;&quot;.equals(record.county)">
+                and county = #{record.county}
+            </if>
+            <if test="record.detailaddress != null and !&quot;&quot;.equals(record.detailaddress)">
+                and detailaddress = #{record.detailaddress}
+            </if>
+            <if test="record.interest != null and !&quot;&quot;.equals(record.interest)">
+                and interest = #{record.interest}
+            </if>
+            <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
+                and store_id = #{record.storeId}
+            </if>
+            <if test="record.type != null and !&quot;&quot;.equals(record.type)">
+                and type = #{record.type}
+            </if>
+            <if test="record.consumptionAmount != null and !&quot;&quot;.equals(record.consumptionAmount)">
+                and consumption_amount = #{record.consumptionAmount}
+            </if>
+            <if test="record.paypassword != null and !&quot;&quot;.equals(record.paypassword)">
+                and paypassword = #{record.paypassword}
+            </if>
+            <if test="record.source != null and !&quot;&quot;.equals(record.source)">
+                and source = #{record.source}
+            </if>
+            <if test="record.status != null and !&quot;&quot;.equals(record.status)">
+                and status = #{record.status}
+            </if>
+            <if test="record.signNum != null and !&quot;&quot;.equals(record.signNum)">
+                and sign_num = #{record.signNum}
+            </if>
+            <if test="record.isMobileVerification != null and !&quot;&quot;.equals(record.isMobileVerification)">
+                and is_mobile_verification = #{record.isMobileVerification}
+            </if>
+            <if test="record.isEmailVerification != null and !&quot;&quot;.equals(record.isEmailVerification)">
+                and is_email_verification = #{record.isEmailVerification}
+            </if>
+            <if test="record.loginErrorCount != null and !&quot;&quot;.equals(record.loginErrorCount)">
+                and login_error_count = #{record.loginErrorCount}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
+            </if>
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
+            </if>
+            <if test="record.modifyTime != null and !&quot;&quot;.equals(record.modifyTime)">
+                and modify_time = #{record.modifyTime}
+            </if>
+            <if test="record.delTime != null and !&quot;&quot;.equals(record.delTime)">
+                and del_time = #{record.delTime}
+            </if>
+            <if test="record.lockTime != null and !&quot;&quot;.equals(record.lockTime)">
+                and lock_time = #{record.lockTime}
+            </if>
+            <if test="record.lastLoginTime != null and !&quot;&quot;.equals(record.lastLoginTime)">
+                and last_login_time = #{record.lastLoginTime}
+            </if>
+            <if test="record.recommended != null and !&quot;&quot;.equals(record.recommended)">
+                and recommended = #{record.recommended}
+            </if>
+            <if test="record.selfRecommendCode != null and !&quot;&quot;.equals(record.selfRecommendCode)">
+                and self_recommend_code = #{record.selfRecommendCode}
+            </if>
+            <if test="record.commission != null and !&quot;&quot;.equals(record.commission)">
+                and commission = #{record.commission}
+            </if>
+            <if test="record.beloneStoreId != null and !&quot;&quot;.equals(record.beloneStoreId)">
+                and belone_store_id = #{record.beloneStoreId}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <!-- 全部查询 -->
+    <select id="queryAll" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_customer
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="username != null and !&quot;&quot;.equals(username)">
+                and username = #{username}
+            </if>
+            <if test="password != null and !&quot;&quot;.equals(password)">
+                and password = #{password}
+            </if>
+            <if test="nickname != null and !&quot;&quot;.equals(nickname)">
+                and nickname = #{nickname}
+            </if>
+            <if test="image != null and !&quot;&quot;.equals(image)">
+                and image = #{image}
+            </if>
+            <if test="relename != null and !&quot;&quot;.equals(relename)">
+                and relename = #{relename}
+            </if>
+            <if test="cardid != null and !&quot;&quot;.equals(cardid)">
+                and cardid = #{cardid}
+            </if>
+            <if test="gender != null and !&quot;&quot;.equals(gender)">
+                and gender = #{gender}
+            </if>
+            <if test="birthday != null and !&quot;&quot;.equals(birthday)">
+                and birthday = #{birthday}
+            </if>
+            <if test="monthlyIncome != null and !&quot;&quot;.equals(monthlyIncome)">
+                and monthly_income = #{monthlyIncome}
+            </if>
+            <if test="marriageStatus != null and !&quot;&quot;.equals(marriageStatus)">
+                and marriage_status = #{marriageStatus}
+            </if>
+            <if test="mobile != null and !&quot;&quot;.equals(mobile)">
+                and mobile = #{mobile}
+            </if>
+            <if test="email != null and !&quot;&quot;.equals(email)">
+                and email = #{email}
+            </if>
+            <if test="modifiedEmail != null and !&quot;&quot;.equals(modifiedEmail)">
+                and modified_email = #{modifiedEmail}
+            </if>
+            <if test="checkCode != null and !&quot;&quot;.equals(checkCode)">
+                and check_code = #{checkCode}
+            </if>
+            <if test="province != null and !&quot;&quot;.equals(province)">
+                and province = #{province}
+            </if>
+            <if test="city != null and !&quot;&quot;.equals(city)">
+                and city = #{city}
+            </if>
+            <if test="county != null and !&quot;&quot;.equals(county)">
+                and county = #{county}
+            </if>
+            <if test="detailaddress != null and !&quot;&quot;.equals(detailaddress)">
+                and detailaddress = #{detailaddress}
+            </if>
+            <if test="interest != null and !&quot;&quot;.equals(interest)">
+                and interest = #{interest}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                and store_id = #{storeId}
+            </if>
+            <if test="type != null and !&quot;&quot;.equals(type)">
+                and type = #{type}
+            </if>
+            <if test="consumptionAmount != null and !&quot;&quot;.equals(consumptionAmount)">
+                and consumption_amount = #{consumptionAmount}
+            </if>
+            <if test="paypassword != null and !&quot;&quot;.equals(paypassword)">
+                and paypassword = #{paypassword}
+            </if>
+            <if test="source != null and !&quot;&quot;.equals(source)">
+                and source = #{source}
+            </if>
+            <if test="status != null and !&quot;&quot;.equals(status)">
+                and status = #{status}
+            </if>
+            <if test="signNum != null and !&quot;&quot;.equals(signNum)">
+                and sign_num = #{signNum}
+            </if>
+            <if test="isMobileVerification != null and !&quot;&quot;.equals(isMobileVerification)">
+                and is_mobile_verification = #{isMobileVerification}
+            </if>
+            <if test="isEmailVerification != null and !&quot;&quot;.equals(isEmailVerification)">
+                and is_email_verification = #{isEmailVerification}
+            </if>
+            <if test="loginErrorCount != null and !&quot;&quot;.equals(loginErrorCount)">
+                and login_error_count = #{loginErrorCount}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="modifyTime != null and !&quot;&quot;.equals(modifyTime)">
+                and modify_time = #{modifyTime}
+            </if>
+            <if test="delTime != null and !&quot;&quot;.equals(delTime)">
+                and del_time = #{delTime}
+            </if>
+            <if test="lockTime != null and !&quot;&quot;.equals(lockTime)">
+                and lock_time = #{lockTime}
+            </if>
+            <if test="lastLoginTime != null and !&quot;&quot;.equals(lastLoginTime)">
+                and last_login_time = #{lastLoginTime}
+            </if>
+            <if test="recommended != null and !&quot;&quot;.equals(recommended)">
+                and recommended = #{recommended}
+            </if>
+            <if test="selfRecommendCode != null and !&quot;&quot;.equals(selfRecommendCode)">
+                and self_recommend_code = #{selfRecommendCode}
+            </if>
+            <if test="commission != null and !&quot;&quot;.equals(commission)">
+                and commission = #{commission}
+            </if>
+            <if test="beloneStoreId != null and !&quot;&quot;.equals(beloneStoreId)">
+                and belone_store_id = #{beloneStoreId}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <!-- 根据条件查询一个 -->
+    <select id="queryOne" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_customer
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="username != null and !&quot;&quot;.equals(username)">
+                and username = #{username}
+            </if>
+            <if test="password != null and !&quot;&quot;.equals(password)">
+                and password = #{password}
+            </if>
+            <if test="nickname != null and !&quot;&quot;.equals(nickname)">
+                and nickname = #{nickname}
+            </if>
+            <if test="image != null and !&quot;&quot;.equals(image)">
+                and image = #{image}
+            </if>
+            <if test="relename != null and !&quot;&quot;.equals(relename)">
+                and relename = #{relename}
+            </if>
+            <if test="cardid != null and !&quot;&quot;.equals(cardid)">
+                and cardid = #{cardid}
+            </if>
+            <if test="gender != null and !&quot;&quot;.equals(gender)">
+                and gender = #{gender}
+            </if>
+            <if test="birthday != null and !&quot;&quot;.equals(birthday)">
+                and birthday = #{birthday}
+            </if>
+            <if test="monthlyIncome != null and !&quot;&quot;.equals(monthlyIncome)">
+                and monthly_income = #{monthlyIncome}
+            </if>
+            <if test="marriageStatus != null and !&quot;&quot;.equals(marriageStatus)">
+                and marriage_status = #{marriageStatus}
+            </if>
+            <if test="mobile != null and !&quot;&quot;.equals(mobile)">
+                and mobile = #{mobile}
+            </if>
+            <if test="email != null and !&quot;&quot;.equals(email)">
+                and email = #{email}
+            </if>
+            <if test="modifiedEmail != null and !&quot;&quot;.equals(modifiedEmail)">
+                and modified_email = #{modifiedEmail}
+            </if>
+            <if test="checkCode != null and !&quot;&quot;.equals(checkCode)">
+                and check_code = #{checkCode}
+            </if>
+            <if test="province != null and !&quot;&quot;.equals(province)">
+                and province = #{province}
+            </if>
+            <if test="city != null and !&quot;&quot;.equals(city)">
+                and city = #{city}
+            </if>
+            <if test="county != null and !&quot;&quot;.equals(county)">
+                and county = #{county}
+            </if>
+            <if test="detailaddress != null and !&quot;&quot;.equals(detailaddress)">
+                and detailaddress = #{detailaddress}
+            </if>
+            <if test="interest != null and !&quot;&quot;.equals(interest)">
+                and interest = #{interest}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                and store_id = #{storeId}
+            </if>
+            <if test="type != null and !&quot;&quot;.equals(type)">
+                and type = #{type}
+            </if>
+            <if test="consumptionAmount != null and !&quot;&quot;.equals(consumptionAmount)">
+                and consumption_amount = #{consumptionAmount}
+            </if>
+            <if test="paypassword != null and !&quot;&quot;.equals(paypassword)">
+                and paypassword = #{paypassword}
+            </if>
+            <if test="source != null and !&quot;&quot;.equals(source)">
+                and source = #{source}
+            </if>
+            <if test="status != null and !&quot;&quot;.equals(status)">
+                and status = #{status}
+            </if>
+            <if test="signNum != null and !&quot;&quot;.equals(signNum)">
+                and sign_num = #{signNum}
+            </if>
+            <if test="isMobileVerification != null and !&quot;&quot;.equals(isMobileVerification)">
+                and is_mobile_verification = #{isMobileVerification}
+            </if>
+            <if test="isEmailVerification != null and !&quot;&quot;.equals(isEmailVerification)">
+                and is_email_verification = #{isEmailVerification}
+            </if>
+            <if test="loginErrorCount != null and !&quot;&quot;.equals(loginErrorCount)">
+                and login_error_count = #{loginErrorCount}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="modifyTime != null and !&quot;&quot;.equals(modifyTime)">
+                and modify_time = #{modifyTime}
+            </if>
+            <if test="delTime != null and !&quot;&quot;.equals(delTime)">
+                and del_time = #{delTime}
+            </if>
+            <if test="lockTime != null and !&quot;&quot;.equals(lockTime)">
+                and lock_time = #{lockTime}
+            </if>
+            <if test="lastLoginTime != null and !&quot;&quot;.equals(lastLoginTime)">
+                and last_login_time = #{lastLoginTime}
+            </if>
+            <if test="recommended != null and !&quot;&quot;.equals(recommended)">
+                and recommended = #{recommended}
+            </if>
+            <if test="selfRecommendCode != null and !&quot;&quot;.equals(selfRecommendCode)">
+                and self_recommend_code = #{selfRecommendCode}
+            </if>
+            <if test="commission != null and !&quot;&quot;.equals(commission)">
+                and commission = #{commission}
+            </if>
+            <if test="beloneStoreId != null and !&quot;&quot;.equals(beloneStoreId)">
+                and belone_store_id = #{beloneStoreId}
+            </if>
+        </where>
+        LIMIT 1
+    </select>
+    <select id="getById" parameterType="java.lang.Long" resultType="com.pine.admin.modules.business.entity.Customer">
+                select id,username,mobile from ls_customer where id = #{id} and del_flag = '0'
+    </select>
+
+    <update id="delete">
+        UPDATE ls_customer SET del_flag = 'Y'
+        <where>
+            AND id = #{id}
+        </where>
+    </update>
+
+    <update id="deleteIds" parameterType="java.util.ArrayList">
+        UPDATE ls_customer SET del_flag = 'Y'
+        WHERE id IN
+        <foreach item='ids' collection="array" index="index" open="(" separator="," close=")">
+            #{ids}
+        </foreach>
+    </update>
+
+</mapper>

pine-admin/src/main/resources/mapper/business/LogisticsCompanyDao.xml

@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.pine.admin.modules.business.dao.LogisticsCompanyDao">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.pine.admin.modules.business.entity.LogisticsCompany" id="entityMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="code" column="code"/>
+        <result property="express100Code" column="express100_code"/>
+        <result property="storeId" column="store_id"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="delTime" column="del_time"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                 id,
+                     name,
+                     code,
+                     express100_code,
+                     store_id,
+                     del_flag,
+                     create_time,
+                     modify_time,
+                    del_time         </sql>
+    <!-- 根据Id查询-->
+    <select id="selectByPrimaryKey" resultMap="entityMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_logistics_company
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <select id="byId" resultMap="entityMap" parameterType="java.lang.Long">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_logistics_company
+        where id = #{id}
+    </select>
+
+    <!-- 根据Id删除-->
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+		delete from ls_logistics_company
+		where id = #{id,jdbcType=INTEGER}
+	</delete>
+
+    <!-- 插入数据-->
+    <insert id="insertSelective" parameterType="com.pine.admin.modules.business.entity.LogisticsCompany"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into ls_logistics_company
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="name != null">name,</if>
+            <if test="code != null">code,</if>
+            <if test="express100Code != null">express100_code,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="modifyTime != null">modify_time,</if>
+            <if test="delTime != null">del_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="name != null">#{name},</if>
+            <if test="code != null">#{code},</if>
+            <if test="express100Code != null">#{express100Code},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="modifyTime != null">#{modifyTime},</if>
+            <if test="delTime != null">#{delTime},</if>
+        </trim>
+    </insert>
+
+    <!-- 更新数据-->
+    <update id="updateByPrimaryKeySelective" parameterType="com.pine.admin.modules.business.entity.LogisticsCompany">
+        update ls_logistics_company
+        <set>
+            <if test="id != null">id = #{id},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="express100Code != null">express100_code = #{express100Code},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="modifyTime != null">modify_time = #{modifyTime},</if>
+            <if test="delTime != null">del_time = #{delTime},</if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <!-- 分页查询-->
+    <select id="queryByPage" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_logistics_company
+        <where>
+            and del_flag = 'N'
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
+            </if>
+            <if test="record.name != null and !&quot;&quot;.equals(record.name)">
+                and name = #{record.name}
+            </if>
+            <if test="record.code != null and !&quot;&quot;.equals(record.code)">
+                and code = #{record.code}
+            </if>
+            <if test="record.express100Code != null and !&quot;&quot;.equals(record.express100Code)">
+                and express100_code = #{record.express100Code}
+            </if>
+            <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
+                and store_id = #{record.storeId}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
+            </if>
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
+            </if>
+            <if test="record.modifyTime != null and !&quot;&quot;.equals(record.modifyTime)">
+                and modify_time = #{record.modifyTime}
+            </if>
+            <if test="record.delTime != null and !&quot;&quot;.equals(record.delTime)">
+                and del_time = #{record.delTime}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <!-- 全部查询 -->
+    <select id="queryAll" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_logistics_company
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="name != null and !&quot;&quot;.equals(name)">
+                and name = #{name}
+            </if>
+            <if test="code != null and !&quot;&quot;.equals(code)">
+                and code = #{code}
+            </if>
+            <if test="express100Code != null and !&quot;&quot;.equals(express100Code)">
+                and express100_code = #{express100Code}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                and store_id = #{storeId}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="modifyTime != null and !&quot;&quot;.equals(modifyTime)">
+                and modify_time = #{modifyTime}
+            </if>
+            <if test="delTime != null and !&quot;&quot;.equals(delTime)">
+                and del_time = #{delTime}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <!-- 根据条件查询一个 -->
+    <select id="queryOne" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_logistics_company
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="name != null and !&quot;&quot;.equals(name)">
+                and name = #{name}
+            </if>
+            <if test="code != null and !&quot;&quot;.equals(code)">
+                and code = #{code}
+            </if>
+            <if test="express100Code != null and !&quot;&quot;.equals(express100Code)">
+                and express100_code = #{express100Code}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                and store_id = #{storeId}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="modifyTime != null and !&quot;&quot;.equals(modifyTime)">
+                and modify_time = #{modifyTime}
+            </if>
+            <if test="delTime != null and !&quot;&quot;.equals(delTime)">
+                and del_time = #{delTime}
+            </if>
+        </where>
+        LIMIT 1
+    </select>
+
+    <update id="delete">
+        UPDATE ls_logistics_company SET del_flag = 'Y'
+        <where>
+            AND id = #{id}
+        </where>
+    </update>
+
+    <update id="deleteIds" parameterType="java.util.ArrayList">
+        UPDATE ls_logistics_company SET del_flag = 'Y'
+        WHERE id IN
+        <foreach item='ids' collection="array" index="index" open="(" separator="," close=")">
+            #{ids}
+        </foreach>
+    </update>
+
+</mapper>

pine-admin/src/main/resources/mapper/business/LogisticsTemplateDao.xml

@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.pine.admin.modules.business.dao.LogisticsTemplateDao">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.pine.admin.modules.business.entity.LogisticsTemplate" id="entityMap">
+        <result property="id" column="id"/>
+        <result property="companyId" column="company_id"/>
+        <result property="name" column="name"/>
+        <result property="isDefault" column="is_default"/>
+        <result property="freightBear" column="freight_bear"/>
+        <result property="pricintMethod" column="pricint_method"/>
+        <result property="storeId" column="store_id"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createTime" column="create_time"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="delTime" column="del_time"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                 id,
+                     company_id,
+                     name,
+                     is_default,
+                     freight_bear,
+                     pricint_method,
+                     store_id,
+                     del_flag,
+                     create_time,
+                     modify_time,
+                    del_time         </sql>
+    <!-- 根据Id查询-->
+    <select id="selectByPrimaryKey" resultMap="entityMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_logistics_template
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <select id="byId" resultMap="entityMap" parameterType="java.lang.Long">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_logistics_template
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <!-- 根据Id删除-->
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+		delete from ls_logistics_template
+		where id = #{id,jdbcType=INTEGER}
+	</delete>
+
+    <!-- 插入数据-->
+    <insert id="insertSelective" parameterType="com.pine.admin.modules.business.entity.LogisticsTemplate"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into ls_logistics_template
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="name != null">name,</if>
+            <if test="isDefault != null">is_default,</if>
+            <if test="freightBear != null">freight_bear,</if>
+            <if test="pricintMethod != null">pricint_method,</if>
+            <if test="storeId != null">store_id,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="modifyTime != null">modify_time,</if>
+            <if test="delTime != null">del_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="isDefault != null">#{isDefault},</if>
+            <if test="freightBear != null">#{freightBear},</if>
+            <if test="pricintMethod != null">#{pricintMethod},</if>
+            <if test="storeId != null">#{storeId},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="modifyTime != null">#{modifyTime},</if>
+            <if test="delTime != null">#{delTime},</if>
+        </trim>
+    </insert>
+
+    <!-- 更新数据-->
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.pine.admin.modules.business.entity.LogisticsTemplate">
+        update ls_logistics_template
+        <set>
+            <if test="id != null">id = #{id},</if>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="isDefault != null">is_default = #{isDefault},</if>
+            <if test="freightBear != null">freight_bear = #{freightBear},</if>
+            <if test="pricintMethod != null">pricint_method = #{pricintMethod},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="modifyTime != null">modify_time = #{modifyTime},</if>
+            <if test="delTime != null">del_time = #{delTime},</if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <!-- 分页查询-->
+    <select id="queryByPage" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_logistics_template
+        <where>
+            and del_flag = 'N'
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
+            </if>
+            <if test="record.companyId != null and !&quot;&quot;.equals(record.companyId)">
+                and company_id = #{record.companyId}
+            </if>
+            <if test="record.name != null and !&quot;&quot;.equals(record.name)">
+                and name = #{record.name}
+            </if>
+            <if test="record.isDefault != null and !&quot;&quot;.equals(record.isDefault)">
+                and is_default = #{record.isDefault}
+            </if>
+            <if test="record.freightBear != null and !&quot;&quot;.equals(record.freightBear)">
+                and freight_bear = #{record.freightBear}
+            </if>
+            <if test="record.pricintMethod != null and !&quot;&quot;.equals(record.pricintMethod)">
+                and pricint_method = #{record.pricintMethod}
+            </if>
+            <if test="record.storeId != null and !&quot;&quot;.equals(record.storeId)">
+                and store_id = #{record.storeId}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
+            </if>
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
+            </if>
+            <if test="record.modifyTime != null and !&quot;&quot;.equals(record.modifyTime)">
+                and modify_time = #{record.modifyTime}
+            </if>
+            <if test="record.delTime != null and !&quot;&quot;.equals(record.delTime)">
+                and del_time = #{record.delTime}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <!-- 全部查询 -->
+    <select id="queryAll" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_logistics_template
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="companyId != null and !&quot;&quot;.equals(companyId)">
+                and company_id = #{companyId}
+            </if>
+            <if test="name != null and !&quot;&quot;.equals(name)">
+                and name = #{name}
+            </if>
+            <if test="isDefault != null and !&quot;&quot;.equals(isDefault)">
+                and is_default = #{isDefault}
+            </if>
+            <if test="freightBear != null and !&quot;&quot;.equals(freightBear)">
+                and freight_bear = #{freightBear}
+            </if>
+            <if test="pricintMethod != null and !&quot;&quot;.equals(pricintMethod)">
+                and pricint_method = #{pricintMethod}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                and store_id = #{storeId}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="modifyTime != null and !&quot;&quot;.equals(modifyTime)">
+                and modify_time = #{modifyTime}
+            </if>
+            <if test="delTime != null and !&quot;&quot;.equals(delTime)">
+                and del_time = #{delTime}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <!-- 根据条件查询一个 -->
+    <select id="queryOne" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_logistics_template
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="companyId != null and !&quot;&quot;.equals(companyId)">
+                and company_id = #{companyId}
+            </if>
+            <if test="name != null and !&quot;&quot;.equals(name)">
+                and name = #{name}
+            </if>
+            <if test="isDefault != null and !&quot;&quot;.equals(isDefault)">
+                and is_default = #{isDefault}
+            </if>
+            <if test="freightBear != null and !&quot;&quot;.equals(freightBear)">
+                and freight_bear = #{freightBear}
+            </if>
+            <if test="pricintMethod != null and !&quot;&quot;.equals(pricintMethod)">
+                and pricint_method = #{pricintMethod}
+            </if>
+            <if test="storeId != null and !&quot;&quot;.equals(storeId)">
+                and store_id = #{storeId}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="modifyTime != null and !&quot;&quot;.equals(modifyTime)">
+                and modify_time = #{modifyTime}
+            </if>
+            <if test="delTime != null and !&quot;&quot;.equals(delTime)">
+                and del_time = #{delTime}
+            </if>
+        </where>
+        LIMIT 1
+    </select>
+
+    <update id="delete">
+        UPDATE ls_logistics_template SET del_flag = 'Y'
+        <where>
+            AND id = #{id}
+        </where>
+    </update>
+
+    <update id="deleteIds" parameterType="java.util.ArrayList">
+        UPDATE ls_logistics_template SET del_flag = 'Y'
+        WHERE id IN
+        <foreach item='ids' collection="array" index="index" open="(" separator="," close=")">
+            #{ids}
+        </foreach>
+    </update>
+
+</mapper>

pine-admin/src/main/resources/mapper/business/OrderAttrDao.xml

@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.pine.admin.modules.business.dao.OrderAttrDao">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.pine.admin.modules.business.entity.OrderAttr" id="entityMap">
+                    <result property="id" column="id"/>
+                    <result property="orderId" column="order_id"/>
+                    <result property="receiptName" column="receipt_name"/>
+                    <result property="receiptAddress" column="receipt_address"/>
+                    <result property="receiptDetailAddress" column="receipt_detail_address"/>
+                    <result property="receiptMobile" column="receipt_mobile"/>
+                    <result property="receiptPhone" column="receipt_phone"/>
+                    <result property="receiptZipCode" column="receipt_zip_code"/>
+                    <result property="invoiceType" column="invoice_type"/>
+                    <result property="invoiceTitle" column="invoice_title"/>
+                    <result property="invoiceContent" column="invoice_content"/>
+                    <result property="invoiceTaxid" column="invoice_taxid"/>
+                    <result property="remark" column="remark"/>
+                    <result property="giftInfos" column="gift_infos"/>
+                    <result property="donationMessage" column="donation_message"/>
+                    <result property="invoiceCompanyName" column="invoice_company_name"/>
+                    <result property="invoiceRegisterAddress" column="invoice_register_address"/>
+                    <result property="invoiceRegisterMobile" column="invoice_register_mobile"/>
+                    <result property="invoiceOpenBank" column="invoice_open_bank"/>
+                    <result property="invoiceBankAccount" column="invoice_bank_account"/>
+                    <result property="invoiceTitleType" column="invoice_title_type"/>
+                    <result property="deliveryTime" column="delivery_time"/>
+                    <result property="address" column="address"/>
+                    <result property="detailAddress" column="detail_address"/>
+                    <result property="pickUpAddress" column="pick_up_address"/>
+                    <result property="deliveryType" column="delivery_type"/>
+                    <result property="houseNumber" column="house_number"/>
+            </resultMap>
+
+    <sql id="Base_Column_List">
+                 id,
+                     order_id,
+                     receipt_name,
+                     receipt_address,
+                     receipt_detail_address,
+                     receipt_mobile,
+                     receipt_phone,
+                     receipt_zip_code,
+                     invoice_type,
+                     invoice_title,
+                     invoice_content,
+                     invoice_taxid,
+                     remark,
+                     gift_infos,
+                     donation_message,
+                     invoice_company_name,
+                     invoice_register_address,
+                     invoice_register_mobile,
+                     invoice_open_bank,
+                     invoice_bank_account,
+                     invoice_title_type,
+                     delivery_time,
+                     address,
+                     detail_address,
+                     pick_up_address,
+                     delivery_type,
+                    house_number         </sql>
+    <!-- 根据Id查询-->
+    <select id="selectByPrimaryKey" resultMap="entityMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_order_attr
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <select id="queryByOrderId" parameterType="java.lang.Long" resultMap="entityMap">
+        select   <include refid="Base_Column_List"/> from ls_order_attr where order_id=#{orderId}
+    </select>
+
+    <!-- 根据Id删除-->
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+		delete from ls_order_attr
+		where id = #{id,jdbcType=INTEGER}
+	</delete>
+
+    <!-- 插入数据-->
+    <insert id="insertSelective" parameterType="com.pine.admin.modules.business.entity.OrderAttr"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into  ls_order_attr
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                            <if test="id != null">  id,</if>
+                            <if test="orderId != null">  order_id,</if>
+                            <if test="receiptName != null">  receipt_name,</if>
+                            <if test="receiptAddress != null">  receipt_address,</if>
+                            <if test="receiptDetailAddress != null">  receipt_detail_address,</if>
+                            <if test="receiptMobile != null">  receipt_mobile,</if>
+                            <if test="receiptPhone != null">  receipt_phone,</if>
+                            <if test="receiptZipCode != null">  receipt_zip_code,</if>
+                            <if test="invoiceType != null">  invoice_type,</if>
+                            <if test="invoiceTitle != null">  invoice_title,</if>
+                            <if test="invoiceContent != null">  invoice_content,</if>
+                            <if test="invoiceTaxid != null">  invoice_taxid,</if>
+                            <if test="remark != null">  remark,</if>
+                            <if test="giftInfos != null">  gift_infos,</if>
+                            <if test="donationMessage != null">  donation_message,</if>
+                            <if test="invoiceCompanyName != null">  invoice_company_name,</if>
+                            <if test="invoiceRegisterAddress != null">  invoice_register_address,</if>
+                            <if test="invoiceRegisterMobile != null">  invoice_register_mobile,</if>
+                            <if test="invoiceOpenBank != null">  invoice_open_bank,</if>
+                            <if test="invoiceBankAccount != null">  invoice_bank_account,</if>
+                            <if test="invoiceTitleType != null">  invoice_title_type,</if>
+                            <if test="deliveryTime != null">  delivery_time,</if>
+                            <if test="address != null">  address,</if>
+                            <if test="detailAddress != null">  detail_address,</if>
+                            <if test="pickUpAddress != null">  pick_up_address,</if>
+                            <if test="deliveryType != null">  delivery_type,</if>
+                            <if test="houseNumber != null">  house_number,</if>
+                    </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                            <if test="id != null">#{id},</if>
+                            <if test="orderId != null">#{orderId},</if>
+                            <if test="receiptName != null">#{receiptName},</if>
+                            <if test="receiptAddress != null">#{receiptAddress},</if>
+                            <if test="receiptDetailAddress != null">#{receiptDetailAddress},</if>
+                            <if test="receiptMobile != null">#{receiptMobile},</if>
+                            <if test="receiptPhone != null">#{receiptPhone},</if>
+                            <if test="receiptZipCode != null">#{receiptZipCode},</if>
+                            <if test="invoiceType != null">#{invoiceType},</if>
+                            <if test="invoiceTitle != null">#{invoiceTitle},</if>
+                            <if test="invoiceContent != null">#{invoiceContent},</if>
+                            <if test="invoiceTaxid != null">#{invoiceTaxid},</if>
+                            <if test="remark != null">#{remark},</if>
+                            <if test="giftInfos != null">#{giftInfos},</if>
+                            <if test="donationMessage != null">#{donationMessage},</if>
+                            <if test="invoiceCompanyName != null">#{invoiceCompanyName},</if>
+                            <if test="invoiceRegisterAddress != null">#{invoiceRegisterAddress},</if>
+                            <if test="invoiceRegisterMobile != null">#{invoiceRegisterMobile},</if>
+                            <if test="invoiceOpenBank != null">#{invoiceOpenBank},</if>
+                            <if test="invoiceBankAccount != null">#{invoiceBankAccount},</if>
+                            <if test="invoiceTitleType != null">#{invoiceTitleType},</if>
+                            <if test="deliveryTime != null">#{deliveryTime},</if>
+                            <if test="address != null">#{address},</if>
+                            <if test="detailAddress != null">#{detailAddress},</if>
+                            <if test="pickUpAddress != null">#{pickUpAddress},</if>
+                            <if test="deliveryType != null">#{deliveryType},</if>
+                            <if test="houseNumber != null">#{houseNumber},</if>
+                    </trim>
+    </insert>
+
+    <!-- 更新数据-->
+    <update id="updateByPrimaryKeySelective" parameterType="com.pine.admin.modules.business.entity.OrderAttr">
+        update ls_order_attr
+        <set>
+                            <if test="id != null">id = #{id},</if>
+                            <if test="orderId != null">order_id = #{orderId},</if>
+                            <if test="receiptName != null">receipt_name = #{receiptName},</if>
+                            <if test="receiptAddress != null">receipt_address = #{receiptAddress},</if>
+                            <if test="receiptDetailAddress != null">receipt_detail_address = #{receiptDetailAddress},</if>
+                            <if test="receiptMobile != null">receipt_mobile = #{receiptMobile},</if>
+                            <if test="receiptPhone != null">receipt_phone = #{receiptPhone},</if>
+                            <if test="receiptZipCode != null">receipt_zip_code = #{receiptZipCode},</if>
+                            <if test="invoiceType != null">invoice_type = #{invoiceType},</if>
+                            <if test="invoiceTitle != null">invoice_title = #{invoiceTitle},</if>
+                            <if test="invoiceContent != null">invoice_content = #{invoiceContent},</if>
+                            <if test="invoiceTaxid != null">invoice_taxid = #{invoiceTaxid},</if>
+                            <if test="remark != null">remark = #{remark},</if>
+                            <if test="giftInfos != null">gift_infos = #{giftInfos},</if>
+                            <if test="donationMessage != null">donation_message = #{donationMessage},</if>
+                            <if test="invoiceCompanyName != null">invoice_company_name = #{invoiceCompanyName},</if>
+                            <if test="invoiceRegisterAddress != null">invoice_register_address = #{invoiceRegisterAddress},</if>
+                            <if test="invoiceRegisterMobile != null">invoice_register_mobile = #{invoiceRegisterMobile},</if>
+                            <if test="invoiceOpenBank != null">invoice_open_bank = #{invoiceOpenBank},</if>
+                            <if test="invoiceBankAccount != null">invoice_bank_account = #{invoiceBankAccount},</if>
+                            <if test="invoiceTitleType != null">invoice_title_type = #{invoiceTitleType},</if>
+                            <if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
+                            <if test="address != null">address = #{address},</if>
+                            <if test="detailAddress != null">detail_address = #{detailAddress},</if>
+                            <if test="pickUpAddress != null">pick_up_address = #{pickUpAddress},</if>
+                            <if test="deliveryType != null">delivery_type = #{deliveryType},</if>
+                            <if test="houseNumber != null">house_number = #{houseNumber},</if>
+                    </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <!-- 分页查询-->
+    <select id="queryByPage" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_order_attr
+        <where>
+            and del_flag = 'N'
+                            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                    and  id = #{record.id}
+                </if>
+                            <if test="record.orderId != null and !&quot;&quot;.equals(record.orderId)">
+                    and  order_id = #{record.orderId}
+                </if>
+                            <if test="record.receiptName != null and !&quot;&quot;.equals(record.receiptName)">
+                    and  receipt_name = #{record.receiptName}
+                </if>
+                            <if test="record.receiptAddress != null and !&quot;&quot;.equals(record.receiptAddress)">
+                    and  receipt_address = #{record.receiptAddress}
+                </if>
+                            <if test="record.receiptDetailAddress != null and !&quot;&quot;.equals(record.receiptDetailAddress)">
+                    and  receipt_detail_address = #{record.receiptDetailAddress}
+                </if>
+                            <if test="record.receiptMobile != null and !&quot;&quot;.equals(record.receiptMobile)">
+                    and  receipt_mobile = #{record.receiptMobile}
+                </if>
+                            <if test="record.receiptPhone != null and !&quot;&quot;.equals(record.receiptPhone)">
+                    and  receipt_phone = #{record.receiptPhone}
+                </if>
+                            <if test="record.receiptZipCode != null and !&quot;&quot;.equals(record.receiptZipCode)">
+                    and  receipt_zip_code = #{record.receiptZipCode}
+                </if>
+                            <if test="record.invoiceType != null and !&quot;&quot;.equals(record.invoiceType)">
+                    and  invoice_type = #{record.invoiceType}
+                </if>
+                            <if test="record.invoiceTitle != null and !&quot;&quot;.equals(record.invoiceTitle)">
+                    and  invoice_title = #{record.invoiceTitle}
+                </if>
+                            <if test="record.invoiceContent != null and !&quot;&quot;.equals(record.invoiceContent)">
+                    and  invoice_content = #{record.invoiceContent}
+                </if>
+                            <if test="record.invoiceTaxid != null and !&quot;&quot;.equals(record.invoiceTaxid)">
+                    and  invoice_taxid = #{record.invoiceTaxid}
+                </if>
+                            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                    and  remark = #{record.remark}
+                </if>
+                            <if test="record.giftInfos != null and !&quot;&quot;.equals(record.giftInfos)">
+                    and  gift_infos = #{record.giftInfos}
+                </if>
+                            <if test="record.donationMessage != null and !&quot;&quot;.equals(record.donationMessage)">
+                    and  donation_message = #{record.donationMessage}
+                </if>
+                            <if test="record.invoiceCompanyName != null and !&quot;&quot;.equals(record.invoiceCompanyName)">
+                    and  invoice_company_name = #{record.invoiceCompanyName}
+                </if>
+                            <if test="record.invoiceRegisterAddress != null and !&quot;&quot;.equals(record.invoiceRegisterAddress)">
+                    and  invoice_register_address = #{record.invoiceRegisterAddress}
+                </if>
+                            <if test="record.invoiceRegisterMobile != null and !&quot;&quot;.equals(record.invoiceRegisterMobile)">
+                    and  invoice_register_mobile = #{record.invoiceRegisterMobile}
+                </if>
+                            <if test="record.invoiceOpenBank != null and !&quot;&quot;.equals(record.invoiceOpenBank)">
+                    and  invoice_open_bank = #{record.invoiceOpenBank}
+                </if>
+                            <if test="record.invoiceBankAccount != null and !&quot;&quot;.equals(record.invoiceBankAccount)">
+                    and  invoice_bank_account = #{record.invoiceBankAccount}
+                </if>
+                            <if test="record.invoiceTitleType != null and !&quot;&quot;.equals(record.invoiceTitleType)">
+                    and  invoice_title_type = #{record.invoiceTitleType}
+                </if>
+                            <if test="record.deliveryTime != null and !&quot;&quot;.equals(record.deliveryTime)">
+                    and  delivery_time = #{record.deliveryTime}
+                </if>
+                            <if test="record.address != null and !&quot;&quot;.equals(record.address)">
+                    and  address = #{record.address}
+                </if>
+                            <if test="record.detailAddress != null and !&quot;&quot;.equals(record.detailAddress)">
+                    and  detail_address = #{record.detailAddress}
+                </if>
+                            <if test="record.pickUpAddress != null and !&quot;&quot;.equals(record.pickUpAddress)">
+                    and  pick_up_address = #{record.pickUpAddress}
+                </if>
+                            <if test="record.deliveryType != null and !&quot;&quot;.equals(record.deliveryType)">
+                    and  delivery_type = #{record.deliveryType}
+                </if>
+                            <if test="record.houseNumber != null and !&quot;&quot;.equals(record.houseNumber)">
+                    and  house_number = #{record.houseNumber}
+                </if>
+                    </where>
+        order by id desc
+    </select>
+
+    <!-- 全部查询 -->
+    <select id="queryAll" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_order_attr
+        <where>
+            and del_flag = 'N'
+                            <if test="id != null and !&quot;&quot;.equals(id)">
+                    and  id = #{id}
+                </if>
+                            <if test="orderId != null and !&quot;&quot;.equals(orderId)">
+                    and  order_id = #{orderId}
+                </if>
+                            <if test="receiptName != null and !&quot;&quot;.equals(receiptName)">
+                    and  receipt_name = #{receiptName}
+                </if>
+                            <if test="receiptAddress != null and !&quot;&quot;.equals(receiptAddress)">
+                    and  receipt_address = #{receiptAddress}
+                </if>
+                            <if test="receiptDetailAddress != null and !&quot;&quot;.equals(receiptDetailAddress)">
+                    and  receipt_detail_address = #{receiptDetailAddress}
+                </if>
+                            <if test="receiptMobile != null and !&quot;&quot;.equals(receiptMobile)">
+                    and  receipt_mobile = #{receiptMobile}
+                </if>
+                            <if test="receiptPhone != null and !&quot;&quot;.equals(receiptPhone)">
+                    and  receipt_phone = #{receiptPhone}
+                </if>
+                            <if test="receiptZipCode != null and !&quot;&quot;.equals(receiptZipCode)">
+                    and  receipt_zip_code = #{receiptZipCode}
+                </if>
+                            <if test="invoiceType != null and !&quot;&quot;.equals(invoiceType)">
+                    and  invoice_type = #{invoiceType}
+                </if>
+                            <if test="invoiceTitle != null and !&quot;&quot;.equals(invoiceTitle)">
+                    and  invoice_title = #{invoiceTitle}
+                </if>
+                            <if test="invoiceContent != null and !&quot;&quot;.equals(invoiceContent)">
+                    and  invoice_content = #{invoiceContent}
+                </if>
+                            <if test="invoiceTaxid != null and !&quot;&quot;.equals(invoiceTaxid)">
+                    and  invoice_taxid = #{invoiceTaxid}
+                </if>
+                            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                    and  remark = #{remark}
+                </if>
+                            <if test="giftInfos != null and !&quot;&quot;.equals(giftInfos)">
+                    and  gift_infos = #{giftInfos}
+                </if>
+                            <if test="donationMessage != null and !&quot;&quot;.equals(donationMessage)">
+                    and  donation_message = #{donationMessage}
+                </if>
+                            <if test="invoiceCompanyName != null and !&quot;&quot;.equals(invoiceCompanyName)">
+                    and  invoice_company_name = #{invoiceCompanyName}
+                </if>
+                            <if test="invoiceRegisterAddress != null and !&quot;&quot;.equals(invoiceRegisterAddress)">
+                    and  invoice_register_address = #{invoiceRegisterAddress}
+                </if>
+                            <if test="invoiceRegisterMobile != null and !&quot;&quot;.equals(invoiceRegisterMobile)">
+                    and  invoice_register_mobile = #{invoiceRegisterMobile}
+                </if>
+                            <if test="invoiceOpenBank != null and !&quot;&quot;.equals(invoiceOpenBank)">
+                    and  invoice_open_bank = #{invoiceOpenBank}
+                </if>
+                            <if test="invoiceBankAccount != null and !&quot;&quot;.equals(invoiceBankAccount)">
+                    and  invoice_bank_account = #{invoiceBankAccount}
+                </if>
+                            <if test="invoiceTitleType != null and !&quot;&quot;.equals(invoiceTitleType)">
+                    and  invoice_title_type = #{invoiceTitleType}
+                </if>
+                            <if test="deliveryTime != null and !&quot;&quot;.equals(deliveryTime)">
+                    and  delivery_time = #{deliveryTime}
+                </if>
+                            <if test="address != null and !&quot;&quot;.equals(address)">
+                    and  address = #{address}
+                </if>
+                            <if test="detailAddress != null and !&quot;&quot;.equals(detailAddress)">
+                    and  detail_address = #{detailAddress}
+                </if>
+                            <if test="pickUpAddress != null and !&quot;&quot;.equals(pickUpAddress)">
+                    and  pick_up_address = #{pickUpAddress}
+                </if>
+                            <if test="deliveryType != null and !&quot;&quot;.equals(deliveryType)">
+                    and  delivery_type = #{deliveryType}
+                </if>
+                            <if test="houseNumber != null and !&quot;&quot;.equals(houseNumber)">
+                    and  house_number = #{houseNumber}
+                </if>
+                    </where>
+        order by id desc
+    </select>
+
+    <!-- 根据条件查询一个 -->
+    <select id="queryOne" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_order_attr
+        <where>
+            and del_flag = 'N'
+                            <if test="id != null and !&quot;&quot;.equals(id)">
+                    and  id = #{id}
+                </if>
+                            <if test="orderId != null and !&quot;&quot;.equals(orderId)">
+                    and  order_id = #{orderId}
+                </if>
+                            <if test="receiptName != null and !&quot;&quot;.equals(receiptName)">
+                    and  receipt_name = #{receiptName}
+                </if>
+                            <if test="receiptAddress != null and !&quot;&quot;.equals(receiptAddress)">
+                    and  receipt_address = #{receiptAddress}
+                </if>
+                            <if test="receiptDetailAddress != null and !&quot;&quot;.equals(receiptDetailAddress)">
+                    and  receipt_detail_address = #{receiptDetailAddress}
+                </if>
+                            <if test="receiptMobile != null and !&quot;&quot;.equals(receiptMobile)">
+                    and  receipt_mobile = #{receiptMobile}
+                </if>
+                            <if test="receiptPhone != null and !&quot;&quot;.equals(receiptPhone)">
+                    and  receipt_phone = #{receiptPhone}
+                </if>
+                            <if test="receiptZipCode != null and !&quot;&quot;.equals(receiptZipCode)">
+                    and  receipt_zip_code = #{receiptZipCode}
+                </if>
+                            <if test="invoiceType != null and !&quot;&quot;.equals(invoiceType)">
+                    and  invoice_type = #{invoiceType}
+                </if>
+                            <if test="invoiceTitle != null and !&quot;&quot;.equals(invoiceTitle)">
+                    and  invoice_title = #{invoiceTitle}
+                </if>
+                            <if test="invoiceContent != null and !&quot;&quot;.equals(invoiceContent)">
+                    and  invoice_content = #{invoiceContent}
+                </if>
+                            <if test="invoiceTaxid != null and !&quot;&quot;.equals(invoiceTaxid)">
+                    and  invoice_taxid = #{invoiceTaxid}
+                </if>
+                            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                    and  remark = #{remark}
+                </if>
+                            <if test="giftInfos != null and !&quot;&quot;.equals(giftInfos)">
+                    and  gift_infos = #{giftInfos}
+                </if>
+                            <if test="donationMessage != null and !&quot;&quot;.equals(donationMessage)">
+                    and  donation_message = #{donationMessage}
+                </if>
+                            <if test="invoiceCompanyName != null and !&quot;&quot;.equals(invoiceCompanyName)">
+                    and  invoice_company_name = #{invoiceCompanyName}
+                </if>
+                            <if test="invoiceRegisterAddress != null and !&quot;&quot;.equals(invoiceRegisterAddress)">
+                    and  invoice_register_address = #{invoiceRegisterAddress}
+                </if>
+                            <if test="invoiceRegisterMobile != null and !&quot;&quot;.equals(invoiceRegisterMobile)">
+                    and  invoice_register_mobile = #{invoiceRegisterMobile}
+                </if>
+                            <if test="invoiceOpenBank != null and !&quot;&quot;.equals(invoiceOpenBank)">
+                    and  invoice_open_bank = #{invoiceOpenBank}
+                </if>
+                            <if test="invoiceBankAccount != null and !&quot;&quot;.equals(invoiceBankAccount)">
+                    and  invoice_bank_account = #{invoiceBankAccount}
+                </if>
+                            <if test="invoiceTitleType != null and !&quot;&quot;.equals(invoiceTitleType)">
+                    and  invoice_title_type = #{invoiceTitleType}
+                </if>
+                            <if test="deliveryTime != null and !&quot;&quot;.equals(deliveryTime)">
+                    and  delivery_time = #{deliveryTime}
+                </if>
+                            <if test="address != null and !&quot;&quot;.equals(address)">
+                    and  address = #{address}
+                </if>
+                            <if test="detailAddress != null and !&quot;&quot;.equals(detailAddress)">
+                    and  detail_address = #{detailAddress}
+                </if>
+                            <if test="pickUpAddress != null and !&quot;&quot;.equals(pickUpAddress)">
+                    and  pick_up_address = #{pickUpAddress}
+                </if>
+                            <if test="deliveryType != null and !&quot;&quot;.equals(deliveryType)">
+                    and  delivery_type = #{deliveryType}
+                </if>
+                            <if test="houseNumber != null and !&quot;&quot;.equals(houseNumber)">
+                    and  house_number = #{houseNumber}
+                </if>
+                    </where>
+        LIMIT 1
+    </select>
+
+    <update id="delete">
+        UPDATE ls_order_attr SET del_flag = 'Y'
+        <where>
+            AND id = #{id}
+        </where>
+    </update>
+
+    <update id="deleteIds" parameterType="java.util.ArrayList">
+        UPDATE  ls_order_attr SET del_flag = 'Y'
+        WHERE id IN
+        <foreach item='ids' collection="array" index="index" open="(" separator="," close=")">
+            #{ids}
+        </foreach>
+    </update>
+
+</mapper>

pine-admin/src/main/resources/mapper/business/OrderDao.xml

@@ -123,7 +123,7 @@
         select
         <include refid="Base_Column_List"/>
         from ls_order
-        where id = #{id,jdbcType=INTEGER}
+        where id = #{id,jdbcType=INTEGER} and store_id = 0
     </select>
 
     <!-- 根据Id删除-->
@@ -333,6 +333,7 @@
         select ls_order.*,ls_customer.username as customer_name from ls_order join ls_customer on ls_order.customer_id =
         ls_customer.id where ls_customer.del_flag = '0'
         and ls_order.store_id = 0
+
         <if test="record.orderCode != null and record.orderCode != '' ">
             AND ls_order.order_code = #{record.orderCode}
         </if>
@@ -760,20 +761,26 @@
         </where>
         LIMIT 1
     </select>
+    <select id="getById" parameterType="java.lang.Long" resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_order
+        where id = #{id,jdbcType=INTEGER} and store_id = 0
+    </select>
 
     <update id="delete">
-        UPDATE ls_order SET del_flag = 'Y'
-        <where>
-            AND id = #{id}
-        </where>
+<!--        UPDATE ls_order SET del_flag = 'Y'-->
+<!--        <where>-->
+<!--            AND id = #{id}-->
+<!--        </where>-->
     </update>
 
     <update id="deleteIds" parameterType="java.util.ArrayList">
-        UPDATE ls_order SET del_flag = 'Y'
-        WHERE id IN
-        <foreach item='ids' collection="array" index="index" open="(" separator="," close=")">
-            #{ids}
-        </foreach>
+<!--        UPDATE ls_order SET del_flag = 'Y'-->
+<!--        WHERE id IN-->
+<!--        <foreach item='ids' collection="array" index="index" open="(" separator="," close=")">-->
+<!--            #{ids}-->
+<!--        </foreach>-->
     </update>
 
 </mapper>

pine-admin/src/main/resources/mapper/business/OrderSkuDao.xml

@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.pine.admin.modules.business.dao.OrderSkuDao">
+
+    <!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.pine.admin.modules.business.entity.OrderSku" id="entityMap">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="skuId" column="sku_id"/>
+        <result property="num" column="num"/>
+        <result property="price" column="price"/>
+        <result property="skuPrice" column="sku_price"/>
+        <result property="skuName" column="sku_name"/>
+        <result property="skuNo" column="sku_no"/>
+        <result property="skuImage" column="sku_image"/>
+        <result property="skuSpecs" column="sku_specs"/>
+        <result property="priceDetail" column="price_detail"/>
+        <result property="commissionRate" column="commission_rate"/>
+        <result property="cateRate" column="cate_rate"/>
+        <result property="oldPrice" column="old_price"/>
+        <result property="supplyPrice" column="supply_price"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+                 id,
+                     order_id,
+                     sku_id,
+                     num,
+                     price,
+                     sku_price,
+                     sku_name,
+                     sku_no,
+                     sku_image,
+                     sku_specs,
+                     price_detail,
+                     commission_rate,
+                     cate_rate,
+                     old_price,
+                    supply_price         </sql>
+    <!-- 根据Id查询-->
+    <select id="selectByPrimaryKey" resultMap="entityMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_order_sku
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+
+    <!-- 根据Id删除-->
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+		delete from ls_order_sku
+		where id = #{id,jdbcType=INTEGER}
+	</delete>
+
+    <!-- 插入数据-->
+    <insert id="insertSelective" parameterType="com.pine.admin.modules.business.entity.OrderSku"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into ls_order_sku
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="orderId != null">order_id,</if>
+            <if test="skuId != null">sku_id,</if>
+            <if test="num != null">num,</if>
+            <if test="price != null">price,</if>
+            <if test="skuPrice != null">sku_price,</if>
+            <if test="skuName != null">sku_name,</if>
+            <if test="skuNo != null">sku_no,</if>
+            <if test="skuImage != null">sku_image,</if>
+            <if test="skuSpecs != null">sku_specs,</if>
+            <if test="priceDetail != null">price_detail,</if>
+            <if test="commissionRate != null">commission_rate,</if>
+            <if test="cateRate != null">cate_rate,</if>
+            <if test="oldPrice != null">old_price,</if>
+            <if test="supplyPrice != null">supply_price,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="orderId != null">#{orderId},</if>
+            <if test="skuId != null">#{skuId},</if>
+            <if test="num != null">#{num},</if>
+            <if test="price != null">#{price},</if>
+            <if test="skuPrice != null">#{skuPrice},</if>
+            <if test="skuName != null">#{skuName},</if>
+            <if test="skuNo != null">#{skuNo},</if>
+            <if test="skuImage != null">#{skuImage},</if>
+            <if test="skuSpecs != null">#{skuSpecs},</if>
+            <if test="priceDetail != null">#{priceDetail},</if>
+            <if test="commissionRate != null">#{commissionRate},</if>
+            <if test="cateRate != null">#{cateRate},</if>
+            <if test="oldPrice != null">#{oldPrice},</if>
+            <if test="supplyPrice != null">#{supplyPrice},</if>
+        </trim>
+    </insert>
+
+    <!-- 更新数据-->
+    <update id="updateByPrimaryKeySelective" parameterType="com.pine.admin.modules.business.entity.OrderSku">
+        update ls_order_sku
+        <set>
+            <if test="id != null">id = #{id},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
+            <if test="skuId != null">sku_id = #{skuId},</if>
+            <if test="num != null">num = #{num},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="skuPrice != null">sku_price = #{skuPrice},</if>
+            <if test="skuName != null">sku_name = #{skuName},</if>
+            <if test="skuNo != null">sku_no = #{skuNo},</if>
+            <if test="skuImage != null">sku_image = #{skuImage},</if>
+            <if test="skuSpecs != null">sku_specs = #{skuSpecs},</if>
+            <if test="priceDetail != null">price_detail = #{priceDetail},</if>
+            <if test="commissionRate != null">commission_rate = #{commissionRate},</if>
+            <if test="cateRate != null">cate_rate = #{cateRate},</if>
+            <if test="oldPrice != null">old_price = #{oldPrice},</if>
+            <if test="supplyPrice != null">supply_price = #{supplyPrice},</if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+
+    <!-- 分页查询-->
+    <select id="queryByPage" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_order_sku
+        <where>
+            and del_flag = 'N'
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
+            </if>
+            <if test="record.orderId != null and !&quot;&quot;.equals(record.orderId)">
+                and order_id = #{record.orderId}
+            </if>
+            <if test="record.skuId != null and !&quot;&quot;.equals(record.skuId)">
+                and sku_id = #{record.skuId}
+            </if>
+            <if test="record.num != null and !&quot;&quot;.equals(record.num)">
+                and num = #{record.num}
+            </if>
+            <if test="record.price != null and !&quot;&quot;.equals(record.price)">
+                and price = #{record.price}
+            </if>
+            <if test="record.skuPrice != null and !&quot;&quot;.equals(record.skuPrice)">
+                and sku_price = #{record.skuPrice}
+            </if>
+            <if test="record.skuName != null and !&quot;&quot;.equals(record.skuName)">
+                and sku_name = #{record.skuName}
+            </if>
+            <if test="record.skuNo != null and !&quot;&quot;.equals(record.skuNo)">
+                and sku_no = #{record.skuNo}
+            </if>
+            <if test="record.skuImage != null and !&quot;&quot;.equals(record.skuImage)">
+                and sku_image = #{record.skuImage}
+            </if>
+            <if test="record.skuSpecs != null and !&quot;&quot;.equals(record.skuSpecs)">
+                and sku_specs = #{record.skuSpecs}
+            </if>
+            <if test="record.priceDetail != null and !&quot;&quot;.equals(record.priceDetail)">
+                and price_detail = #{record.priceDetail}
+            </if>
+            <if test="record.commissionRate != null and !&quot;&quot;.equals(record.commissionRate)">
+                and commission_rate = #{record.commissionRate}
+            </if>
+            <if test="record.cateRate != null and !&quot;&quot;.equals(record.cateRate)">
+                and cate_rate = #{record.cateRate}
+            </if>
+            <if test="record.oldPrice != null and !&quot;&quot;.equals(record.oldPrice)">
+                and old_price = #{record.oldPrice}
+            </if>
+            <if test="record.supplyPrice != null and !&quot;&quot;.equals(record.supplyPrice)">
+                and supply_price = #{record.supplyPrice}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <!-- 全部查询 -->
+    <select id="queryAll" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_order_sku
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="orderId != null and !&quot;&quot;.equals(orderId)">
+                and order_id = #{orderId}
+            </if>
+            <if test="skuId != null and !&quot;&quot;.equals(skuId)">
+                and sku_id = #{skuId}
+            </if>
+            <if test="num != null and !&quot;&quot;.equals(num)">
+                and num = #{num}
+            </if>
+            <if test="price != null and !&quot;&quot;.equals(price)">
+                and price = #{price}
+            </if>
+            <if test="skuPrice != null and !&quot;&quot;.equals(skuPrice)">
+                and sku_price = #{skuPrice}
+            </if>
+            <if test="skuName != null and !&quot;&quot;.equals(skuName)">
+                and sku_name = #{skuName}
+            </if>
+            <if test="skuNo != null and !&quot;&quot;.equals(skuNo)">
+                and sku_no = #{skuNo}
+            </if>
+            <if test="skuImage != null and !&quot;&quot;.equals(skuImage)">
+                and sku_image = #{skuImage}
+            </if>
+            <if test="skuSpecs != null and !&quot;&quot;.equals(skuSpecs)">
+                and sku_specs = #{skuSpecs}
+            </if>
+            <if test="priceDetail != null and !&quot;&quot;.equals(priceDetail)">
+                and price_detail = #{priceDetail}
+            </if>
+            <if test="commissionRate != null and !&quot;&quot;.equals(commissionRate)">
+                and commission_rate = #{commissionRate}
+            </if>
+            <if test="cateRate != null and !&quot;&quot;.equals(cateRate)">
+                and cate_rate = #{cateRate}
+            </if>
+            <if test="oldPrice != null and !&quot;&quot;.equals(oldPrice)">
+                and old_price = #{oldPrice}
+            </if>
+            <if test="supplyPrice != null and !&quot;&quot;.equals(supplyPrice)">
+                and supply_price = #{supplyPrice}
+            </if>
+        </where>
+        order by id desc
+    </select>
+
+    <!-- 根据条件查询一个 -->
+    <select id="queryOne" parameterType="java.util.Map"
+            resultMap="entityMap">
+        select
+        <include refid="Base_Column_List"/>
+        from ls_order_sku
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="orderId != null and !&quot;&quot;.equals(orderId)">
+                and order_id = #{orderId}
+            </if>
+            <if test="skuId != null and !&quot;&quot;.equals(skuId)">
+                and sku_id = #{skuId}
+            </if>
+            <if test="num != null and !&quot;&quot;.equals(num)">
+                and num = #{num}
+            </if>
+            <if test="price != null and !&quot;&quot;.equals(price)">
+                and price = #{price}
+            </if>
+            <if test="skuPrice != null and !&quot;&quot;.equals(skuPrice)">
+                and sku_price = #{skuPrice}
+            </if>
+            <if test="skuName != null and !&quot;&quot;.equals(skuName)">
+                and sku_name = #{skuName}
+            </if>
+            <if test="skuNo != null and !&quot;&quot;.equals(skuNo)">
+                and sku_no = #{skuNo}
+            </if>
+            <if test="skuImage != null and !&quot;&quot;.equals(skuImage)">
+                and sku_image = #{skuImage}
+            </if>
+            <if test="skuSpecs != null and !&quot;&quot;.equals(skuSpecs)">
+                and sku_specs = #{skuSpecs}
+            </if>
+            <if test="priceDetail != null and !&quot;&quot;.equals(priceDetail)">
+                and price_detail = #{priceDetail}
+            </if>
+            <if test="commissionRate != null and !&quot;&quot;.equals(commissionRate)">
+                and commission_rate = #{commissionRate}
+            </if>
+            <if test="cateRate != null and !&quot;&quot;.equals(cateRate)">
+                and cate_rate = #{cateRate}
+            </if>
+            <if test="oldPrice != null and !&quot;&quot;.equals(oldPrice)">
+                and old_price = #{oldPrice}
+            </if>
+            <if test="supplyPrice != null and !&quot;&quot;.equals(supplyPrice)">
+                and supply_price = #{supplyPrice}
+            </if>
+        </where>
+        LIMIT 1
+    </select>
+    <select id="queryByOrderId" parameterType="java.lang.Long"  resultMap="entityMap">
+        select   <include refid="Base_Column_List"/>  from ls_order_sku where order_id=#{orderId}
+    </select>
+
+    <update id="delete">
+        UPDATE ls_order_sku SET del_flag = 'Y'
+        <where>
+            AND id = #{id}
+        </where>
+    </update>
+
+    <update id="deleteIds" parameterType="java.util.ArrayList">
+        UPDATE ls_order_sku SET del_flag = 'Y'
+        WHERE id IN
+        <foreach item='ids' collection="array" index="index" open="(" separator="," close=")">
+            #{ids}
+        </foreach>
+    </update>
+
+</mapper>

pine-admin/src/test/com/pine/admin/modules/business/service/impl/CarBackOrderServiceImplTest.java

@@ -47,4 +47,5 @@ public class CarBackOrderServiceImplTest {
         });
     }
 
-}
+
+}

pine-admin/src/test/com/pine/admin/modules/business/service/impl/OrderServiceImplTest.java

@@ -0,0 +1,30 @@
+package com.pine.admin.modules.business.service.impl;
+
+
+import com.pine.admin.modules.business.entity.Order;
+import com.pine.admin.modules.business.service.OrderService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * com.pine.admin.modules.business.service.impl
+ *
+ * @author Pine
+ * @email 771190883@qq.com
+ * @date 2019/10/14
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class OrderServiceImplTest {
+
+    @Autowired
+    private OrderService orderService;
+
+    @Test
+    public void queryOrder(){
+        Order byId = orderService.getById("3694");
+    }
+}