-
-
-
-
-
@@ -217,9 +204,79 @@
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ng-if="(partner.business_structure != 'Company'&&partner.business_structure != null )|| partner.enable_card_payment">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ ng-if="(partner.business_structure == 'Company'&&partner.business_structure != null) && partner.enable_cross_payment">
+
+
@@ -252,6 +309,27 @@
+
+
+
+
+
+
+
+
+
+
+ Required Field
+
@@ -152,10 +209,10 @@
+
-
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html
index 082586496..3ae25b0cf 100644
--- a/src/main/ui/static/payment/partner/templates/partner_detail.html
+++ b/src/main/ui/static/payment/partner/templates/partner_detail.html
@@ -560,6 +560,38 @@
Less Than 20 @@ -165,9 +222,9 @@
-
+
@@ -35,4 +47,4 @@
-
\ No newline at end of file
+
-
+ Less Than 20 @@ -176,6 +233,28 @@
+
+
+
@@ -1175,7 +1254,7 @@
+
+
+
+
+
+
+
+
+ Required Field
+
+ *Wechat Business Category
-
+
+
+
+
+
+
+
+ Required + Field
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -579,6 +611,13 @@
+
+
+
+
+
+
@@ -1297,6 +1336,16 @@
+
+
+
+
+ + {{partner.mc_code|wechat_mcc}} + ({{partner.mc_code}}) +
+ +
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html
index 875507a9a..562860fa3 100644
--- a/src/main/ui/static/payment/partner/templates/partner_edit.html
+++ b/src/main/ui/static/payment/partner/templates/partner_edit.html
@@ -236,6 +236,62 @@
@@ -251,9 +307,9 @@
-
+
clients = clientMapper.halfYearHaveTransactionClients(from,to);
+
+ List clients = new ArrayList<>();
+ clients.add("PLPR");
+ clients.add("MZZI");
+ clients.add("AGSH");
+ clients.add("AGBC");
+ clients.add("ISKI");
+ clients.add("BTGL");
+ clients.add("BTVL");
+ clients.add("HJCO");
+ clients.add("BAOC");
+ clients.add("WANR");
+ clients.add("XSPL");
+ clients.add("H20C");
+ clients.add("SDCN");
+ List result = new ArrayList<>();
+ List errorClients = new ArrayList<>();
+
+ clients.forEach(client->{
+ JSONObject clientInfo = clientMapper.findClientByMonikerAll(client);
+ try {
+ Element resultElement = alipayClient.queryOnlineGmsPortalStatus("2088821643021586", clientInfo);
+ if (StringUtils.equalsIgnoreCase("T", resultElement.elementText("is_success"))) {
+ Element responseElement = resultElement.element("response");
+ Element element1 = responseElement.element("alipay");
+// if (!StringUtils.equalsIgnoreCase("SUCCESS", element1.elementText("status"))) {
+// return;
+// }
+ Element registerAddress = element1.element("register_address");
+ Element registrationNo = element1.element("registration_no");
+
+ if (registerAddress != null && registrationNo != null) {
+ return;
+ }
+
+ if ((clientInfo.containsKey("acn") || clientInfo.containsKey("abn"))
+ && clientInfo.containsKey("country")
+ && clientInfo.containsKey("state")
+ && clientInfo.containsKey("suburb")
+ && clientInfo.containsKey("address")) {
+ //重新进件
+ Element applyResponse = alipayClient.registerOnlineGmsPortal("2088821643021586", clientInfo);
+ if(!StringUtils.equalsIgnoreCase("SUCCESS", applyResponse.element("is_success").getText())){
+ logger.info("商户："+clientInfo.getString("client_moniker")+",进件失败，失败原因：" + applyResponse.element("error").getText());
+ clientInfo.put("error_message",applyResponse.elementText("result_code") +
+ ":" + responseElement.elementText("reject_reason"));
+ errorClients.add(clientInfo);
+ }else{
+ logger.info("商户："+clientInfo.getString("client_moniker")+",重新进件");
+
+ }
+ } else {
+ //打印缺失信息商户编码、所属BD
+ result.add(clientInfo);
+ }
+ } else {
+ System.out.println("非Alipay Online商户");
+ }
+ }catch (Exception e){
+
+ }
+ });
+ logger.info("重新进件商户为 "+applyNum+" 个");
+ logger.info("进见调用异常商户:"+errorClients.size());
+ logger.info("以下为数据缺失商户需BD补充 :");
+ result.forEach(client->{
+ String registrationNo = client.containsKey("acn") ? client.getString("acn"): (client.containsKey("abn") ? client.getString("abn") : "缺失");
+ logger.info("商户编码===>"+client.getString("client_moniker") +
+ " , registration_no===>" + registrationNo +
+ " , register_address===>" + (client.containsKey("country") ? (client.getString("country") + " " + client.getString("state") + " " + client.getString("suburb") + " " + client.getString("address")) : "缺失" )+
+ " , bd===>"+(client.containsKey("bd_user_name") ? client.getString("bd_user_name") : "-"));
+ });
+ }
+}
-
diff --git a/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
new file mode 100644
index 000000000..e72673b61
--- /dev/null
+++ b/src/main/ui/static/payment/partner/templates/update_apply_wx_sub_merchant_id.html
@@ -0,0 +1,330 @@
+
@@ -264,9 +320,9 @@
-
+
+
-
Less Than 20 @@ -274,6 +330,27 @@
+
+
@@ -1167,7 +1244,7 @@
+
+
+
+
+
+
+
+
+ Required Field
+
+ *Wechat Business Category
+
+
+
+
+
+
+
+
+ Required + Field
+
+
+
diff --git a/src/test/java/au/com/royalpay/payment/manage/alipayregisty/AlipayOnlineRegistryTest.java b/src/test/java/au/com/royalpay/payment/manage/alipayregisty/AlipayOnlineRegistryTest.java
new file mode 100644
index 000000000..9354c7bca
--- /dev/null
+++ b/src/test/java/au/com/royalpay/payment/manage/alipayregisty/AlipayOnlineRegistryTest.java
@@ -0,0 +1,122 @@
+package au.com.royalpay.payment.manage.alipayregisty;
+
+import au.com.royalpay.payment.channels.alipay.config.AlipayConfig;
+import au.com.royalpay.payment.channels.alipay.config.AlipayEnvironment;
+import au.com.royalpay.payment.channels.alipay.runtime.AlipayClient;
+import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.dom4j.Element;
+import org.joda.time.DateTime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class AlipayOnlineRegistryTest {
+
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ @Resource
+ private ClientMapper clientMapper;
+ @Resource
+ private AlipayClient alipayClient;
+ int applyNum = 0;
+ /**
+ * 查询缺失字段
+ *
+ */
+ @Test
+ public void findMissingFields() {
+ ///获取近半年有效交易的商户
+ Date to = new Date();
+ Calendar calendar1 = Calendar.getInstance();
+ calendar1.add(Calendar.MONTH, -6);
+ calendar1.set(Calendar.DAY_OF_MONTH,1);
+ Date from = calendar1.getTime();
+// List