お問い合わせ\注文

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/bo/BssAskBo.java

@@ -50,7 +50,7 @@ public class BssAskBo implements Serializable {
      * ステータス
      */
     @LmNotBlank(params = {"{status}"}, groups = {ValidatorGroup.AddGroup.class, ValidatorGroup.UpdateGroup.class})
-    private Integer status;
+    private String status;
 
     /**
      * お問い合わせ・対応内容
@@ -61,7 +61,7 @@ public class BssAskBo implements Serializable {
     /**
      * お問い合わせ者区分
      */
-    private Integer askUserType;
+    private String askUserType;
 
     /**
      * システム顧客番号

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/bo/BssAskSearchBo.java

@@ -0,0 +1,118 @@
+package jp.yamoto.farm.crm.biz.bss.domain.bo;
+
+import jp.yamoto.farm.common.utils.ValidatorUtils;
+import jp.yamoto.farm.common.utils.ValueUtils;
+import jp.yamoto.farm.common.validator.annotation.LmLength;
+import jp.yamoto.farm.common.validator.annotation.LmNotBlank;
+import jp.yamoto.farm.common.validator.utils.ValidatorGroup;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 問合せ情報 サービスパラメータ対象
+ *
+ * @author nextosd
+ */
+@Data
+public class BssAskSearchBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * お問い合わせ番号
+     */
+    private String askNo;
+
+    /**
+     * 問合せ受付開始日
+     */
+    private String askDateStart;
+
+    /**
+     * 問合せ受付終了日
+     */
+    private String askDateEnd;
+
+    /**
+     * 最終更新開始日
+     */
+    private String finalUpdateDateStart;
+
+    /**
+     * 最終更新終了日
+     */
+    private String finalUpdateDateEnd;
+
+    /**
+     * 注文開始日
+     */
+    private String orderDateStart;
+
+    /**
+     * 注文開始日
+     */
+    private String orderDateEnd;
+
+    /**
+     * 最終対応者
+     */
+    private String finalAnswerUser;
+    /**
+     * お問い合わせ者
+     */
+    private String askUser;
+
+    /**
+     * カテゴリ（大）
+     */
+    private String category1;
+
+    /**
+     * カテゴリ（中）
+     */
+    private String category2;
+
+    /**
+     * ステータス
+     */
+    private String status;
+
+    /**
+     * 農家ID
+     */
+    private String farmerId;
+
+    /**
+     * 農家名
+     */
+    private String farmerName;
+
+    /**
+     * 注文ID
+     */
+    private String orderId;
+
+
+    public String getFinalUpdateDateStart() {
+        if(ValueUtils.isNotEmpty(this.finalUpdateDateStart)){
+            return this.finalUpdateDateStart+" 00:00:00";
+        }
+        return  this.finalUpdateDateStart;
+    }
+
+    public String getFinalUpdateDateEnd() {
+        if(ValueUtils.isNotEmpty(this.finalUpdateDateEnd)){
+            return this.finalUpdateDateEnd+" 23:59:59";
+        }
+        return  this.finalUpdateDateEnd;
+    }
+
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/entity/BssAsk.java

@@ -88,7 +88,7 @@ public class BssAsk extends BaseEntity {
     /**
      * 最終更新日時
      */
-    private Date finalUpdateTime;
+    private String finalUpdateTime;
 
     /**
      * システム顧客番号

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/entity/BssOrder.java

@@ -0,0 +1,161 @@
+package jp.yamoto.farm.crm.biz.bss.domain.entity;
+
+import jp.yamoto.farm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 注文情報 (bss_order)
+ *
+ * @author nextosd
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class BssOrder extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 注文ID
+     */
+    private String orderId;
+
+    /**
+     * システム注文番号
+     */
+    private String sysOrderId;
+
+    /**
+     * 農家ID
+     */
+    private String farmerId;
+
+    /**
+     * ステータス
+     */
+    private String status;
+
+    /**
+     * 注文受付日
+     */
+    private String orderTime;
+
+    /**
+     * 集荷予定日
+     */
+    private String deliveryPlanDate;
+
+    /**
+     * 決済方法
+     */
+    private String paymentType;
+
+    /**
+     * 決済日
+     */
+    private String paymentDate;
+
+    /**
+     * 出荷予定日
+     */
+    private String shipPlanDate;
+
+    /**
+     * 出荷日
+     */
+    private String shipDate;
+
+    /**
+     * 経路
+     */
+    private String ordPrxRoute;
+
+    /**
+     * 配送方法
+     */
+    private String dlvdeliveryFlg;
+
+    /**
+     * 配送先数
+     */
+    private Integer dlvdeliveryCnt;
+
+    /**
+     * 配送完了日
+     */
+    private String haitatsuBi;
+
+    /**
+     * システム顧客番号
+     */
+    private String sysCustomerId;
+
+    /**
+     * 会員ID
+     */
+    private String memberId;
+
+    /**
+     * 依頼主
+     */
+    private String customerName;
+
+    /**
+     * 郵便番号
+     */
+    private String postalCode;
+
+    /**
+     * 住所
+     */
+    private String address;
+
+    /**
+     * メールアドレス
+     */
+    private String mailAddress;
+
+    /**
+     * 電話番号
+     */
+    private String phoneNumber;
+
+    /**
+     * 商品合計（税込）
+     */
+    private BigDecimal itemTotalTax;
+
+    /**
+     * 商品合計
+     */
+    private BigDecimal itemTotal;
+
+    /**
+     * 合計送料
+     */
+    private BigDecimal totoalCarriage;
+
+    /**
+     * お支払い方法
+     */
+    private String shopPayMethod;
+
+    /**
+     * お支払い状況
+     */
+    private String shopPaySituation;
+
+    /**
+     * リビジョン
+     */
+    private Integer version;
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/entity/BssOrderDelivery.java

@@ -0,0 +1,126 @@
+package jp.yamoto.farm.crm.biz.bss.domain.entity;
+
+import jp.yamoto.farm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 注文配送先情報 (bss_order_delivery)
+ *
+ * @author nextosd
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class BssOrderDelivery extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 注文ID
+     */
+    private String orderId;
+
+    /**
+     * 届け先
+     */
+    private String deliveryCustomerName;
+
+    /**
+     * 配送先郵便番号
+     */
+    private String postalCode;
+
+    /**
+     * 住所
+     */
+    private String address;
+
+    /**
+     * 配送先メールアドレス
+     */
+    private String mailAddress;
+
+    /**
+     * 配送先電話番号
+     */
+    private String phoneNumber;
+
+    /**
+     * システム顧客番号
+     */
+    private String sysCustomerId;
+
+    /**
+     * 顧客番号
+     */
+    private String customerId;
+
+    /**
+     * 会員ID
+     */
+    private String memberId;
+
+    /**
+     * 伝票番号
+     */
+    private String deliveryTrackingNo;
+
+    /**
+     * 配送先選択
+     */
+    private String deliverydestType;
+
+    /**
+     * 配送方法
+     */
+    private String dlvdeliveryFlg;
+
+    /**
+     * 配達希望日
+     */
+    private String deliveryDate;
+
+    /**
+     * 受取時間帯
+     */
+    private String originalTime;
+
+    /**
+     * 送り状発行単位
+     */
+    private String invoiceUnit;
+
+    /**
+     * 荷物ステータス
+     */
+    private String iuggageStatus;
+
+    /**
+     * 送料
+     */
+    private BigDecimal carriage;
+
+    /**
+     * 農家ID
+     */
+    private String farmerId;
+
+    /**
+     * メモ
+     */
+    private String remark;
+
+    /**
+     * リビジョン
+     */
+    private Integer version;
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/entity/BssOrderDeliveryItem.java

@@ -0,0 +1,101 @@
+package jp.yamoto.farm.crm.biz.bss.domain.entity;
+
+import jp.yamoto.farm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 注文配送先商品情報 (bss_order_delivery_item)
+ *
+ * @author nextosd
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class BssOrderDeliveryItem extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 注文ID
+     */
+    private String orderId;
+
+    /**
+     * 配送先ID
+     */
+    private String deliveryId;
+
+    /**
+     * ステータス
+     */
+    private String status;
+
+    /**
+     * 注文受付日
+     */
+    private String orderDate;
+
+    /**
+     * 農家ID
+     */
+    private String farmerId;
+
+    /**
+     * システム商品番号
+     */
+    private String sysItemCode;
+
+    /**
+     * 商品コード
+     */
+    private String itemCd;
+
+    /**
+     * 商品名
+     */
+    private String itemName;
+
+    /**
+     * 商品単価
+     */
+    private BigDecimal itemPrice;
+
+    /**
+     * 商品単価（税込）
+     */
+    private BigDecimal itemPriceTax;
+
+    /**
+     * 商品消費税
+     */
+    private BigDecimal itemSalesTax;
+
+    /**
+     * 数量
+     */
+    private BigDecimal qty;
+
+    /**
+     * 小計
+     */
+    private BigDecimal subtotal;
+
+    /**
+     * 小計（税込）
+     */
+    private BigDecimal subtotalTax;
+
+    /**
+     * リビジョン
+     */
+    private Integer version;
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/vo/BssAskListVo.java

@@ -0,0 +1,88 @@
+package jp.yamoto.farm.crm.biz.bss.domain.vo;
+
+import jp.yamoto.farm.common.core.domain.BaseEntity;
+import jp.yamoto.farm.crm.biz.master.domain.vo.MastFarmerVo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 問合せ情報詳細情報Vo
+ *
+ * @author nextosd
+ */
+@Data
+public class BssAskListVo {
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * お問い合わせ番号
+     */
+    private String askNo;
+
+    /**
+     * 問合せ受付日
+     */
+    private String askDate;
+
+    /**
+     * カテゴリ（大）
+     */
+    private String category1;
+
+    /**
+     * カテゴリ（中）
+     */
+    private String category2;
+
+    /**
+     * ステータス
+     */
+    private String status;
+
+    /**
+     * ステータス
+     */
+    private String statusLabel;
+
+    /**
+     * お問い合わせ・対応内容
+     */
+    private String askAnswerRemark;
+
+
+    /**
+     * お問い合わせ者
+     */
+    private String askUser;
+
+    /**
+     * 最終対応者
+     */
+    private String finalAnswerUser;
+
+    /**
+     * 最終更新日時
+     */
+    private String finalUpdateTime;
+
+    /**
+     * 農家ID
+     */
+    private String farmerId;
+
+    /**
+     * 農家名
+     */
+    private String farmerName;
+
+    /**
+     * 注文ID
+     */
+    private String orderId;
+
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/vo/BssAskVo.java

@@ -1,6 +1,9 @@
 package jp.yamoto.farm.crm.biz.bss.domain.vo;
 
 import jp.yamoto.farm.common.core.domain.BaseEntity;
+import jp.yamoto.farm.common.validator.annotation.LmLength;
+import jp.yamoto.farm.common.validator.annotation.LmNotBlank;
+import jp.yamoto.farm.common.validator.utils.ValidatorGroup;
 import jp.yamoto.farm.crm.biz.master.domain.entity.MastFarmer;
 import jp.yamoto.farm.crm.biz.master.domain.vo.MastFarmerVo;
 import lombok.Data;
@@ -57,7 +60,7 @@ public class BssAskVo extends BaseEntity {
     /**
      * ステータス
      */
-    private Integer status;
+    private String status;
 
     /**
      * お問い合わせ・対応内容
@@ -77,7 +80,7 @@ public class BssAskVo extends BaseEntity {
     /**
      * お問い合わせ者区分
      */
-    private Integer askUserType;
+    private String askUserType;
 
     /**
      * 最終対応者
@@ -87,7 +90,7 @@ public class BssAskVo extends BaseEntity {
     /**
      * 最終更新日時
      */
-    private Date finalUpdateTime;
+    private String finalUpdateTime;
 
     /**
      * システム顧客番号
@@ -128,4 +131,9 @@ public class BssAskVo extends BaseEntity {
      * 問合せ対応履歴情報 詳細情報Vo
      */
     private List<BssAskHistoryVo> vssAskHistoryVoLst;
+
+    /**
+     * 注文詳細情報Vo
+     */
+    private  BssOrderDetailVo orderDetailVo;
 }

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/vo/BssOrderDeliveryItemVo.java

@@ -0,0 +1,97 @@
+package jp.yamoto.farm.crm.biz.bss.domain.vo;
+
+import jp.yamoto.farm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 注文配送先商品情報詳細情報Vo
+ *
+ * @author nextosd
+ */
+@Data
+public class BssOrderDeliveryItemVo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 注文ID
+     */
+    private String orderId;
+
+    /**
+     * 配送先ID
+     */
+    private String deliveryId;
+
+    /**
+     * ステータス
+     */
+    private String status;
+
+    /**
+     * 注文受付日
+     */
+    private String orderDate;
+
+    /**
+     * 農家ID
+     */
+    private String farmerId;
+
+    /**
+     * システム商品番号
+     */
+    private String sysItemCode;
+
+    /**
+     * 商品コード
+     */
+    private String itemCd;
+
+    /**
+     * 商品名
+     */
+    private String itemName;
+
+    /**
+     * 商品単価
+     */
+    private BigDecimal itemPrice;
+
+    /**
+     * 商品単価（税込）
+     */
+    private BigDecimal itemPriceTax;
+
+    /**
+     * 商品消費税
+     */
+    private BigDecimal itemSalesTax;
+
+    /**
+     * 数量
+     */
+    private BigDecimal qty;
+
+    /**
+     * 小計
+     */
+    private BigDecimal subtotal;
+
+    /**
+     * 小計（税込）
+     */
+    private BigDecimal subtotalTax;
+
+    /**
+     * リビジョン
+     */
+    private Integer version;
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/vo/BssOrderDeliveryVo.java

@@ -0,0 +1,122 @@
+package jp.yamoto.farm.crm.biz.bss.domain.vo;
+
+import jp.yamoto.farm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 注文配送先情報詳細情報Vo
+ *
+ * @author nextosd
+ */
+@Data
+public class BssOrderDeliveryVo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 注文ID
+     */
+    private String orderId;
+
+    /**
+     * 届け先
+     */
+    private String deliveryCustomerName;
+
+    /**
+     * 配送先郵便番号
+     */
+    private String postalCode;
+
+    /**
+     * 住所
+     */
+    private String address;
+
+    /**
+     * 配送先メールアドレス
+     */
+    private String mailAddress;
+
+    /**
+     * 配送先電話番号
+     */
+    private String phoneNumber;
+
+    /**
+     * システム顧客番号
+     */
+    private String sysCustomerId;
+
+    /**
+     * 顧客番号
+     */
+    private String customerId;
+
+    /**
+     * 会員ID
+     */
+    private String memberId;
+
+    /**
+     * 伝票番号
+     */
+    private String deliveryTrackingNo;
+
+    /**
+     * 配送先選択
+     */
+    private String deliverydestType;
+
+    /**
+     * 配送方法
+     */
+    private String dlvdeliveryFlg;
+
+    /**
+     * 配達希望日
+     */
+    private String deliveryDate;
+
+    /**
+     * 受取時間帯
+     */
+    private String originalTime;
+
+    /**
+     * 送り状発行単位
+     */
+    private String invoiceUnit;
+
+    /**
+     * 荷物ステータス
+     */
+    private String iuggageStatus;
+
+    /**
+     * 送料
+     */
+    private BigDecimal carriage;
+
+    /**
+     * 農家ID
+     */
+    private String farmerId;
+
+    /**
+     * メモ
+     */
+    private String remark;
+
+    /**
+     * リビジョン
+     */
+    private Integer version;
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/vo/BssOrderDetailVo.java

@@ -0,0 +1,49 @@
+package jp.yamoto.farm.crm.biz.bss.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BssOrderDetailVo {
+
+    /**
+     * 注文ID
+     */
+    private String orderId;
+
+    /**
+     * システム注文番号
+     */
+    private String sysOrderId;
+
+    /**
+     * ステータス
+     */
+    private String status;
+
+    /**
+     * ステータス
+     */
+    private String statusLabel;
+
+    /**
+     * 依頼主
+     */
+    private String customerName;
+
+    /**
+     * 郵便番号
+     */
+    private String postalCode;
+
+    /**
+     * 住所
+     */
+    private String address;
+
+    /**
+     * 届け先リスト
+     */
+    private List<BssOrderDeliveryVo> orderDeliveryVoLst;
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/domain/vo/BssOrderVo.java

@@ -0,0 +1,157 @@
+package jp.yamoto.farm.crm.biz.bss.domain.vo;
+
+import jp.yamoto.farm.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 注文情報詳細情報Vo
+ *
+ * @author nextosd
+ */
+@Data
+public class BssOrderVo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 注文ID
+     */
+    private String orderId;
+
+    /**
+     * システム注文番号
+     */
+    private String sysOrderId;
+
+    /**
+     * 農家ID
+     */
+    private String farmerId;
+
+    /**
+     * ステータス
+     */
+    private String status;
+
+    /**
+     * 注文受付日
+     */
+    private String orderTime;
+
+    /**
+     * 集荷予定日
+     */
+    private String deliveryPlanDate;
+
+    /**
+     * 決済方法
+     */
+    private String paymentType;
+
+    /**
+     * 決済日
+     */
+    private String paymentDate;
+
+    /**
+     * 出荷予定日
+     */
+    private String shipPlanDate;
+
+    /**
+     * 出荷日
+     */
+    private String shipDate;
+
+    /**
+     * 経路
+     */
+    private String ordPrxRoute;
+
+    /**
+     * 配送方法
+     */
+    private String dlvdeliveryFlg;
+
+    /**
+     * 配送先数
+     */
+    private Integer dlvdeliveryCnt;
+
+    /**
+     * 配送完了日
+     */
+    private String haitatsuBi;
+
+    /**
+     * システム顧客番号
+     */
+    private String sysCustomerId;
+
+    /**
+     * 会員ID
+     */
+    private String memberId;
+
+    /**
+     * 依頼主
+     */
+    private String customerName;
+
+    /**
+     * 郵便番号
+     */
+    private String postalCode;
+
+    /**
+     * 住所
+     */
+    private String address;
+
+    /**
+     * メールアドレス
+     */
+    private String mailAddress;
+
+    /**
+     * 電話番号
+     */
+    private String phoneNumber;
+
+    /**
+     * 商品合計（税込）
+     */
+    private BigDecimal itemTotalTax;
+
+    /**
+     * 商品合計
+     */
+    private BigDecimal itemTotal;
+
+    /**
+     * 合計送料
+     */
+    private BigDecimal totoalCarriage;
+
+    /**
+     * お支払い方法
+     */
+    private String shopPayMethod;
+
+    /**
+     * お支払い状況
+     */
+    private String shopPaySituation;
+
+    /**
+     * リビジョン
+     */
+    private Integer version;
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/mapper/BssAskMapper.java

@@ -1,6 +1,8 @@
 package jp.yamoto.farm.crm.biz.bss.mapper;
 
+import jp.yamoto.farm.crm.biz.bss.domain.bo.BssAskSearchBo;
 import jp.yamoto.farm.crm.biz.bss.domain.entity.BssAsk;
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssAskListVo;
 import jp.yamoto.farm.crm.biz.bss.domain.vo.BssAskVo;
 import jp.yamoto.farm.crm.biz.master.domain.entity.MastOkyakusama;
 
@@ -25,10 +27,10 @@ public interface BssAskMapper {
     /**
      * 問合せ情報を検索リスト
      *
-     * @param bssAsk 問合せ情報
+     * @param bssAskSearchBo 問合せ情報
      * @return 問合せ情報リスト
      */
-    public List<BssAskVo> selectList(BssAsk bssAsk);
+    public List<BssAskListVo> selectList(BssAskSearchBo bssAskSearchBo);
 
     /**
      * 問合せ情報を登録

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/mapper/BssOrderDeliveryItemMapper.java

@@ -0,0 +1,48 @@
+package jp.yamoto.farm.crm.biz.bss.mapper;
+
+import jp.yamoto.farm.crm.biz.bss.domain.entity.BssOrderDeliveryItem;
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssOrderDeliveryItemVo;
+import java.util.List;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 注文配送先商品情報 Mapperインタフェース
+ *
+ * @author nextosd
+ */
+public interface BssOrderDeliveryItemMapper {
+
+     /**
+     *注文配送先商品情報を検索
+     *
+     * @param id 注文配送先商品情報プライマリ・キー
+     * @return 注文配送先商品情報
+     */
+    public BssOrderDeliveryItemVo selectById(String id);
+
+     /**
+     *注文配送先商品情報を検索リスト
+     *
+     * @param bssOrderDeliveryItem 注文配送先商品情報
+     * @return 注文配送先商品情報リスト
+     */
+    public List<BssOrderDeliveryItemVo> selectList(BssOrderDeliveryItem bssOrderDeliveryItem);
+
+     /**
+     *注文配送先商品情報を登録
+     *
+     * @param bssOrderDeliveryItem 注文配送先商品情報
+     * @return  結果
+     */
+    public int insert(BssOrderDeliveryItem bssOrderDeliveryItem);
+
+     /**
+     *注文配送先商品情報を修正
+     *
+     * @param bssOrderDeliveryItem 注文配送先商品情報
+     * @return  結果
+     */
+    public int update(BssOrderDeliveryItem bssOrderDeliveryItem);
+
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/mapper/BssOrderDeliveryMapper.java

@@ -0,0 +1,48 @@
+package jp.yamoto.farm.crm.biz.bss.mapper;
+
+import jp.yamoto.farm.crm.biz.bss.domain.entity.BssOrderDelivery;
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssOrderDeliveryVo;
+import java.util.List;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 注文配送先情報 Mapperインタフェース
+ *
+ * @author nextosd
+ */
+public interface BssOrderDeliveryMapper {
+
+     /**
+     *注文配送先情報を検索
+     *
+     * @param id 注文配送先情報プライマリ・キー
+     * @return 注文配送先情報
+     */
+    public BssOrderDeliveryVo selectById(String id);
+
+     /**
+     *注文配送先情報を検索リスト
+     *
+     * @param bssOrderDelivery 注文配送先情報
+     * @return 注文配送先情報リスト
+     */
+    public List<BssOrderDeliveryVo> selectList(BssOrderDelivery bssOrderDelivery);
+
+     /**
+     *注文配送先情報を登録
+     *
+     * @param bssOrderDelivery 注文配送先情報
+     * @return  結果
+     */
+    public int insert(BssOrderDelivery bssOrderDelivery);
+
+     /**
+     *注文配送先情報を修正
+     *
+     * @param bssOrderDelivery 注文配送先情報
+     * @return  結果
+     */
+    public int update(BssOrderDelivery bssOrderDelivery);
+
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/mapper/BssOrderMapper.java

@@ -0,0 +1,48 @@
+package jp.yamoto.farm.crm.biz.bss.mapper;
+
+import jp.yamoto.farm.crm.biz.bss.domain.entity.BssOrder;
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssOrderVo;
+import java.util.List;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 注文情報 Mapperインタフェース
+ *
+ * @author nextosd
+ */
+public interface BssOrderMapper {
+
+     /**
+     *注文情報を検索
+     *
+     * @param orderId 注文Id
+     * @return 注文情報
+     */
+    public BssOrderVo selectByOrderId(String orderId);
+
+     /**
+     *注文情報を検索リスト
+     *
+     * @param bssOrder 注文情報
+     * @return 注文情報リスト
+     */
+    public List<BssOrderVo> selectList(BssOrder bssOrder);
+
+     /**
+     *注文情報を登録
+     *
+     * @param bssOrder 注文情報
+     * @return  結果
+     */
+    public int insert(BssOrder bssOrder);
+
+     /**
+     *注文情報を修正
+     *
+     * @param bssOrder 注文情報
+     * @return  結果
+     */
+    public int update(BssOrder bssOrder);
+
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/service/IBssAskService.java

@@ -1,7 +1,9 @@
 package jp.yamoto.farm.crm.biz.bss.service;
 
 import jp.yamoto.farm.crm.biz.bss.domain.bo.BssAskBo;
+import jp.yamoto.farm.crm.biz.bss.domain.bo.BssAskSearchBo;
 import jp.yamoto.farm.crm.biz.bss.domain.entity.BssAsk;
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssAskListVo;
 import jp.yamoto.farm.crm.biz.bss.domain.vo.BssAskVo;
 
 import java.util.List;
@@ -24,10 +26,10 @@ public interface IBssAskService {
     /**
      * お問い合わせのリストを検索
      *
-     * @param bssAskBo お問い合わせパラメータ対象
+     * @param bssAskSearchBo お問い合わせパラメータ対象
      * @return お問い合わせリスト
      */
-    public List<BssAskVo> selectList(BssAskBo bssAskBo);
+    public List<BssAskListVo> selectList(BssAskSearchBo bssAskSearchBo);
 
     /**
      * お問い合わせの追加

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/service/IBssOrderService.java

@@ -0,0 +1,25 @@
+package jp.yamoto.farm.crm.biz.bss.service;
+
+
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssOrderDetailVo;
+
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssOrderVo;
+
+import java.util.List;
+
+/**
+ * 注文 Serviceインタフェース
+ *
+ * @author nextosd
+ */
+public interface IBssOrderService {
+
+    /**
+     * 注文の検索
+     *
+     * @param orderId 注文Id
+     * @return 注文
+     */
+    public BssOrderDetailVo selectByOrderId(String orderId);
+
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/service/impl/BssAskServiceImpl.java

@@ -1,23 +1,25 @@
 package jp.yamoto.farm.crm.biz.bss.service.impl;
 
 import jp.yamoto.farm.common.core.domain.model.LoginUser;
-import jp.yamoto.farm.common.core.enums.DelFlgEnum;
 import jp.yamoto.farm.common.exception.ServiceException;
 import jp.yamoto.farm.common.utils.*;
 import jp.yamoto.farm.common.utils.uuid.IdUtils;
 import jp.yamoto.farm.crm.biz.bss.domain.bo.BssAskBo;
+import jp.yamoto.farm.crm.biz.bss.domain.bo.BssAskSearchBo;
 import jp.yamoto.farm.crm.biz.bss.domain.entity.BssAsk;
 import jp.yamoto.farm.crm.biz.bss.domain.entity.BssAskHistory;
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssAskListVo;
 import jp.yamoto.farm.crm.biz.bss.domain.vo.BssAskVo;
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssOrderDetailVo;
 import jp.yamoto.farm.crm.biz.bss.mapper.BssAskHistoryMapper;
 import jp.yamoto.farm.crm.biz.bss.mapper.BssAskMapper;
 import jp.yamoto.farm.crm.biz.bss.service.IBssAskService;
 import jp.yamoto.farm.crm.biz.master.domain.bo.MastCustomerBo;
 import jp.yamoto.farm.crm.biz.master.domain.bo.MastFarmerBo;
-import jp.yamoto.farm.crm.biz.master.domain.entity.MastFarmer;
 import jp.yamoto.farm.crm.biz.master.domain.vo.MastFarmerVo;
 import jp.yamoto.farm.crm.biz.master.service.IMastCustomerService;
 import jp.yamoto.farm.crm.biz.master.service.IMastFarmerService;
+import jp.yamoto.farm.crm.biz.bss.service.IBssOrderService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -46,6 +48,9 @@ public class BssAskServiceImpl implements IBssAskService {
     @Autowired
     private IMastFarmerService mastFarmerService;
 
+    @Autowired
+    private  IBssOrderService  orderService;
+
     /**
      * お問い合わせの検索
      *
@@ -70,7 +75,8 @@ public class BssAskServiceImpl implements IBssAskService {
 
         // 注文情報
         if (ValueUtils.isNotEmpty(bssAskVo.getOrderId())) {
-
+            BssOrderDetailVo detailVo=  orderService.selectByOrderId(bssAskVo.getOrderId());
+            bssAskVo.setOrderDetailVo(detailVo);
         }
 
         // 対応履歴
@@ -84,15 +90,13 @@ public class BssAskServiceImpl implements IBssAskService {
     /**
      * お問い合わせのリストを検索
      *
-     * @param bssAskBo お問い合わせパラメータ対象
+     * @param bssAskSearchBo お問い合わせパラメータ対象
      * @return お問い合わせリスト
      */
     @Override
-    public List<BssAskVo> selectList(BssAskBo bssAskBo) {
+    public List<BssAskListVo> selectList(BssAskSearchBo bssAskSearchBo) {
 
-        BssAsk bssAsk = new BssAsk();
-        BeanUtils.copyProperties(bssAskBo, bssAsk);
-        return bssAskMapper.selectList(bssAsk);
+        return bssAskMapper.selectList(bssAskSearchBo);
     }
 
     /**
@@ -120,7 +124,7 @@ public class BssAskServiceImpl implements IBssAskService {
         int result = bssAskMapper.insert(bssAsk);
         if (result > 0) {
             // お問い合わせ情報対応履歴登録
-            result = this.insertAskHistory(bssAsk);
+            result = this.insertAskHistory(bssAsk,false);
         }
 
         return result;
@@ -139,7 +143,7 @@ public class BssAskServiceImpl implements IBssAskService {
         BeanUtils.copyProperties(bssAskBo, bssAsk);
 
         // 保存前にデータを構築
-        BssAsk bssAskOld = this.buildAskInfo4Save(bssAsk);
+        this.buildAskInfo4Save(bssAsk);
 
         int result = bssAskMapper.update(bssAsk);
         if (result < 1) {
@@ -147,8 +151,8 @@ public class BssAskServiceImpl implements IBssAskService {
         }
 
         // お問い合わせ情報対応履歴登録
-        if (ValueUtils.isNotEmpty(bssAskOld)) {
-            result = this.insertAskHistory(bssAskOld);
+        if (ValueUtils.isNotEmpty(bssAsk)) {
+            result = this.insertAskHistory(bssAsk,true);
         }
 
         return result;
@@ -183,12 +187,15 @@ public class BssAskServiceImpl implements IBssAskService {
      * @param bssAsk お問い合わせ情報
      * @return 更新前にデータ
      */
-    private BssAsk buildAskInfo4Save(BssAsk bssAsk) {
+    private void buildAskInfo4Save(BssAsk bssAsk) {
         // ログインユーザー情報を取得します
         LoginUser loginUser = SecurityUtils.getLoginUser();
 
         // ユーザーID
         bssAsk.setUserCd(loginUser.getUserCode());
+        // 最終更新情報
+        bssAsk.setFinalAnswerUser(loginUser.getUserCode());
+        bssAsk.setFinalUpdateTime(DateUtils.getTime());
 
         // ID が空の場合は、ID を設定します。
         if (ValueUtils.isEmpty(bssAsk.getId())) {
@@ -206,16 +213,11 @@ public class BssAskServiceImpl implements IBssAskService {
 
             // 問合せ受付日
             bssAsk.setAskDate(DateUtils.getDate());
-
-            return null;
         } else {
-            // 更新前にデータを取得
-            BssAskVo bssAskVo = this.bssAskMapper.selectById(bssAsk.getId());
-            bssAsk.setAskNo(bssAskVo.getAskNo());
-            bssAsk.setAskDate(bssAskVo.getAskDate());
-            BssAsk bssAskOld = new BssAsk();
-            BeanUtils.copyProperties(bssAskVo, bssAskOld);
-            return bssAskOld;
+            // 顧客名
+            if (ValueUtils.isEmpty(bssAsk.getAskNo())) {
+                throw new ServiceException(MessageUtils.message("E0003", MessageUtils.message("label.askNo")));
+            }
         }
 
     }
@@ -224,22 +226,25 @@ public class BssAskServiceImpl implements IBssAskService {
      * お問い合わせ情報対応履歴登録
      *
      * @param bssAsk お問い合わせ情報
+     * @param isAskUpdate 更新フラグ
      * @return 結果
      */
-    private int insertAskHistory(BssAsk bssAsk) {
+    private int insertAskHistory(BssAsk bssAsk,boolean isAskUpdate) {
 
         BssAskHistory bssAskHistory = new BssAskHistory();
         bssAskHistory.setId(IdUtils.nextIdStr());
         // 問合せ番号
         bssAskHistory.setAskNo(bssAsk.getAskNo());
         //  シリアルナンバー
-        bssAskHistory.setSeqNo(bssAsk.getVersion() + 1);
+        bssAskHistory.setSeqNo(isAskUpdate ? bssAsk.getVersion() + 1 : 0);
         //  お問い合わせ・対応内容
         bssAskHistory.setAskAnswerRemark(bssAsk.getAskAnswerRemark());
         //  対応者
         bssAskHistory.setAnswerUser(bssAsk.getUserCd());
         //  対応時間
         bssAskHistory.setAnswerTime(DateUtils.getTime());
+        bssAskHistory.setCategory1(bssAsk.getCategory1());
+        bssAskHistory.setCategory2(bssAsk.getCategory2());
 
         return bssAskHistoryMapper.insert(bssAskHistory);
     }

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/bss/service/impl/BssOrderServiceImpl.java

@@ -0,0 +1,58 @@
+package jp.yamoto.farm.crm.biz.bss.service.impl;
+
+
+import jp.yamoto.farm.common.exception.ServiceException;
+import jp.yamoto.farm.common.utils.*;
+
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssOrderDetailVo;
+
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssOrderVo;
+
+import jp.yamoto.farm.crm.biz.bss.mapper.BssOrderMapper;
+import jp.yamoto.farm.crm.biz.bss.service.IBssOrderService;
+
+import jp.yamoto.farm.crm.biz.master.service.IMastCustomerService;
+import jp.yamoto.farm.crm.biz.master.service.IMastFarmerService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import java.util.List;
+
+/**
+ * お問い合わせ Service業務処理
+ *
+ * @author nextosd
+ */
+@Service
+public class BssOrderServiceImpl implements IBssOrderService {
+
+    @Autowired
+    private BssOrderMapper bssOrderMapper;
+
+    @Autowired
+    private IMastCustomerService mastCustomerService;
+
+    @Autowired
+    private IMastFarmerService mastFarmerService;
+
+    /**
+     * お問い合わせの検索
+     *
+     * @param orderId 注文Id
+     * @return お問い合わせ
+     */
+    @Override
+    public BssOrderDetailVo selectByOrderId(String orderId) {
+        BssOrderVo bssOrderVo = bssOrderMapper.selectByOrderId(orderId);
+        if (bssOrderVo == null) {
+            throw new ServiceException(MessageUtils.message("E0007"));
+        }
+        BssOrderDetailVo detailVo = new BssOrderDetailVo();
+        BeanUtils.copyProperties(bssOrderVo, detailVo);
+
+        return detailVo;
+    }
+
+}

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/domain/entity/MastFarmer.java

@@ -1,5 +1,6 @@
 package jp.yamoto.farm.crm.biz.master.domain.entity;
 
+import jp.yamoto.farm.common.annotation.DecryptField;
 import jp.yamoto.farm.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -41,6 +42,7 @@ public class MastFarmer extends BaseEntity {
     /**
      * 電話番号
      */
+    @DecryptField
     private String phoneNumber;
 
     /**

farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/service/impl/MastFarmerServiceImpl.java

@@ -185,7 +185,7 @@ public class MastFarmerServiceImpl implements IMastFarmerService {
         }
         // 電話番号
         if (ValueUtils.isNotEmpty(mastFarmer.getMailAddress())) {
-            mastFarmer.setPhoneNumber(DecryptUtils.encryptAES(mastFarmer.getPhoneNumber()));
+//            mastFarmer.setPhoneNumber(DecryptUtils.encryptAES(mastFarmer.getPhoneNumber()));
         }
 
     }

farm-crm-biz/src/main/resources/mapper/crm/BssAskHistoryMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="jp.yamoto.farm.xxx.xxx.xxx.mapper.BssAskHistoryMapper">
+<mapper namespace="jp.yamoto.farm.crm.biz.bss.mapper.BssAskHistoryMapper">
    <resultMap type="BssAskHistory" id="BssAskHistoryResult">
         <result property="id" column="id"/>
         <result property="askNo" column="ask_no"/>

farm-crm-biz/src/main/resources/mapper/crm/BssAskMapper.xml

@@ -32,6 +32,28 @@
         <result property="version" column="version"/>
 
     </resultMap>
+
+    <resultMap type="BssAskListVo" id="BssAskListResult">
+        <result property="id" column="id"/>
+        <result property="askNo" column="ask_no"/>
+        <result property="askDate" column="ask_date"/>
+        <result property="category1" column="category1"/>
+        <result property="category2" column="category2"/>
+        <result property="status" column="status"/>
+        <result property="statusLabel" column="status_label"/>
+        <result property="askAnswerRemark" column="ask_answer_remark"/>
+        <result property="farmerId" column="farmer_id"/>
+        <result property="farmerName" column="farmer_name"/>
+        <result property="askUser" column="ask_user"/>
+        <result property="finalAnswerUser" column="final_answer_user"/>
+        <result property="finalUpdateTime" column="final_update_time"/>
+        <result property="sysCustomerId" column="sys_customer_id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="orderDate" column="order_date"/>
+        <result property="userCd" column="user_cd"/>
+        <result property="version" column="version"/>
+    </resultMap>
+
     <sql id="selectBssAskVo">
         select
           id,
@@ -62,67 +84,74 @@
           version
         from bss_ask
     </sql>
-    <select id="selectList" parameterType="BssAsk" resultMap="BssAskResult">
-        <include refid="selectBssAskVo"/>
+
+    <select id="selectList" parameterType="BssAskSearchBo" resultMap="BssAskListResult">
+        SELECT
+            ask.id,
+            ask.ask_no,
+            ask.ask_date,
+            ask.status,
+            sdd.dict_label as status_label,
+            ask.category1,
+            ask.category2,
+            ask_answer_remark,
+            ask.ask_user,
+            farm.farmer_id,
+            farm.farmer_name,
+            ask.order_id,
+            ask.final_answer_user,
+            ask.final_update_time,
+            ask.order_id,
+            od.order_time
+        FROM
+            bss_ask ask
+        LEFT join sys_dict_data sdd on ask.status = sdd.dict_value and sdd.dict_type = 'bss_ask_status'
+        LEFT JOIN mast_customer cust ON cust.customer_id = ask.customer_id
+        left join mast_farmer farm on ask.farmer_id = farm.farmer_id
+        left join bss_order od on ask.order_id = od.order_id
         <where>
             <if test="id != null  and id != ''">
                 and id = #{id}
             </if>
             <if test="askNo != null  and askNo != ''">
-                and ask_no = #{askNo}
-            </if>
-            <if test="askDate != null  and askDate != ''">
-                and ask_date = #{askDate}
-            </if>
-            <if test="askWay != null ">
-                and ask_way = #{askWay}
-            </if>
-            <if test="askType != null ">
-                and ask_type = #{askType}
+                and ask.ask_no like '%' || #{askNo} || '%'
             </if>
-            <if test="category1 != null  and category1 != ''">
-                and category1 = #{category1}
+            <if test="askDateStart != null  and askDateStart != ''">
+                and ask.ask_date &gt;= #{askDateStart}
             </if>
-            <if test="category2 != null  and category2 != ''">
-                and category2 = #{category2}
+            <if test="askDateEnd != null  and askDateEnd != ''">
+                and ask.ask_date &lt;= #{askDateEnd}
             </if>
-            <if test="status != null ">
-                and status = #{status}
+            <if test="finalAnswerUser != null  and finalAnswerUser != ''">
+                and ask.final_answer_user = #{finalAnswerUser}
             </if>
-            <if test="askAnswerRemark != null ">
-                and ask_answer_remark = #{askAnswerRemark}
+            <if test="finalUpdateDateStart != null  and finalUpdateDateStart != ''">
+                and ask.final_update_time &gt;= #{finalUpdateDateStart}
             </if>
-            <if test="answer != null ">
-                and answer = #{answer}
+            <if test="finalUpdateDateEnd != null  and finalUpdateDateEnd != ''">
+                and ask.final_update_time &lt;= #{finalUpdateDateEnd}
             </if>
             <if test="askUser != null  and askUser != ''">
-                and ask_user = #{askUser}
-            </if>
-            <if test="askUserType != null ">
-                and ask_user_type = #{askUserType}
+                and ask.ask_user like '%' || #{askUser} || '%'
             </if>
-            <if test="finalAnswerUser != null  and finalAnswerUser != ''">
-                and final_answer_user = #{finalAnswerUser}
+            <if test="status != null  and status != ''">
+                and ask.status = #{status}
             </if>
-            <if test="finalUpdateTime != null ">
-                and final_update_time = #{finalUpdateTime}
+            <if test="orderDateStart != null  and orderDateStart != ''">
+                and od.order_time &gt;= #{orderDateStart}
             </if>
-            <if test="sysCustomerId != null  and sysCustomerId != ''">
-                and sys_customer_id = #{sysCustomerId}
+            <if test="orderDateEnd != null  and orderDateEnd != ''">
+                and od.order_time &lt;= #{orderDateEnd}
             </if>
-            <if test="customerId != null  and customerId != ''">
-                and customer_id = #{customerId}
+            <if test="orderId != null  and orderId != ''">
+                and farm.order_id like '%' || #{orderId} || '%'
             </if>
             <if test="farmerId != null  and farmerId != ''">
-                and farmer_id = #{farmerId}
+                and farm.farmer_id  like '%' || #{farmerId} || '%'
             </if>
-            <if test="orderId != null  and orderId != ''">
-                and order_id = #{orderId}
-            </if>
-            <if test="userCd != null  and userCd != ''">
-                and user_cd = #{userCd}
+            <if test="farmerName != null  and farmerName != ''">
+                and farm.farmer_name like '%' || #{farmerName} || '%'
             </if>
-
         </where>
     </select>
 

farm-crm-biz/src/main/resources/mapper/crm/BssOrderDeliveryItemMapper.xml

@@ -0,0 +1,108 @@
+<?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="jp.yamoto.farm.crm.biz.bss.mapper.BssOrderDeliveryItemMapper">
+   <resultMap type="BssOrderDeliveryItem" id="BssOrderDeliveryItemResult">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="deliveryId" column="delivery_id"/>
+        <result property="status" column="status"/>
+        <result property="orderDate" column="order_date"/>
+        <result property="farmerId" column="farmer_id"/>
+        <result property="sysItemCode" column="sys_item_code"/>
+        <result property="itemCd" column="item_cd"/>
+        <result property="itemName" column="item_name"/>
+        <result property="itemPrice" column="item_price"/>
+        <result property="itemPriceTax" column="item_price_tax"/>
+        <result property="itemSalesTax" column="item_sales_tax"/>
+        <result property="qty" column="qty"/>
+        <result property="subtotal" column="subtotal"/>
+        <result property="subtotalTax" column="subtotal_tax"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createPgId" column="create_pg_id"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updatePgId" column="update_pg_id"/>
+        <result property="version" column="version"/>
+
+    </resultMap>
+    <sql id="selectBssOrderDeliveryItemVo">
+        select
+          id,
+          order_id,
+          delivery_id,
+          status,
+          order_date,
+          farmer_id,
+          sys_item_code,
+          item_cd,
+          item_name,
+          item_price,
+          item_price_tax,
+          item_sales_tax,
+          qty,
+          subtotal,
+          subtotal_tax
+        from bss_order_delivery_item
+    </sql>
+    <select id="selectList" parameterType="BssOrderDeliveryItem" resultMap="BssOrderDeliveryItemResult">
+        <include refid="selectBssOrderDeliveryItemVo"/>
+        <where>
+            <if test="id != null  and id != ''">
+                and id = #{id}
+            </if>
+            <if test="orderId != null  and orderId != ''">
+                and order_id = #{orderId}
+            </if>
+            <if test="deliveryId != null  and deliveryId != ''">
+                and delivery_id = #{deliveryId}
+            </if>
+            <if test="status != null  and status != ''">
+                and status = #{status}
+            </if>
+            <if test="orderDate != null  and orderDate != ''">
+                and order_date = #{orderDate}
+            </if>
+            <if test="farmerId != null  and farmerId != ''">
+                and farmer_id = #{farmerId}
+            </if>
+            <if test="sysItemCode != null  and sysItemCode != ''">
+                and sys_item_code = #{sysItemCode}
+            </if>
+            <if test="itemCd != null  and itemCd != ''">
+                and item_cd = #{itemCd}
+            </if>
+            <if test="itemName != null  and itemName != ''">
+                and item_name = #{itemName}
+            </if>
+            <if test="itemPrice != null ">
+                and item_price = #{itemPrice}
+            </if>
+            <if test="itemPriceTax != null ">
+                and item_price_tax = #{itemPriceTax}
+            </if>
+            <if test="itemSalesTax != null ">
+                and item_sales_tax = #{itemSalesTax}
+            </if>
+            <if test="qty != null ">
+                and qty = #{qty}
+            </if>
+            <if test="subtotal != null ">
+                and subtotal = #{subtotal}
+            </if>
+            <if test="subtotalTax != null ">
+                and subtotal_tax = #{subtotalTax}
+            </if>
+
+        </where>
+    </select>
+
+    <select id="selectById" parameterType="String"  resultMap="BssOrderDeliveryItemResult">
+        <include refid="selectBssOrderDeliveryItemVo"/>
+        where id = #{id}
+
+    </select>
+
+ </mapper>

farm-crm-biz/src/main/resources/mapper/crm/BssOrderDeliveryMapper.xml

@@ -0,0 +1,127 @@
+<?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="jp.yamoto.farm.crm.biz.bss.mapper.BssOrderDeliveryMapper">
+   <resultMap type="BssOrderDelivery" id="BssOrderDeliveryResult">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="deliveryCustomerName" column="delivery_customer_name"/>
+        <result property="postalCode" column="postal_code"/>
+        <result property="address" column="address"/>
+        <result property="mailAddress" column="mail_address"/>
+        <result property="phoneNumber" column="phone_number"/>
+        <result property="sysCustomerId" column="sys_customer_id"/>
+        <result property="customerId" column="customer_id"/>
+        <result property="memberId" column="member_id"/>
+        <result property="deliveryTrackingNo" column="delivery_tracking_no"/>
+        <result property="deliverydestType" column="deliverydest_type"/>
+        <result property="dlvdeliveryFlg" column="dlvdelivery_flg"/>
+        <result property="deliveryDate" column="delivery_date"/>
+        <result property="originalTime" column="original_time"/>
+        <result property="invoiceUnit" column="invoice_unit"/>
+        <result property="iuggageStatus" column="iuggage_status"/>
+        <result property="carriage" column="carriage"/>
+        <result property="farmerId" column="farmer_id"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createPgId" column="create_pg_id"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updatePgId" column="update_pg_id"/>
+        <result property="version" column="version"/>
+
+    </resultMap>
+    <sql id="selectBssOrderDeliveryVo">
+        select
+          id,
+          order_id,
+          delivery_customer_name,
+          postal_code,
+          address,
+          mail_address,
+          phone_number,
+          sys_customer_id,
+          customer_id,
+          member_id,
+          delivery_tracking_no,
+          deliverydest_type,
+          dlvdelivery_flg,
+          delivery_date,
+          original_time,
+          invoice_unit,
+          iuggage_status,
+          carriage,
+          farmer_id,
+          remark
+        from bss_order_delivery
+    </sql>
+    <select id="selectList" parameterType="BssOrderDelivery" resultMap="BssOrderDeliveryResult">
+        <include refid="selectBssOrderDeliveryVo"/>
+        <where>
+            <if test="id != null  and id != ''">
+                and id = #{id}
+            </if>
+            <if test="orderId != null  and orderId != ''">
+                and order_id = #{orderId}
+            </if>
+            <if test="deliveryCustomerName != null  and deliveryCustomerName != ''">
+                and delivery_customer_name = #{deliveryCustomerName}
+            </if>
+            <if test="postalCode != null  and postalCode != ''">
+                and postal_code = #{postalCode}
+            </if>
+            <if test="address != null  and address != ''">
+                and address = #{address}
+            </if>
+            <if test="mailAddress != null  and mailAddress != ''">
+                and mail_address = #{mailAddress}
+            </if>
+            <if test="phoneNumber != null  and phoneNumber != ''">
+                and phone_number = #{phoneNumber}
+            </if>
+            <if test="sysCustomerId != null  and sysCustomerId != ''">
+                and sys_customer_id = #{sysCustomerId}
+            </if>
+            <if test="customerId != null  and customerId != ''">
+                and customer_id = #{customerId}
+            </if>
+            <if test="memberId != null  and memberId != ''">
+                and member_id = #{memberId}
+            </if>
+            <if test="deliveryTrackingNo != null  and deliveryTrackingNo != ''">
+                and delivery_tracking_no = #{deliveryTrackingNo}
+            </if>
+            <if test="deliverydestType != null  and deliverydestType != ''">
+                and deliverydest_type = #{deliverydestType}
+            </if>
+            <if test="dlvdeliveryFlg != null  and dlvdeliveryFlg != ''">
+                and dlvdelivery_flg = #{dlvdeliveryFlg}
+            </if>
+            <if test="deliveryDate != null  and deliveryDate != ''">
+                and delivery_date = #{deliveryDate}
+            </if>
+            <if test="originalTime != null  and originalTime != ''">
+                and original_time = #{originalTime}
+            </if>
+            <if test="invoiceUnit != null  and invoiceUnit != ''">
+                and invoice_unit = #{invoiceUnit}
+            </if>
+            <if test="iuggageStatus != null  and iuggageStatus != ''">
+                and iuggage_status = #{iuggageStatus}
+            </if>
+            <if test="carriage != null ">
+                and carriage = #{carriage}
+            </if>
+            <if test="farmerId != null  and farmerId != ''">
+                and farmer_id = #{farmerId}
+            </if>
+            <if test="remark != null  and remark != ''">
+                and remark = #{remark}
+            </if>
+
+        </where>
+    </select>
+
+ </mapper>

farm-crm-biz/src/main/resources/mapper/crm/BssOrderMapper.xml

@@ -0,0 +1,168 @@
+<?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="jp.yamoto.farm.crm.biz.bss.mapper.BssOrderMapper">
+    <resultMap type="BssOrderVo" id="BssOrderResult">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="sysOrderId" column="sys_order_id"/>
+        <result property="farmerId" column="farmer_id"/>
+        <result property="status" column="status"/>
+        <result property="orderTime" column="order_time"/>
+        <result property="deliveryPlanDate" column="delivery_plan_date"/>
+        <result property="paymentType" column="payment_type"/>
+        <result property="paymentDate" column="payment_date"/>
+        <result property="shipPlanDate" column="ship_plan_date"/>
+        <result property="shipDate" column="ship_date"/>
+        <result property="ordPrxRoute" column="ord_prx_route"/>
+        <result property="dlvdeliveryFlg" column="dlvdelivery_flg"/>
+        <result property="dlvdeliveryCnt" column="dlvdelivery_cnt"/>
+        <result property="haitatsuBi" column="haitatsu_bi"/>
+        <result property="sysCustomerId" column="sys_customer_id"/>
+        <result property="memberId" column="member_id"/>
+        <result property="customerName" column="customer_name"/>
+        <result property="postalCode" column="postal_code"/>
+        <result property="address" column="address"/>
+        <result property="mailAddress" column="mail_address"/>
+        <result property="phoneNumber" column="phone_number"/>
+        <result property="itemTotalTax" column="item_total_tax"/>
+        <result property="itemTotal" column="item_total"/>
+        <result property="totoalCarriage" column="totoal_carriage"/>
+        <result property="shopPayMethod" column="shop_pay_method"/>
+        <result property="shopPaySituation" column="shop_pay_situation"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createPgId" column="create_pg_id"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updatePgId" column="update_pg_id"/>
+        <result property="version" column="version"/>
+
+    </resultMap>
+    <sql id="selectBssOrderVo">
+        select
+            id,
+            order_id,
+            sys_order_id,
+            farmer_id,
+            status,
+            order_time,
+            delivery_plan_date,
+            payment_type,
+            payment_date,
+            ship_plan_date,
+            ship_date,
+            ord_prx_route,
+            dlvdelivery_flg,
+            dlvdelivery_cnt,
+            haitatsu_bi,
+            sys_customer_id,
+            member_id,
+            customer_name,
+            postal_code,
+            address,
+            mail_address,
+            phone_number,
+            item_total_tax,
+            item_total,
+            totoal_carriage,
+            shop_pay_method,
+            shop_pay_situation
+        from bss_order
+    </sql>
+    <select id="selectList" parameterType="BssOrder" resultMap="BssOrderResult">
+        <include refid="selectBssOrderVo"/>
+        <where>
+            <if test="id != null  and id != ''">
+                and id = #{id}
+            </if>
+            <if test="orderId != null  and orderId != ''">
+                and order_id = #{orderId}
+            </if>
+            <if test="sysOrderId != null  and sysOrderId != ''">
+                and sys_order_id = #{sysOrderId}
+            </if>
+            <if test="farmerId != null  and farmerId != ''">
+                and farmer_id = #{farmerId}
+            </if>
+            <if test="status != null  and status != ''">
+                and status = #{status}
+            </if>
+            <if test="orderTime != null  and orderTime != ''">
+                and order_time = #{orderTime}
+            </if>
+            <if test="deliveryPlanDate != null  and deliveryPlanDate != ''">
+                and delivery_plan_date = #{deliveryPlanDate}
+            </if>
+            <if test="paymentType != null  and paymentType != ''">
+                and payment_type = #{paymentType}
+            </if>
+            <if test="paymentDate != null  and paymentDate != ''">
+                and payment_date = #{paymentDate}
+            </if>
+            <if test="shipPlanDate != null  and shipPlanDate != ''">
+                and ship_plan_date = #{shipPlanDate}
+            </if>
+            <if test="shipDate != null  and shipDate != ''">
+                and ship_date = #{shipDate}
+            </if>
+            <if test="ordPrxRoute != null  and ordPrxRoute != ''">
+                and ord_prx_route = #{ordPrxRoute}
+            </if>
+            <if test="dlvdeliveryFlg != null  and dlvdeliveryFlg != ''">
+                and dlvdelivery_flg = #{dlvdeliveryFlg}
+            </if>
+            <if test="dlvdeliveryCnt != null ">
+                and dlvdelivery_cnt = #{dlvdeliveryCnt}
+            </if>
+            <if test="haitatsuBi != null  and haitatsuBi != ''">
+                and haitatsu_bi = #{haitatsuBi}
+            </if>
+            <if test="sysCustomerId != null  and sysCustomerId != ''">
+                and sys_customer_id = #{sysCustomerId}
+            </if>
+            <if test="memberId != null  and memberId != ''">
+                and member_id = #{memberId}
+            </if>
+            <if test="customerName != null  and customerName != ''">
+                and customer_name = #{customerName}
+            </if>
+            <if test="postalCode != null  and postalCode != ''">
+                and postal_code = #{postalCode}
+            </if>
+            <if test="address != null  and address != ''">
+                and address = #{address}
+            </if>
+            <if test="mailAddress != null  and mailAddress != ''">
+                and mail_address = #{mailAddress}
+            </if>
+            <if test="phoneNumber != null  and phoneNumber != ''">
+                and phone_number = #{phoneNumber}
+            </if>
+            <if test="itemTotalTax != null ">
+                and item_total_tax = #{itemTotalTax}
+            </if>
+            <if test="itemTotal != null ">
+                and item_total = #{itemTotal}
+            </if>
+            <if test="totoalCarriage != null ">
+                and totoal_carriage = #{totoalCarriage}
+            </if>
+            <if test="shopPayMethod != null  and shopPayMethod != ''">
+                and shop_pay_method = #{shopPayMethod}
+            </if>
+            <if test="shopPaySituation != null  and shopPaySituation != ''">
+                and shop_pay_situation = #{shopPaySituation}
+            </if>
+
+        </where>
+    </select>
+
+    <select id="selectByOrderId" parameterType="String"  resultMap="BssOrderResult">
+        <include refid="selectBssOrderVo"/>
+        where order_id = #{orderId}
+
+    </select>
+
+</mapper>

farm-crm/src/main/java/jp/yamoto/farm/crm/web/controller/bss/BssAskController.java

@@ -7,6 +7,8 @@ import jp.yamoto.farm.common.core.page.TableDataInfo;
 import jp.yamoto.farm.common.enums.BusinessType;
 import jp.yamoto.farm.common.validator.utils.ValidatorGroup;
 import jp.yamoto.farm.crm.biz.bss.domain.bo.BssAskBo;
+import jp.yamoto.farm.crm.biz.bss.domain.bo.BssAskSearchBo;
+import jp.yamoto.farm.crm.biz.bss.domain.vo.BssAskListVo;
 import jp.yamoto.farm.crm.biz.bss.domain.vo.BssAskVo;
 import jp.yamoto.farm.crm.biz.bss.service.IBssAskService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,10 +34,10 @@ public class BssAskController extends BaseController {
      * お問い合わせタのリスト
      */
     @PreAuthorize("@ss.hasPermi('crm:bssAsk:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(BssAskBo bssAskBo) {
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody BssAskSearchBo bssAskSearchBo) {
         startPage();
-        List<BssAskVo> list = bssAskService.selectList(bssAskBo);
+        List<BssAskListVo> list = bssAskService.selectList(bssAskSearchBo);
         return getDataTable(list);
     }