| @@ -159,4 +159,5 @@ public class WxOrder extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType") | @io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType") | ||||
| private Integer shippingType; | private Integer shippingType; | ||||
| } | } | ||||
| @@ -2,10 +2,12 @@ package com.iformall.domain.vo; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||||
| import com.iformall.common.SortColumn; | |||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import java.math.BigDecimal; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -109,4 +111,25 @@ public class WxOrderCouponVo extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="组合订单编号",name="composeOrderId") | @io.swagger.annotations.ApiModelProperty(value="组合订单编号",name="composeOrderId") | ||||
| private Long composeOrderId; | private Long composeOrderId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="运费",name="freightPrice") | |||||
| private Integer freightPrice; | |||||
| @TableField(exist = false) | |||||
| @SortColumn(column = "freight_price") | |||||
| private String freightPriceStr; | |||||
| public String getFreightPriceStr() { | |||||
| if(freightPrice!=null) { | |||||
| freightPriceStr = new BigDecimal(freightPrice).divide(new BigDecimal(100)).toString(); | |||||
| } | |||||
| return freightPriceStr; | |||||
| } | |||||
| @io.swagger.annotations.ApiModelProperty(value="收货地址",name="shippingAddress") | |||||
| private String shippingAddress; | |||||
| @io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType") | |||||
| private Integer shippingType; | |||||
| } | } | ||||
| @@ -25,11 +25,18 @@ | |||||
| <result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType" /> | <result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType" /> | ||||
| <result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId" /> | <result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId" /> | ||||
| <result column="coupon_number" jdbcType="BIGINT" property="couponNumber" /> | <result column="coupon_number" jdbcType="BIGINT" property="couponNumber" /> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="shipping_type" jdbcType="INTEGER" property="shippingType"/> | |||||
| <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | |||||
| <result column="shipping_status" jdbcType="INTEGER" property="shippingStatus"/> | |||||
| <result column="delivery_info" jdbcType="VARCHAR" property="deliveryInfo"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, | `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`, | ||||
| `verify_type`,`verify_remark`,`pay_vendor`,`send_merchant_id`,`send_merchant_user_id`,`compose_order_type`,`compose_order_id`,`coupon_number` | |||||
| `verify_type`,`verify_remark`,`pay_vendor`,`send_merchant_id`,`send_merchant_user_id`,`compose_order_type`,`compose_order_id`,`coupon_number`, | |||||
| `freight_price`,`shipping_type`,`shipping_address`,`shipping_status`,`delivery_info` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -114,6 +121,14 @@ | |||||
| and `compose_order_id` = #{composeOrderId} | and `compose_order_id` = #{composeOrderId} | ||||
| </if> | </if> | ||||
| <if test=" null != shippingType "> | |||||
| and `shipping_type` = #{shippingType} | |||||
| </if> | |||||
| <if test=" null != shippingStatus "> | |||||
| and `shipping_status` = #{shippingStatus} | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||
| and id in | and id in | ||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | ||||
| @@ -727,7 +742,13 @@ | |||||
| <result column="pay_vendor" jdbcType="INTEGER" property="payVendor" /> | <result column="pay_vendor" jdbcType="INTEGER" property="payVendor" /> | ||||
| <result column="verify_type" jdbcType="INTEGER" property="verifyType" /> | <result column="verify_type" jdbcType="INTEGER" property="verifyType" /> | ||||
| <result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" /> | <result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" /> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="shipping_type" jdbcType="INTEGER" property="shippingType"/> | |||||
| <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | |||||
| <result column="shipping_status" jdbcType="INTEGER" property="shippingStatus"/> | |||||
| <result column="delivery_info" jdbcType="VARCHAR" property="deliveryInfo"/> | |||||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | ||||
| <result column="type" jdbcType="INTEGER" property="type" /> | <result column="type" jdbcType="INTEGER" property="type" /> | ||||
| @@ -773,6 +794,12 @@ | |||||
| <result column="verify_type" jdbcType="INTEGER" property="verifyType" /> | <result column="verify_type" jdbcType="INTEGER" property="verifyType" /> | ||||
| <result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" /> | <result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" /> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="shipping_type" jdbcType="INTEGER" property="shippingType"/> | |||||
| <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | |||||
| <result column="shipping_status" jdbcType="INTEGER" property="shippingStatus"/> | |||||
| <result column="delivery_info" jdbcType="VARCHAR" property="deliveryInfo"/> | |||||
| <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | <result column="merchant_id" jdbcType="BIGINT" property="merchantId"/> | ||||
| <result column="type" jdbcType="INTEGER" property="type" /> | <result column="type" jdbcType="INTEGER" property="type" /> | ||||
| @@ -815,7 +842,9 @@ | |||||
| --> | --> | ||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.order_id, | co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.order_id, | ||||
| co.create_date,co.update_date,co.coupon_price, co.verify_type, co.verify_remark,co.pay_vendor,c.title,c.sale_price,c.use_price,c.price, | |||||
| co.create_date,co.update_date,co.coupon_price, co.verify_type, co.verify_remark,co.pay_vendor, | |||||
| co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`, | |||||
| c.title,c.sale_price,c.use_price,c.price, | |||||
| co.send_merchant_id,c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num, | co.send_merchant_id,c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num, | ||||
| (CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, | (CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, | ||||
| (CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id, | (CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id, | ||||
| @@ -825,6 +854,7 @@ | |||||
| <sql id="allAdminCouponOrderDetailColumns"> | <sql id="allAdminCouponOrderDetailColumns"> | ||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id, | co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id, | ||||
| co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark, co.pay_vendor, | co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark, co.pay_vendor, | ||||
| co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`, | |||||
| c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, | c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, | ||||
| bu.name, bu.phone as bphone, | bu.name, bu.phone as bphone, | ||||
| cu.phone, | cu.phone, | ||||
| @@ -848,7 +878,7 @@ | |||||
| RIGHT JOIN ( | RIGHT JOIN ( | ||||
| SELECT co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.coupon_type, | SELECT co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.coupon_type, | ||||
| co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.auto_refund,co.verify_type,co.verify_remark,co.pay_vendor | co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.auto_refund,co.verify_type,co.verify_remark,co.pay_vendor | ||||
| ,co.send_merchant_id | |||||
| ,co.send_merchant_id,co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info` | |||||
| FROM wx_coupon_order co WHERE 1=1 | FROM wx_coupon_order co WHERE 1=1 | ||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||
| and co.`tenant_id` = #{tenantId} | and co.`tenant_id` = #{tenantId} | ||||
| @@ -977,6 +1007,7 @@ | |||||
| <sql id="allBUserVerifiedCouponOrderColumns"> | <sql id="allBUserVerifiedCouponOrderColumns"> | ||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, | co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, | ||||
| co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`, | |||||
| c.type,c.title,c.sale_price,c.use_price,c.price,c.unit, | c.type,c.title,c.sale_price,c.use_price,c.price,c.unit, | ||||
| bu.name, | bu.name, | ||||
| cu.phone | cu.phone | ||||
| @@ -984,6 +1015,7 @@ | |||||
| <sql id="allBUserOrderedCouponOrderColumns"> | <sql id="allBUserOrderedCouponOrderColumns"> | ||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, | co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, | ||||
| co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`, | |||||
| c.type,c.title,c.sale_price,c.use_price,c.price,c.unit, | c.type,c.title,c.sale_price,c.use_price,c.price,c.unit, | ||||
| cu.phone | cu.phone | ||||
| </sql> | </sql> | ||||
| @@ -1034,7 +1066,9 @@ | |||||
| </select> | </select> | ||||
| <sql id="allCouponOrderColumns"> | <sql id="allCouponOrderColumns"> | ||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor | |||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id, | |||||
| co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, | |||||
| co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info` | |||||
| </sql> | </sql> | ||||
| <select id="findListOfOrderedByDate" parameterType="map" resultMap="BaseResultMap"> | <select id="findListOfOrderedByDate" parameterType="map" resultMap="BaseResultMap"> | ||||
| @@ -1081,11 +1115,13 @@ | |||||
| <sql id="allCUserCouponOrderDetailColumns"> | <sql id="allCUserCouponOrderDetailColumns"> | ||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, | co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, | ||||
| co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`, | |||||
| c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,c.auto_refund | c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_type,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,c.auto_refund | ||||
| </sql> | </sql> | ||||
| <sql id="simpleCUserCouponOrderDetailColumns"> | <sql id="simpleCUserCouponOrderDetailColumns"> | ||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor | |||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, | |||||
| co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info` | |||||
| </sql> | </sql> | ||||
| <resultMap id="CVoResultMap" type="com.iformall.domain.vo.WxCouponOrderCVo"> | <resultMap id="CVoResultMap" type="com.iformall.domain.vo.WxCouponOrderCVo"> | ||||
| @@ -1106,7 +1142,12 @@ | |||||
| <result column="verify_type" jdbcType="INTEGER" property="verifyType" /> | <result column="verify_type" jdbcType="INTEGER" property="verifyType" /> | ||||
| <result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" /> | <result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" /> | ||||
| <result column="pay_vendor" jdbcType="INTEGER" property="payVendor" /> | <result column="pay_vendor" jdbcType="INTEGER" property="payVendor" /> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="shipping_type" jdbcType="INTEGER" property="shippingType"/> | |||||
| <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | |||||
| <result column="shipping_status" jdbcType="INTEGER" property="shippingStatus"/> | |||||
| <result column="delivery_info" jdbcType="VARCHAR" property="deliveryInfo"/> | |||||
| <result column="type" jdbcType="INTEGER" property="type" /> | <result column="type" jdbcType="INTEGER" property="type" /> | ||||
| <result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> | <result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> | ||||
| @@ -1158,6 +1199,12 @@ | |||||
| <result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" /> | <result column="verify_remark" jdbcType="VARCHAR" property="verifyRemark" /> | ||||
| <result column="pay_vendor" jdbcType="INTEGER" property="payVendor" /> | <result column="pay_vendor" jdbcType="INTEGER" property="payVendor" /> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="shipping_type" jdbcType="INTEGER" property="shippingType"/> | |||||
| <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | |||||
| <result column="shipping_status" jdbcType="INTEGER" property="shippingStatus"/> | |||||
| <result column="delivery_info" jdbcType="VARCHAR" property="deliveryInfo"/> | |||||
| <result column="type" jdbcType="INTEGER" property="type" /> | <result column="type" jdbcType="INTEGER" property="type" /> | ||||
| <result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> | <result column="cover_img" jdbcType="VARCHAR" property="coverImg" /> | ||||
| <result column="title" jdbcType="VARCHAR" property="title" /> | <result column="title" jdbcType="VARCHAR" property="title" /> | ||||
| @@ -1211,6 +1258,7 @@ | |||||
| </sql> --> | </sql> --> | ||||
| <sql id="allCUserCouponOrderListColumns"> | <sql id="allCUserCouponOrderListColumns"> | ||||
| co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, | co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor, | ||||
| co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`, | |||||
| c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_type,c.valid_start_date,c.valid_end_date,c.auto_refund | c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_type,c.valid_start_date,c.valid_end_date,c.auto_refund | ||||
| </sql> | </sql> | ||||
| @@ -1220,9 +1268,19 @@ | |||||
| <!-- left join wx_coupon_action_log cal on cal.coupon_order_id = co.id --> | <!-- left join wx_coupon_action_log cal on cal.coupon_order_id = co.id --> | ||||
| where 1=1 | where 1=1 | ||||
| and co.coupon_id = c.id | and co.coupon_id = c.id | ||||
| and co.coupon_type != 5 | |||||
| and co.coupon_type != 51 | |||||
| and co.coupon_type < 100 | |||||
| <choose> | |||||
| <when test=" null != couponType"> | |||||
| and co.coupon_type = #{couponType} | |||||
| </when> | |||||
| <otherwise> | |||||
| and co.coupon_type != 5 | |||||
| and co.coupon_type != 11 | |||||
| and co.coupon_type != 12 | |||||
| and co.coupon_type != 51 | |||||
| and co.coupon_type < 100 | |||||
| </otherwise> | |||||
| </choose> | |||||
| <if test="cUserId != null"> | <if test="cUserId != null"> | ||||
| and co.c_user_id = #{cUserId} | and co.c_user_id = #{cUserId} | ||||
| </if> | </if> | ||||
| @@ -13,6 +13,7 @@ | |||||
| <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | ||||
| <result column="payment" jdbcType="INTEGER" property="payment"/> | <result column="payment" jdbcType="INTEGER" property="payment"/> | ||||
| <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| @@ -26,11 +27,13 @@ | |||||
| <result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId"/> | <result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId"/> | ||||
| <result column="coupon_number" jdbcType="INTEGER" property="couponNumber"/> | <result column="coupon_number" jdbcType="INTEGER" property="couponNumber"/> | ||||
| <result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType"/> | <result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType"/> | ||||
| <result column="shipping_type" jdbcType="INTEGER" property="shippingType"/> | |||||
| <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`order_number`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`coupon_channel_id`,`product_id`,`type`,`payment_type`,`payment`,`payment_time`,`order_status`,`create_date`,`update_date`,`detail`, | |||||
| `press_end_date`,`press_current_num`,`press_current_value`,`order_group_id`,`form_id`,`total_payment`,`compose_order_id`,`coupon_number`,`compose_order_type` | |||||
| `id`,`order_number`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`coupon_channel_id`,`product_id`,`type`,`payment_type`,`payment`,`payment_time`,`freight_price`,`order_status`,`create_date`,`update_date`,`detail`, | |||||
| `press_end_date`,`press_current_num`,`press_current_value`,`order_group_id`,`form_id`,`total_payment`,`compose_order_id`,`coupon_number`,`compose_order_type`,`shipping_type`,`shipping_address` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -122,6 +125,10 @@ | |||||
| <if test=" null != composeOrderType "> | <if test=" null != composeOrderType "> | ||||
| and `compose_order_type` = #{composeOrderType} | and `compose_order_type` = #{composeOrderType} | ||||
| </if> | </if> | ||||
| <if test=" null != shippingType "> | |||||
| and `shipping_type` = #{shippingType} | |||||
| </if> | |||||
| <if test=" null != statusS "> | <if test=" null != statusS "> | ||||
| and `order_status` in | and `order_status` in | ||||
| @@ -251,9 +258,9 @@ | |||||
| <sql id="allCUserOrderDetailColumns"> | <sql id="allCUserOrderDetailColumns"> | ||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | |||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.`freight_price`,o.order_status,o.create_date,o.update_date, | |||||
| c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, | c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, | ||||
| co.id as coupon_order_id,co.coupon_order_status,c.support_transfer,c.subsidy_num,o.compose_order_type,o.compose_order_id | |||||
| co.id as coupon_order_id,co.coupon_order_status,c.support_transfer,c.subsidy_num,o.compose_order_type,o.compose_order_id,o.`shipping_type`,o.`shipping_address` | |||||
| </sql> | </sql> | ||||
| <update id="updateStatusByPressCouponId" parameterType="com.iformall.domain.po.WxOrder"> | <update id="updateStatusByPressCouponId" parameterType="com.iformall.domain.po.WxOrder"> | ||||
| @@ -303,6 +310,7 @@ | |||||
| <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | ||||
| <result column="payment" jdbcType="INTEGER" property="payment"/> | <result column="payment" jdbcType="INTEGER" property="payment"/> | ||||
| <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| @@ -334,6 +342,9 @@ | |||||
| <result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType" /> | <result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType" /> | ||||
| <result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId" /> | <result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId" /> | ||||
| <result column="shipping_type" jdbcType="INTEGER" property="shippingType"/> | |||||
| <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | |||||
| <collection column="{productId=product_id,tenantId=tenant_id}" property="merchantVoList" | <collection column="{productId=product_id,tenantId=tenant_id}" property="merchantVoList" | ||||
| ofType="com.iformall.domain.vo.WxMerchantVo" | ofType="com.iformall.domain.vo.WxMerchantVo" | ||||
| javaType="java.util.List" | javaType="java.util.List" | ||||
| @@ -343,15 +354,15 @@ | |||||
| <!-- <sql id="allCUserOrderListColumns"> | <!-- <sql id="allCUserOrderListColumns"> | ||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | |||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.`freight_price`,o.order_status,o.create_date,o.update_date, | |||||
| c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_start_date,c.valid_end_date, | c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.valid_start_date,c.valid_end_date, | ||||
| cal.channel_type as send_channel_type | cal.channel_type as send_channel_type | ||||
| </sql> --> | </sql> --> | ||||
| <sql id="allCUserOrderListColumns"> | <sql id="allCUserOrderListColumns"> | ||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date, | |||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.`freight_price`,o.order_status,o.create_date,o.update_date, | |||||
| c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, | c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, | ||||
| o.compose_order_type,o.compose_order_id | |||||
| o.compose_order_type,o.compose_order_id,o.`shipping_type`,o.`shipping_address` | |||||
| </sql> | </sql> | ||||
| <select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap"> | <select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap"> | ||||
| @@ -453,6 +464,7 @@ | |||||
| <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | ||||
| <result column="payment" jdbcType="INTEGER" property="payment"/> | <result column="payment" jdbcType="INTEGER" property="payment"/> | ||||
| <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| @@ -469,7 +481,7 @@ | |||||
| <sql id="allPayOrderColumns"> | <sql id="allPayOrderColumns"> | ||||
| o.`id`,o.`order_number`,o.`tenant_id`,o.`parent_tenant_id`,o.`c_user_id`,o.`coupon_channel_id`,o.`product_id`,o.`type`, | o.`id`,o.`order_number`,o.`tenant_id`,o.`parent_tenant_id`,o.`c_user_id`,o.`coupon_channel_id`,o.`product_id`,o.`type`, | ||||
| o.`payment_type`,o.`payment`,o.`payment_time`,o.`order_status`,o.`create_date`,o.`update_date`,o.`detail`, | |||||
| o.`payment_type`,o.`payment`,o.`payment_time`,o.`freight_price`,o.`order_status`,o.`create_date`,o.`update_date`,o.`detail`, | |||||
| m.name as merchant_name, bu.name, bu.phone as bphone, | m.name as merchant_name, bu.name, bu.phone as bphone, | ||||
| cubi.phone, cubi.nick_name, cubi.name c_user_name | cubi.phone, cubi.nick_name, cubi.name c_user_name | ||||
| </sql> | </sql> | ||||
| @@ -514,6 +526,7 @@ | |||||
| <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | ||||
| <result column="payment" jdbcType="INTEGER" property="payment"/> | <result column="payment" jdbcType="INTEGER" property="payment"/> | ||||
| <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| @@ -532,7 +545,7 @@ | |||||
| <sql id="allExpPayOrderColumns"> | <sql id="allExpPayOrderColumns"> | ||||
| o.`id`,o.`order_number`,o.`tenant_id`,o.`c_user_id`,o.`coupon_channel_id`,o.`product_id`,o.`type`, | o.`id`,o.`order_number`,o.`tenant_id`,o.`c_user_id`,o.`coupon_channel_id`,o.`product_id`,o.`type`, | ||||
| o.`payment_type`,o.`payment`,o.`payment_time`,o.`order_status`,o.`create_date`,o.`update_date`,o.`detail`, | |||||
| o.`payment_type`,o.`payment`,o.`payment_time`,o.`freight_price`,o.`order_status`,o.`create_date`,o.`update_date`,o.`detail`, | |||||
| m.name as merchant_name, bu.name, bu.phone as bphone, | m.name as merchant_name, bu.name, bu.phone as bphone, | ||||
| cubi.phone, cubi.nick_name, cubi.name c_user_name, | cubi.phone, cubi.nick_name, cubi.name c_user_name, | ||||
| po.id as pay_order_id, po.transaction_id | po.id as pay_order_id, po.transaction_id | ||||
| @@ -691,6 +704,7 @@ | |||||
| <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | ||||
| <result column="payment" jdbcType="INTEGER" property="payment"/> | <result column="payment" jdbcType="INTEGER" property="payment"/> | ||||
| <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| @@ -876,6 +890,7 @@ | |||||
| <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | ||||
| <result column="payment" jdbcType="INTEGER" property="payment"/> | <result column="payment" jdbcType="INTEGER" property="payment"/> | ||||
| <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| @@ -899,6 +914,9 @@ | |||||
| <result column="coupon_order_status" jdbcType="INTEGER" property="couponOrderStatus"/> | <result column="coupon_order_status" jdbcType="INTEGER" property="couponOrderStatus"/> | ||||
| <result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType"/> | <result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType"/> | ||||
| <result column="shipping_type" jdbcType="INTEGER" property="shippingType"/> | |||||
| <result column="shipping_address" jdbcType="VARCHAR" property="shippingAddress"/> | |||||
| </resultMap> | </resultMap> | ||||
| <resultMap id="PressVoDetailResultMap" type="com.iformall.domain.vo.WxOrderCouponPressVo"> | <resultMap id="PressVoDetailResultMap" type="com.iformall.domain.vo.WxOrderCouponPressVo"> | ||||
| @@ -914,6 +932,7 @@ | |||||
| <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | <result column="payment_type" jdbcType="INTEGER" property="paymentType"/> | ||||
| <result column="payment" jdbcType="INTEGER" property="payment"/> | <result column="payment" jdbcType="INTEGER" property="payment"/> | ||||
| <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | <result column="payment_time" jdbcType="TIMESTAMP" property="paymentTime"/> | ||||
| <result column="freight_price" jdbcType="INTEGER" property="freightPrice"/> | |||||
| <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | <result column="order_status" jdbcType="INTEGER" property="orderStatus"/> | ||||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/> | ||||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/> | ||||
| @@ -944,14 +963,14 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allOrderPressListColumns"> | <sql id="allOrderPressListColumns"> | ||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status, | |||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.`freight_price`,o.order_status, | |||||
| o.create_date,o.update_date,o.press_end_date,o.press_current_num,o.press_current_value, | o.create_date,o.update_date,o.press_end_date,o.press_current_num,o.press_current_value, | ||||
| c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.press_limit_num, | c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.press_limit_num, | ||||
| o.compose_order_type | |||||
| o.compose_order_type,o.`shipping_type`,o.`shipping_address` | |||||
| </sql> | </sql> | ||||
| <sql id="allOrderPressDetailColumns"> | <sql id="allOrderPressDetailColumns"> | ||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status, | |||||
| o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.`freight_price`,o.order_status, | |||||
| o.create_date,o.update_date,o.press_end_date,o.press_current_num,o.press_current_value, | o.create_date,o.update_date,o.press_end_date,o.press_current_num,o.press_current_value, | ||||
| c.type as coupon_type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.press_limit_num, | c.type as coupon_type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.press_limit_num, | ||||
| co.id as coupon_order_id,co.coupon_order_status | co.id as coupon_order_id,co.coupon_order_status | ||||