fix 标签用户订单查询

netflix-dao/src/main/resources/mapper/OrderDonMapper.xml

@@ -321,13 +321,13 @@
 
     <select id="getTagUserData" resultType="com.cyksj.model.views.UserOrderDetailView">
         select count(if(status != 'refund', 1, NULL)) as numOfOrder,
-               (sum(money) - sum(ifnull(refund_money, 0))) / 100 as orderMoney,
+               cast((sum(money) - sum(ifnull(refund_money, 0))) / 100 as decimal(10,2)) as orderMoney,
                count(if(status != 'refund' and o.goods_id = 15,1,NULL)) as numOfEpOrder,
-               (sum(if(o.goods_id = 15,money,0)) - sum(ifnull(if(o.goods_id = 15,refund_money,0), 0))) / 100 as epOrderMoney,
+              cast((sum(if(o.goods_id = 15,money,0)) - sum(ifnull(if(o.goods_id = 15,refund_money,0), 0))) / 100 as decimal(10,2)) as epOrderMoney,
                count(distinct corpUserId) as numOfUser
         from (select cu.id as corpUserId,
         cu.user_id,
-        s.created_time
+        date_format(s.created_time, '%Y-%m-%d') as joinTime
         from (select relation_id,
         min(ct.created_time) as created_time
         from `corp_user_tag` ct
@@ -345,7 +345,7 @@
         left join order_don o on o.user_id = s.user_id and o.user_id != 0
         and o.status not in ('close', 'noPayment')
         and o.money > 0
-        and o.created_time > s.created_time
+        and date_format(o.created_time, '%Y-%m-%d') >= joinTime
         <if test="consumeStTime != null">
             and o.created_time >= #{consumeStTime}
         </if>
@@ -358,7 +358,7 @@
         select joinTime                               as `date`,
                count(DISTINCT corpUserId)             as numOfUser,
                count(if(status != 'refund', 1, NULL)) as numOfOrder,
-               (ifnull(sum(money), 0) - sum(ifnull(refund_money, 0))) / 100 as orderMoney
+               cast((ifnull(sum(money), 0) - sum(ifnull(refund_money, 0))) / 100 as decimal(10,2)) as orderMoney
         from (select cu.id as                                corpUserId,
                      cu.user_id,
                      date_format(s.created_time, '%Y-%m-%d') joinTime
@@ -463,7 +463,7 @@
     <select id="getPastRecord" resultType="com.cyksj.model.views.UserOrderDetailView">
         select date_format(o.created_time,'%Y-%m-%d') as `date`,
         count(if(status != 'refund', 1, NULL)) as numOfOrder,
-        (ifnull(sum(money),0) - sum(ifnull(refund_money, 0))) / 100 as orderMoney
+        cast((ifnull(sum(money),0) - sum(ifnull(refund_money, 0))) / 100 as decimal(10,2)) as orderMoney
         from (select cu.id as corpUserId,
         cu.user_id,
         date_format(s.created_time, '%Y-%m-%d') joinTime
@@ -477,13 +477,8 @@
         left join corp_user cu on cu.id = ca.corp_user_id where cu.user_id != 0)s
         inner join order_don o on o.user_id = s.user_id
         and o.status not in ('close','noPayment')
-        and date_format(o.created_time, '%Y-%m-%d') > joinTime
-        <if test="consumeStTime != null">
-            and o.created_time >= #{consumeStTime}
-        </if>
-        <if test="consumeEtTime != null">
-            and o.created_time &lt; #{consumeEtTime}
-        </if>
+        and date_format(o.created_time, '%Y-%m-%d') >= joinTime
+        and o.money > 0
         group by date_format(o.created_time,'%Y-%m-%d')
         order by date_format(o.created_time,'%Y-%m-%d') desc
     </select>