From 659ecb86b75e24c95ab2edc9a056fdd6f7d90a91 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 23 八月 2019 11:09:28 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/pdd/PDDOrderMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/pdd/PDDOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/pdd/PDDOrderMapper.xml
index 8d9985c..fb4baa5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/pdd/PDDOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/pdd/PDDOrderMapper.xml
@@ -154,7 +154,8 @@
#{orderId,jdbcType=VARCHAR},po_create_time =
#{createTime,jdbcType=TIMESTAMP},po_update_time =
#{updateTime,jdbcType=TIMESTAMP},po_order_receive_time =
- #{orderReceiveTime,jdbcType=BIGINT} where po_id = #{id,jdbcType=BIGINT}
+ #{orderReceiveTime,jdbcType=BIGINT} where po_id =
+ #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.pdd.PDDOrder">
update yeshi_ec_pdd_order
@@ -190,7 +191,8 @@
<if test="orderId != null">po_order_id=#{orderId,jdbcType=VARCHAR},</if>
<if test="createTime != null">po_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">po_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
- <if test="orderReceiveTime != null">po_order_receive_time=#{orderReceiveTime,jdbcType=BIGINT},</if>
+ <if test="orderReceiveTime != null">po_order_receive_time=#{orderReceiveTime,jdbcType=BIGINT},
+ </if>
</set>
where po_id = #{id,jdbcType=BIGINT}
</update>
@@ -233,4 +235,30 @@
</select>
+
+ <select id="listByStatus" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+
+ from yeshi_ec_pdd_order
+
+ <if test="status!=null">
+ where po_order_status=#{status}
+ </if>
+ limit #{start},#{count}
+ </select>
+
+
+
+ <select id="countByStatus" resultType="java.lang.Long">
+ select
+ count(po_id)
+
+ from yeshi_ec_pdd_order
+
+ <if test="status!=null">
+ where po_order_status=#{status}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0