fix rpay+ merchant

src/main/java/au/com/royalpay/payment/manage/mappers/system/SysRpayMerchantApplyMapper.java

@@ -21,6 +21,6 @@ public interface SysRpayMerchantApplyMapper {
     void insertRpayMerchantApply(JSONObject params);
 
     @AutoSql(type = SqlType.SELECT)
-    List<JSONObject> listByShortName(@Param("client_id") int client_id,@Param("merchant_shortname") String shortName);
+    List<JSONObject> listByShortName(@Param("merchant_shortname") String shortName);
 
 }

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

@@ -3605,10 +3605,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         checkOrgPermission(manager, client);
 
-        List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(client.getIntValue("client_id"),merchantInfo.getString("company_shortname"));
+        List<JSONObject> listByshortName = sysRpayMerchantApplyMapper.listByShortName(merchantInfo.getString("company_shortname"));
 
         if (listByshortName.size()>0) {
-            throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（请避免和Rpay+商务号列表内的Company Short Name重复）");
+            throw new BadRequestException("请修改【" + clientMoniker + "】的Company shortName信息（Short Name 已被使用）");
+        }
+        if (client.getString("rpay_enterprise_id") != null) {
+            throw new BadRequestException("您已申请成功子商务号，请勿重复申请");
         }
 
         SubRpayMerchantInfo subRpayMerchantInfo = JSONObject.toJavaObject(merchantInfo, SubRpayMerchantInfo.class);

src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html

@@ -99,7 +99,7 @@
                             Rpay+ Sub Merchant Id : {{partner.rpay_enterprise_id}}
                             <i class="fa fa-clock-o text-danger" title="Using temp Sub Merchant ID" ng-if="partner.temp_sub_merchant"></i>
                         </h3>
-                        <button role="button" class="btn btn-info pull-right" title="Apply Sub Merchant Id"
+                        <button role="button" ng-if="!partner.rpay_enterprise_id" class="btn btn-info pull-right" title="Apply Sub Merchant Id"
                                 ng-click="applyRpaySubMerchantId()">
                             <i class="fa fa-plus"></i>
                             Apply Sub Merchant Id