| @@ -159,9 +159,9 @@ | |||||
| </select> | </select> | ||||
| <select id="findListOfVerifiedByDateForBUser" parameterType="map" resultMap="BaseResultMap"> | <select id="findListOfVerifiedByDateForBUser" parameterType="map" resultMap="BaseResultMap"> | ||||
| 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`, | |||||
| co.b_user_id,co.c_user_id | |||||
| select 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` | |||||
| from wx_coupon_order co | from wx_coupon_order co | ||||
| where co.tenant_id = #{tenantId} | where co.tenant_id = #{tenantId} | ||||
| AND co.coupon_order_status = '1' | AND co.coupon_order_status = '1' | ||||
| @@ -181,9 +181,9 @@ | |||||
| </select> | </select> | ||||
| <select id="findListOfOrderedByDateForBUser" parameterType="map" resultMap="BaseResultMap"> | <select id="findListOfOrderedByDateForBUser" parameterType="map" resultMap="BaseResultMap"> | ||||
| 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`, | |||||
| co.b_user_id,co.c_user_id | |||||
| select 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` | |||||
| from wx_coupon_order co | from wx_coupon_order co | ||||
| where co.tenant_id = #{tenantId} | where co.tenant_id = #{tenantId} | ||||
| <if test=" null != couponIds "> | <if test=" null != couponIds "> | ||||
| @@ -961,7 +961,7 @@ | |||||
| </select> | </select> | ||||
| <select id="findDetailOfAdmin" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | <select id="findDetailOfAdmin" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | ||||
| 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, | |||||
| select 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`,co.subsidy | co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.subsidy | ||||
| where co.id = #{id} and co.tenant_id = #{tenantId} and cu.final_tenant_id = #{finalTenantId} | where co.id = #{id} and co.tenant_id = #{tenantId} and cu.final_tenant_id = #{finalTenantId} | ||||
| @@ -1055,7 +1055,7 @@ | |||||
| </select> | </select> | ||||
| <select id="findListOfOrderedByDate" parameterType="map" resultMap="BaseResultMap"> | <select id="findListOfOrderedByDate" parameterType="map" resultMap="BaseResultMap"> | ||||
| 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, | |||||
| select 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` | co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info` | ||||
| from wx_coupon_order co | from wx_coupon_order co | ||||
| @@ -1076,7 +1076,7 @@ | |||||
| </select> | </select> | ||||
| <select id="findListOfVerifiedByDate" parameterType="map" resultMap="BaseResultMap"> | <select id="findListOfVerifiedByDate" parameterType="map" resultMap="BaseResultMap"> | ||||
| 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, | |||||
| select 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` | co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info` | ||||
| from wx_coupon_order co | from wx_coupon_order co | ||||