魏超 пре 5 година
родитељ
комит
5f5b1bac74

+ 11
- 3
src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java Прегледај датотеку

12
 import java.util.HashMap;
12
 import java.util.HashMap;
13
 import java.util.List;
13
 import java.util.List;
14
 import java.util.Map;
14
 import java.util.Map;
15
+import java.util.stream.Collectors;
15
 
16
 
16
 import javax.servlet.http.HttpServletResponse;
17
 import javax.servlet.http.HttpServletResponse;
17
 
18
 
115
         IPage<TaOrgOrder> result = pg;
116
         IPage<TaOrgOrder> result = pg;
116
 
117
 
117
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
118
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
119
+            List<String> urlList = new ArrayList<>();
118
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
120
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
119
             result.getRecords().forEach(e -> {
121
             result.getRecords().forEach(e -> {
120
-                if (!StringUtils.isEmpty(e.getCertificateUrl())) {
121
-                    e.setCertificateUrlList(Arrays.asList(e.getCertificateUrl().split(",")));
122
-                }
122
+                e.setCertificateUrlList(getCertificateByOrderId(e.getOrderId()));
123
             });
123
             });
124
             return result;
124
             return result;
125
         } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)) {
125
         } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)) {
148
         return result;
148
         return result;
149
     }
149
     }
150
 
150
 
151
+    public List<String> getCertificateByOrderId(String orderId){
152
+        List<String> urlList = new ArrayList<>();
153
+        QueryWrapper<TaOrgAccountCertificate> taOrgAccountCertificateQueryWrapper = new QueryWrapper<>();
154
+        taOrgAccountCertificateQueryWrapper.eq("order_id", orderId);
155
+        List<TaOrgAccountCertificate> taOrgAccountCertificates = taOrgAccountCertificateMapper.selectList(taOrgAccountCertificateQueryWrapper);
156
+        urlList = taOrgAccountCertificates.stream().map(TaOrgAccountCertificate::getUrl).collect(Collectors.toList());
157
+        return urlList;
158
+    }
151
     /**
159
     /**
152
      * 微信支付
160
      * 微信支付
153
      *
161
      *

+ 1
- 1
src/main/resources/mapper/redpack/TaOrgOrderMapper.xml Прегледај датотеку

320
     <select id="countTotalRechargeAmount" resultType="java.lang.Integer">
320
     <select id="countTotalRechargeAmount" resultType="java.lang.Integer">
321
         select ifnull(sum(t.amount),0) as amount from ta_org_order t
321
         select ifnull(sum(t.amount),0) as amount from ta_org_order t
322
         left join ta_org_order_detail a on t.order_id = a.order_id where t.org_id = #{orgId}
322
         left join ta_org_order_detail a on t.order_id = a.order_id where t.org_id = #{orgId}
323
-        and a.item_type = 'recharge'
323
+        and a.item_type = 'recharge' and t.trading_status = 'success'
324
     </select>
324
     </select>
325
 
325
 
326
     <select id="listRedPacketRecords" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
326
     <select id="listRedPacketRecords" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">