Merge remote-tracking branch 'origin/develop' into develop

pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>1.0.4</version>
+        <version>1.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.0.29</version>
+    <version>1.0.31</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -33,11 +33,11 @@
         </dependency>
         <dependency>
             <groupId>au.com.royalpay.payment</groupId>
-            <artifactId>hf-core</artifactId>
+            <artifactId>alipay-core</artifactId>
         </dependency>
         <dependency>
             <groupId>au.com.royalpay.payment</groupId>
-            <artifactId>alipay-core</artifactId>
+            <artifactId>hf-core</artifactId>
         </dependency>
         <dependency>
             <groupId>au.com.royalpay.payment</groupId>
@@ -55,15 +55,15 @@
             <groupId>au.com.royalpay.payment</groupId>
             <artifactId>lakala-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>au.com.royalpay.payment</groupId>
+            <artifactId>bestpay-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.github.stuxuhai</groupId>
             <artifactId>jpinyin</artifactId>
             <version>1.1.7</version>
         </dependency>
-        <dependency>
-            <groupId>au.com.royalpay.payment</groupId>
-            <artifactId>bestpay-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>

src/main/java/au/com/royalpay/payment/manage/dev/core/AliforexcelService.java

@@ -13,6 +13,8 @@ public interface AliforexcelService {
 
     JSONObject registerAlipayOnlineMerchant();
 
+    JSONObject registerRangeAlipayOnlineMerchant(int start,int end);
+
     JSONObject registerAlipayMerchant();
 
     JSONObject registerInsertAlipayMerchant(String partners);

src/main/java/au/com/royalpay/payment/manage/dev/core/impl/AliforexcelServiceImpl.java

@@ -109,7 +109,7 @@ public class AliforexcelServiceImpl implements AliforexcelService {
         List<String> registerSuccessMerchant = new ArrayList<>();
         List<JSONObject> registerFailMerchant = new ArrayList<>();
         List<JSONObject> lessInfoMerchant = new ArrayList<>();
-        List<Integer> useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant();
+        List<Integer> useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(0,10000);
         for (int clientId : useAlipayOnlineMerchant) {
             JSONObject client = clientMapper.findClient(clientId);
             if (client == null) {
@@ -163,6 +163,73 @@ public class AliforexcelServiceImpl implements AliforexcelService {
         return result;
     }
 
+    @Override
+    public JSONObject registerRangeAlipayOnlineMerchant(int start, int end) {
+        JSONObject result = new JSONObject();
+        List<String> needRegisterMerchant = new ArrayList<>();
+        List<String> registerSuccessMerchant = new ArrayList<>();
+        List<JSONObject> registerFailMerchant = new ArrayList<>();
+        List<JSONObject> lessInfoMerchant = new ArrayList<>();
+        List<Integer> useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant(start,end);
+        for (int clientId : useAlipayOnlineMerchant) {
+            JSONObject client = clientMapper.findClient(clientId);
+            if (client == null) {
+                continue;
+            }
+            try {
+                needRegisterMerchant.add(client.getString("client_moniker"));
+                if (StringUtils.isBlank(client.getString("company_website"))) {
+                    client.put("company_website", client.getString("ali_sub_merchant_id")+".royalpay.com.au");
+                }
+                if (StringUtils.isBlank(client.getString("alipayindustry"))) {
+                    client.put("alipayindustry", "5311");
+                }
+                if (StringUtils.isBlank(client.getString("business_structure"))) {
+                    client.put("business_structure", "da");
+                }
+                checkPartnerInfo(client,"online");
+            } catch (InvalidParameterException e) {
+                JSONObject exception = new JSONObject();
+                exception.put("client_moniker", client.getString("client_moniker"));
+                exception.put("return_msg", e.getMessage());
+                exception.put("bd_name", client.getString("bd_user_name"));
+                lessInfoMerchant.add(exception);
+                continue;
+            }
+            try {
+                AlipayConfig.AlipayMerchant mch = AlipayEnvironment.getEnv().getAlipayOnlineMerchant();
+                Element resultElement = alipayClient.registerOnlineGmsPortal(mch.getPid(), client);
+                if (!StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
+                    JSONObject exception = new JSONObject();
+                    exception.put("client_moniker", client.getString("client_moniker"));
+                    exception.put("return_msg", resultElement.elementText("error"));
+                    registerFailMerchant.add(exception);
+                    continue;
+                }
+                Element responseElement = resultElement.element("response").element("alipay");
+                if (!StringUtils.equalsIgnoreCase("SUCCESS", responseElement.elementText("result_code"))) {
+                    JSONObject exception = new JSONObject();
+                    exception.put("client_moniker", client.getString("client_moniker"));
+                    exception.put("return_msg", resultElement.elementText("error"));
+                    registerFailMerchant.add(exception);
+                    continue;
+                }
+                registerSuccessMerchant.add(client.getString("client_moniker"));
+            } catch (Exception e) {
+                JSONObject exception = new JSONObject();
+                exception.put("client_moniker", client.getString("client_moniker"));
+                exception.put("return_msg", e.getMessage());
+                registerFailMerchant.add(exception);
+            }
+        }
+        result.put("need_register_merchant", needRegisterMerchant);
+        result.put("success_register_merchant", registerSuccessMerchant);
+        result.put("fail_register_merchant", registerFailMerchant);
+        result.put("less_info_merchant", lessInfoMerchant);
+        logger.info("-------AlipayOnline Gms end----fail_register_merchant"+registerFailMerchant.toString());
+        return result;
+    }
+
     @Override
     public JSONObject registerAlipayMerchant() {
         JSONObject result = new JSONObject();

src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java

@@ -459,6 +459,11 @@ public class TestController implements ApplicationEventPublisherAware {
         return aliforexcelService.registerAlipayOnlineMerchant();
     }
 
+    @ManagerMapping(value = "/register/alipayOnlineGms", role = ManagerRole.DEVELOPER, method = RequestMethod.GET)
+    public JSONObject registerRangeAlipayOnlineMerchant(@RequestParam int start,@RequestParam int end) {
+        return aliforexcelService.registerRangeAlipayOnlineMerchant(start,end);
+    }
+
     @ManagerMapping(value = "/register/alipayGms", role = ManagerRole.DEVELOPER, method = RequestMethod.POST)
     public JSONObject registerAlipayMerchant() {
         return aliforexcelService.registerAlipayMerchant();

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

@@ -137,6 +137,6 @@ public interface ClientMapper {
 
     JSONObject findCountByBd(@Param("bd_group") String bd_group, @Param("today") Date today, @Param("yesterday") Date yesterday, @Param("month") Date month);
 
-    List<Integer> listUseAlipayMerchant();
+    List<Integer> listUseAlipayMerchant(@Param("start") int start, @Param("end") int end);
 
 }

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml

@@ -739,5 +739,6 @@
 
     <select id="listUseAlipayMerchant" resultType="int">
         select client_id from sys_clients where gateway_alipay_online=1 and is_valid=1
+                and client_id >=#{start} and client_id &lt;#{end}
     </select>
 </mapper>

src/main/ui/static/payment/partner/partner-manage.js

@@ -632,6 +632,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 alert('请选择商户支付方式')
                 return;
             }
+            if (typeof ($scope.partner.client_pay_type) == 'string' || typeof ($scope.partner.client_pay_desc) == 'string') {
+                $scope.partner.client_pay_type = $scope.partner.client_pay_type.split(",");
+                $scope.partner.client_pay_desc = $scope.partner.client_pay_desc.split(",");
+
+            }
             if ($scope.partner.client_pay_type.indexOf('1') >= 0) {
                 if ($scope.partner.client_pay_desc.join(',').indexOf('10') < 0) {
                     alert("请检查线上支付场景是否已选择支付方式");