Browse Source

* 功能优化

顾绍勇 4 years ago
parent
commit
48471eb993

+ 2
- 1
src/main/java/com/huiju/estateagents/redpack/service/impl/TaRedPacketMoneyServiceImpl.java View File

16
 import org.springframework.beans.factory.annotation.Autowired;
16
 import org.springframework.beans.factory.annotation.Autowired;
17
 import org.springframework.stereotype.Service;
17
 import org.springframework.stereotype.Service;
18
 
18
 
19
+import java.math.BigDecimal;
19
 import java.util.Map;
20
 import java.util.Map;
20
 
21
 
21
 /**
22
 /**
59
         }
60
         }
60
         Map<String, Object> result = taOrgOrderMapper.getRedPacketSendInfo(CommConstant.RED_PACKET, activityId, orgId);
61
         Map<String, Object> result = taOrgOrderMapper.getRedPacketSendInfo(CommConstant.RED_PACKET, activityId, orgId);
61
         taRedPacketMoney.setSendNum((Long) result.get("sendNum"));
62
         taRedPacketMoney.setSendNum((Long) result.get("sendNum"));
62
-        taRedPacketMoney.setSendTotalAmount((Long) result.get("sendTotalAmount"));
63
+        taRedPacketMoney.setSendTotalAmount(((BigDecimal)result.get("sendTotalAmount")).longValue());
63
 
64
 
64
         QueryWrapper<TaOrgAccount> orgAccountQueryWrapper = new QueryWrapper<>();
65
         QueryWrapper<TaOrgAccount> orgAccountQueryWrapper = new QueryWrapper<>();
65
         orgAccountQueryWrapper.eq("org_id", orgId);
66
         orgAccountQueryWrapper.eq("org_id", orgId);

+ 2
- 2
src/main/resources/mapper/redpack/TaOrgOrderMapper.xml View File

328
             t.*,
328
             t.*,
329
             t2.amount detailAmount,
329
             t2.amount detailAmount,
330
             t3.phone,
330
             t3.phone,
331
-            ifNull( t3.NAME, t3.nickname ) nickname,
331
+            t3.nickname nickname,
332
             t3.avatarurl
332
             t3.avatarurl
333
         FROM
333
         FROM
334
             ta_org_order t
334
             ta_org_order t
498
 
498
 
499
         SELECT
499
         SELECT
500
         count( * ) sendNum,
500
         count( * ) sendNum,
501
-        sum(t3.amount) sendTotalAmount
501
+        COALESCE(sum( t3.amount ),0) sendTotalAmount
502
     FROM
502
     FROM
503
         ta_org_order_detail t3
503
         ta_org_order_detail t3
504
     WHERE
504
     WHERE