fix

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -6,6 +6,7 @@ import au.com.royalpay.payment.channels.wechat.runtime.MpPaymentApi;
 import au.com.royalpay.payment.channels.wechat.runtime.WxPayClient;
 import au.com.royalpay.payment.channels.wechat.runtime.beans.SubMerchantInfo;
 import au.com.royalpay.payment.core.PaymentChannelApi;
+import au.com.royalpay.payment.core.beans.PayChannel;
 import au.com.royalpay.payment.core.exceptions.EmailException;
 import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
 import au.com.royalpay.payment.core.utils.OrderExpiryRuleResolver;
@@ -1187,19 +1188,16 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
 
                 logger.info(manager.getString("display_name") + "(" + manager.getString("manager_id") + ") switched client " + clientMoniker + " channel "
                         + channel + " to " + allow);
-
-                if (allow == true) {
-                    if (channel.equals("wechat") || channel.equals("alipay")) {
-                        int clientId = client.getIntValue("client_id");
-                        List<JSONObject> clientBankAccounts = clientBankAccountMapper.clientBankAccounts(clientId);
-
-                        if (clientBankAccounts.size() > 0 ) {
-                            isRiskyMerchant(client,clientBankAccounts.get(0));
-                        }else {
-                            isRiskyMerchant(client,null);
-                        }
-
+                if (allow && (StringUtils.equalsAnyIgnoreCase("Wechat", channel) || StringUtils.equalsAnyIgnoreCase("Alipay", channel))) {
+                    int clientId = client.getIntValue("client_id");
+                    List<JSONObject> clientBankAccounts = clientBankAccountMapper.clientBankAccounts(clientId);
+
+                    if (clientBankAccounts.size() > 0) {
+                        isRiskyMerchant(client, clientBankAccounts.get(0));
+                    } else {
+                        isRiskyMerchant(client, null);
                     }
+
                 }
                 return;
             }
@@ -3861,9 +3859,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 JSONObject riskInfo = riskAttentionMerchantsMapper.findByClientMoniker(json.getString("client_moniker"));
                 infoStr.append("ABN = " + riskInfo.getString("abn") + ",ACN = " + riskInfo.getString("acn") + ",contact_phone = " + riskInfo.getString("contact_phone") + ",contact_person = " + riskInfo.getString("contact_person") + ",bank_account_no = " + riskInfo.getString("bank_account_no"));
             });
-
             appendStr.deleteCharAt(appendStr.length() - 1);
-            throw new BadRequestException("该商户信息已经进入系统黑名单，关联商户为【" + appendStr.toString().toUpperCase() + "】【"  + infoStr + "】");
+            throw new BadRequestException("该商户信息已经进入系统黑名单，关联商户为【" + appendStr.toString().toUpperCase() + "】【"  + infoStr.toString() + "】");
         }
 
     }

src/main/resources/au/com/royalpay/payment/manage/mappers/redpack/ActPrizeTypeCustomerMapper.xml

@@ -18,7 +18,7 @@
         SELECT
             t.*,
             count(p.red_packet_customer_order_id) total_counts,
-            sum(if(p.open_id IS NULL, 1, 0)) unsend_counts
+            SUM(ISNULL(p.open_id) AND p.red_pack_type_id IS NOT NULL) unsend_counts
         FROM act_prize_type_customer t
             LEFT JOIN act_red_packets_customer_orders p ON p.red_pack_type_id = t.type_id
                                                            AND date(p.create_time) <= curdate()