Merge remote-tracking branch 'origin/master'

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

@@ -2305,12 +2305,21 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (client == null) {
             throw new InvalidShortIdException();
         }
+
         if (manager != null && ManagerRole.BD_USER.hasRole(manager.getIntValue("role"))) {
             int bdOperatClientRole = clientBDMapper.checkBDPermission(client.getIntValue("client_id"), manager.getString("manager_id"));
             if (bdOperatClientRole <= 0) {
                 throw new ForbiddenException();
             }
         }
+
+        if (client.getInteger("open_status") == null) {
+            int countProduct = commoditiesMapper.checkProduct(client.getInteger("client_id"));
+            if (countProduct <= 0) {
+                throw new BadRequestException("The Merchant's Product is empty!");
+            }
+        }
+
         JSONObject surCharge = merchantInfoProvider.clientCurrentRate(client.getIntValue("client_id"), new Date(), "Wechat");
         if (surCharge == null || surCharge.size() <= 0) {
             throw new BadRequestException("The Partner's Rate is not config!");