From 3758c5dec1b37a58ea2dc2123c90415349dccee3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 一月 2019 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
index 21325ca..bc4583a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -104,7 +104,6 @@
resultMap="com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper.BaseResultMap">
</association>
-
</resultMap>
<sql id="Base_Column_List">co_id,co_uid,co_order_no,co_source_type,co_source_position,co_order_goods_id,co_count,co_state,co_state_whole_order,co_estimate,co_eIncome,co_payment,co_settlement,co_third_create_time,co_settle_time,co_order_by,co_create_time,co_update_time
@@ -242,7 +241,7 @@
<sql id="SELECT_PARAM_ORDER_STATE">
<if test="orderState != null and orderState == 1">
- <!-- 鏈夋晥璁㈠崟: 鏁翠釜璁㈠崟鏈夋晥銆� 閮ㄥ垎璁㈠崟鏈夋晥 -->
+ <!-- 鏈夋晥璁㈠崟: 鏁翠釜璁㈠崟鏈夋晥 -->
AND <![CDATA[co.`co_state` <> 3]]> AND (co.co_state_whole_order = 1 or co.co_state_whole_order = 2)
</if>
<if test="orderState != null and orderState == 2">
@@ -255,10 +254,10 @@
</sql>
<sql id="SELECT_PARAM_ORDER_CREATE_TIME">
- <if test="startTime != null">
+ <if test="startTime != null and startTime != '' ">
AND <![CDATA[co.co_create_time >= #{startTime}]]>
</if>
- <if test="endTime != null">
+ <if test="endTime != null and endTime != '' ">
AND <![CDATA[co.co_create_time <= #{endTime}]]>
</if>
<if test="day != null and day == 1"> <!-- 浠婂ぉ -->
@@ -587,6 +586,29 @@
</if>
</select>
+ <select id="countBonusOrderMoneyAndNumber" resultType="java.util.HashMap">
+ <!-- 濂栭噾缁熻锛氳鍗曟�昏繑鍒╅噾棰� 鍘绘帀宸插け鏁� -->
+ SELECT COUNT(ho.`ho_id`) AS totalNum,
+ CAST(SUM(IF(hb.hb_id IS NULL,hbp.`hb_money`,hb.`hb_money`))AS DECIMAL(19,2)) AS totalmoney
+ FROM yeshi_ec_hongbao_order ho
+ LEFT JOIN (
+ SELECT * FROM yeshi_ec_hongbao_v2 v2
+ WHERE v2.`hb_uid`=${uid} <include refid="SELECT_PARAM_HONGBAO_TYPE" />
+ AND (v2.hb_state = 1 or v2.hb_state = 2 or v2.hb_state = 3)
+ ) hb ON hb.hb_id=ho.`ho_hongbao_id`
+ LEFT JOIN (
+ SELECT * FROM yeshi_ec_hongbao_v2 v2
+ WHERE v2.`hb_uid`=${uid} <include refid="SELECT_PARAM_HONGBAO_TYPE" />
+ AND (v2.hb_state = 1 or v2.hb_state = 2 or v2.hb_state = 3)
+ ) hbp ON hbp.hb_pid=ho.`ho_hongbao_id`
+ LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
+ WHERE (hb.hb_id IS NOT NULL OR hbp.hb_id IS NOT NULL)
+ <include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
+ <if test="day != null and day == 4">
+ AND co.`co_state` = 2 <!-- 涓婃湀 :缁熻宸叉敹璐� -->
+ </if>
+ </select>
+
<select id="listQueryByUid" resultMap="ResultMap">
<!-- 鏌ヨ鐢ㄦ埛璁㈠崟 -->
SELECT IF(hb.hb_id IS NULL,hbp.`hb_money`,hb.`hb_money`) AS totalMoney,
@@ -594,7 +616,7 @@
IF(hb.hb_id IS NULL,hbp.`hb_type`,hb.`hb_type`) AS hongBaoType,
IF(hb.hb_id IS NULL,hbp.`hb_get_time`,hb.`hb_get_time`) AS accountTime,
IF(hb.hb_id IS NULL,hbp.`hb_pre_get_time`,hb.`hb_pre_get_time`) AS preAccountTime,
- co.*
+ co.*,cog.*
FROM yeshi_ec_hongbao_order ho
LEFT JOIN (SELECT * FROM yeshi_ec_hongbao_v2 v2
@@ -610,6 +632,7 @@
)hbp ON hbp.hb_pid=ho.`ho_hongbao_id`
LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
+ LEFT JOIN yeshi_ec_common_order_goods cog ON cog.`cog_id`= co.`co_order_goods_id`
WHERE (hb.hb_id IS NOT NULL OR hbp.hb_id IS NOT NULL)
<include refid="SELECT_PARAM_ORDER_STATE"/> <!-- 璁㈠崟鐘舵�� -->
<include refid="SELECT_PARAM_ORDER_CREATE_TIME"/> <!-- 璁㈠崟鏃堕棿 -->
--
Gitblit v1.8.0