From b8d50f6ad9d1ab407e5b2a6867cf47bc4640a43c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 12 Apr 2021 18:11:55 +0800 Subject: [PATCH] modify taocanlist api --- zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml index 1e64c24..7bdfec4 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml @@ -23,6 +23,7 @@ <result property="vipNo" column="VIP_NO"/> <result property="staffName" column="STAFF_NAME"/> <result property="changeId" column="CHANGE_ID"/> + <result property="orderType" column="orderType"/> <result property="cashPay" column="cash_Pay"/> <result property="cardPay" column="card_Pay"/> @@ -61,7 +62,9 @@ beatuyId, beatuyName, pay_time, - company_id + company_id, + orderType, + is_has_refund ) VALUES ( #{id}, @@ -83,7 +86,9 @@ #{beatuyId}, #{beatuyName}, #{payTime}, - #{companyId} + #{companyId}, + #{orderType}, + #{isHasRefund} ) </insert> @@ -140,9 +145,11 @@ <if test="cashPay != null and cashPay !='' "> cash_Pay = #{cashPay}, </if> - <if test="payTime != null "> pay_time = #{payTime}, + </if> + <if test="isHasRefund != null "> + is_has_refund = #{isHasRefund}, </if> </set> @@ -229,6 +236,9 @@ <if test="(record.companyId!=null and record.companyId!='') "> and a.company_id = #{record.companyId} </if> + <if test="(record.orderType!=null and record.orderType!='') "> + and a.orderType = #{record.orderType} + </if> <if test="record.beginTimeVo != null "> and a.ORDER_TIME >= #{record.beginTimeVo} </if> @@ -282,6 +292,9 @@ </if> <if test="(record.companyId!=null and record.companyId!='') "> and a.company_id = #{record.companyId} + </if> + <if test="(record.orderType!=null and record.orderType!='') "> + and a.orderType = #{record.orderType} </if> <if test="record.isCross != null and record.isCross !='' "> and a.IS_CROSS = #{record.isCross} @@ -405,6 +418,9 @@ <if test="(record.companyId!=null and record.companyId!='') "> and a.company_id = #{record.companyId} </if> + <if test="(record.orderType!=null and record.orderType!='') "> + and a.orderType = #{record.orderType} + </if> </if> </sql> @@ -434,6 +450,9 @@ <if test="(record.companyId!=null and record.companyId!='') "> and a.company_id = #{record.companyId} </if> + <if test="(record.orderType!=null and record.orderType!='') "> + and a.orderType = #{record.orderType} + </if> <if test="record.activity != null and record.activity !='' "> and a.ACTIVITY = #{record.activity} </if> -- Gitblit v1.9.1