## 订单详情导出添加商品类型；

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java

@@ -301,6 +301,8 @@ public class SaOrderController extends ParentOrderController {
             if (StringUtils.isNotBlank(waresOrderVo.getOperateScope())) {
                 waresOrderVo.setOperateScope(ESupplyWay.getLabelByVal(Integer.parseInt(waresOrderVo.getOperateScope())));
             }
+            // 商品类型
+            waresOrderVo.setIsMakerGiftVal(EWaresType.getLabelByValue(waresOrderVo.getIsMakerGift()));
             // 发货类型
             waresOrderVo.setShippingChannelStr(EShippingChannel.getLabelByValue(waresOrderVo.getShippingChannel()));
         }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java

@@ -292,6 +292,13 @@ public class WaresOrderInfoVo implements Serializable {
      */
     private Integer systemType;
 
+    /**
+     * 商品类型
+     */
+    private Integer isMakerGift;
+    @Excel(name = "商品类型")
+    private String isMakerGiftVal;
+
     /**
      * 创建时间
      */

bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderItemsMapper.xml

@@ -771,11 +771,11 @@
         left join sa_order so on oi.PK_ORDER = so.PK_ID
         left join cu_member m on m.PK_ID = so.PK_CREATOR
         left join cu_member cm on cm.PK_ID = so.PK_MEMBER
-        left join bd_vertex ver on ver.PK_ID = cm.PK_VERTEX
+        left join bd_vertex ver on ver.PK_ID = cm.PK_VERTEX and ver.del_flag = 0
         left join bd_wares_extend we on we.PK_WARES = oi.PK_WARES
         left join bd_wares bw on bw.PK_ID = we.PK_WARES
         left join bd_product bp on bp.PK_ID = oi.PK_PRODUCT
-        where oi.del_flag = 0 and so.del_flag = 0 and ver.del_flag = 0
+        where oi.del_flag = 0 and so.del_flag = 0
         <if test="addPurchaseFlag != null and addPurchaseFlag == 0">
             and oi.pk_order in (
                 select distinct soi.pk_order

bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml

@@ -658,9 +658,8 @@
         from sa_order so
         left join CU_MEMBER cm on cm.PK_ID = so.PK_MEMBER
         left join CU_MEMBER m on m.PK_ID = so.PK_CREATOR
-        left join BD_VERTEX ver on ver.PK_ID = cm.PK_VERTEX
+        left join BD_VERTEX ver on ver.PK_ID = cm.PK_VERTEX and ver.DEL_FLAG = 0
         where so.DEL_FLAG = 0
-        and ver.DEL_FLAG = 0
         <if test="addPurchaseFlag != null and addPurchaseFlag == 0">
             and so.PK_ID in (
                 select distinct soi.pk_order

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java

@@ -86,13 +86,13 @@ public class BdWaresExtend extends BaseEntity {
     /**
      * 上架时间
      */
-    @TableField("PUT_ON_TIME")
+    @TableField(value = "PUT_ON_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
     private Date putOnTime;
 
     /**
      * 下架时间
      */
-    @TableField("PUT_OFF_TIME")
+    @TableField(value = "PUT_OFF_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
     private Date putOffTime;
 
     /**
@@ -134,7 +134,7 @@ public class BdWaresExtend extends BaseEntity {
     /**
      * （预计时间）到货时间
      */
-    @TableField("ARRIVAL_TIME")
+    @TableField(value = "ARRIVAL_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
     private Date arrivalTime;
 
     /**