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.1</version>
+        <version>1.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.0.26</version>
+    <version>1.0.28</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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

@@ -21,6 +21,8 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -44,6 +46,8 @@ public class AliforexcelServiceImpl implements AliforexcelService {
     private AlipayClient alipayClient;
     @Resource
     private OrderMapper orderMapper;
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
 
     @Override
     public JSONObject listClients(HttpServletResponse httpResponse,JSONObject manager, AliExcel query) {
@@ -105,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 = transactionMapper.useAlipayOnlineClients();
+        List<Integer> useAlipayOnlineMerchant = clientMapper.listUseAlipayMerchant();
         for (int clientId : useAlipayOnlineMerchant) {
             JSONObject client = clientMapper.findClient(clientId);
             if (client == null) {
@@ -113,6 +117,9 @@ public class AliforexcelServiceImpl implements AliforexcelService {
             }
             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");
+                }
                 checkPartnerInfo(client,"online");
             } catch (InvalidParameterException e) {
                 JSONObject exception = new JSONObject();
@@ -122,6 +129,7 @@ public class AliforexcelServiceImpl implements AliforexcelService {
                 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"))) {
@@ -140,11 +148,18 @@ public class AliforexcelServiceImpl implements AliforexcelService {
                     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;
     }
 

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

@@ -136,4 +136,7 @@ public interface ClientMapper {
     int getPartnercode(@Param("codes") String codes);
 
     JSONObject findCountByBd(@Param("bd_group") String bd_group, @Param("today") Date today, @Param("yesterday") Date yesterday, @Param("month") Date month);
+
+    List<Integer> listUseAlipayMerchant();
+
 }

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

@@ -735,6 +735,9 @@
      WHERE address= #{address}
     GROUP BY
     address
+    </select>
 
+    <select id="listUseAlipayMerchant" resultType="int">
+        select client_id from sys_clients where gateway_alipay_online=1 and is_valid=1
     </select>
 </mapper>