Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketMoneyServiceImpl.java

@@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -59,7 +60,7 @@ public class TaRedPacketMoneyServiceImpl extends ServiceImpl<TaRedPacketMoneyMap
         }
         Map<String, Object> result = taOrgOrderMapper.getRedPacketSendInfo(CommConstant.RED_PACKET, activityId, orgId);
         taRedPacketMoney.setSendNum((Long) result.get("sendNum"));
-        taRedPacketMoney.setSendTotalAmount((Long) result.get("sendTotalAmount"));
+        taRedPacketMoney.setSendTotalAmount(((BigDecimal)result.get("sendTotalAmount")).longValue());
 
         QueryWrapper<TaOrgAccount> orgAccountQueryWrapper = new QueryWrapper<>();
         orgAccountQueryWrapper.eq("org_id", orgId);

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

@@ -328,7 +328,7 @@
             t.*,
             t2.amount detailAmount,
             t3.phone,
-            ifNull( t3.NAME, t3.nickname ) nickname,
+            t3.nickname nickname,
             t3.avatarurl
         FROM
             ta_org_order t
@@ -337,8 +337,8 @@
         WHERE
             t.org_id = #{orgId}
             AND t2.target_id = #{activityId}
-            AND t2.target_type = 'redPacket'
-            AND t2.item_type = 'redPacket'
+            AND t2.target_type = 'RedPacket'
+            AND t2.item_type = 'RedPacket'
             AND t.`status` >- 1
             <if test = " orderId != null and orderId != ''">
                 AND t.order_id like concat( '%',#{orderId},'%')
@@ -353,7 +353,7 @@
                 AND t.trading_status = #{tradingStatus}
             </if>
             <if test = "phone != null and phone != ''">
-                AND t3.phone like concat ('%',phone,'%')
+                AND t3.phone like concat ('%',#{phone},'%')
             </if>
         ORDER BY
             t.create_date DESC
@@ -363,8 +363,8 @@
         SELECT
             t.*,
             t3.phone
-            <if test="consumeType == 'redPacket'">
-                ,t4.activity_name
+            <if test="consumeType == 'RedPacket'">
+                ,t4.name
             </if>
         FROM
             ta_org_order t
@@ -373,7 +373,7 @@
                     AND t2.item_type = #{consumeType}
                 </if>
             LEFT JOIN ta_person t3 on t2.receiver_id = t3.person_id
-            <if test="consumeType == 'redPacket'">
+            <if test="consumeType == 'RedPacket'">
                 LEFT JOIN ta_red_packet t4 ON t2.target_id = t4.activity_id
             </if>
         WHERE
@@ -414,9 +414,9 @@
         SELECT
             t.order_id,
             t.amount,
-            ( CASE t2.item_type WHEN 'redPacket' THEN '红包' ELSE '' END ) consumeType,
-            <if test="consumeType == 'redPacket'">
-                t4.activity_name,
+            ( CASE t2.item_type WHEN 'RedPacket' THEN '红包' ELSE '' END ) consumeType,
+            <if test="consumeType == 'RedPacket'">
+                t4.name,
             </if>
             t.create_date,
             t3.phone,
@@ -428,7 +428,7 @@
                     AND t2.item_type = #{consumeType}
                 </if>
             LEFT JOIN ta_person t3 ON t2.receiver_id = t3.person_id
-            <if test="consumeType == 'redPacket'">
+            <if test="consumeType == 'RedPacket'">
                 LEFT JOIN ta_red_packet t4 ON t2.target_id = t4.activity_id
             </if>
         WHERE
@@ -498,7 +498,7 @@
 
         SELECT
         count( * ) sendNum,
-        sum(t3.amount) sendTotalAmount
+        COALESCE(sum( t3.amount ),0) sendTotalAmount
     FROM
         ta_org_order_detail t3
     WHERE