bug fix

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

@@ -12,6 +12,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -115,11 +116,10 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         IPage<TaOrgOrder> result = pg;
 
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
+            List<String> urlList = new ArrayList<>();
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
             result.getRecords().forEach(e -> {
-                if (!StringUtils.isEmpty(e.getCertificateUrl())) {
-                    e.setCertificateUrlList(Arrays.asList(e.getCertificateUrl().split(",")));
-                }
+                e.setCertificateUrlList(getCertificateByOrderId(e.getOrderId()));
             });
             return result;
         } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)) {
@@ -148,6 +148,14 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return result;
     }
 
+    public List<String> getCertificateByOrderId(String orderId){
+        List<String> urlList = new ArrayList<>();
+        QueryWrapper<TaOrgAccountCertificate> taOrgAccountCertificateQueryWrapper = new QueryWrapper<>();
+        taOrgAccountCertificateQueryWrapper.eq("order_id", orderId);
+        List<TaOrgAccountCertificate> taOrgAccountCertificates = taOrgAccountCertificateMapper.selectList(taOrgAccountCertificateQueryWrapper);
+        urlList = taOrgAccountCertificates.stream().map(TaOrgAccountCertificate::getUrl).collect(Collectors.toList());
+        return urlList;
+    }
     /**
      * 微信支付
      *

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

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