合并代码

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

@@ -0,0 +1,20 @@
+package au.com.royalpay.payment.manage.mappers.system.aps;
+
+import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData;
+import com.alibaba.fastjson.JSONObject;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
+import org.apache.ibatis.annotations.Param;
+
+@AutoMapper(tablename = "sys_client_aps_config", pkName = "id")
+public interface ApsConfigMapper {
+
+    @AutoSql(SqlType.SELECT)
+    ApsConfigData findByClientId(@Param("client_id") String clientId);
+
+    @AutoSql(SqlType.INSERT)
+    void saveApsConfigClientId(ApsConfigData apsConfigData);
+
+    void updateApsConfigClientId(JSONObject apsConfigData);
+}

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

@@ -0,0 +1,13 @@
+package au.com.royalpay.payment.manage.merchants.core;
+
+import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor;
+import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData;
+import com.alibaba.fastjson.JSONObject;
+
+public interface ApsConfigService {
+    ApsConfigData getApsConfigByClientId(String clientId);
+
+    ApsConfigData saveApsConfigClientId(String managerId, String clientId, ApsConfigDescriptor apsConfigDescriptor);
+
+    ApsConfigData updateApsConfigClientId(String managerId,String clientId, JSONObject apsConfig);
+}

src/main/java/au/com/royalpay/payment/manage/merchants/core/descriptor/ApsConfigDescriptor.java

@@ -0,0 +1,17 @@
+package au.com.royalpay.payment.manage.merchants.core.descriptor;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class ApsConfigDescriptor {
+
+    private Boolean enableAlipayAps = false;
+
+    private Boolean alipayCnSwitch = false;
+}

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

@@ -0,0 +1,38 @@
+package au.com.royalpay.payment.manage.merchants.core.impls;
+
+import au.com.royalpay.payment.manage.mappers.system.aps.ApsConfigMapper;
+import au.com.royalpay.payment.manage.merchants.core.ApsConfigService;
+import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor;
+import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+
+@Service
+public class ApsConfigServiceImpl implements ApsConfigService {
+
+    @Resource
+    private ApsConfigMapper apsConfigMapper;
+
+    @Override
+    public ApsConfigData getApsConfigByClientId(String clientId) {
+        return apsConfigMapper.findByClientId(clientId);
+    }
+
+    @Override
+    public ApsConfigData saveApsConfigClientId(String managerId, String clientId, ApsConfigDescriptor apsConfigDescriptor) {
+        ApsConfigData apsConfigData = ApsConfigData.saveData(managerId, clientId, apsConfigDescriptor);
+        apsConfigMapper.saveApsConfigClientId(apsConfigData);
+        return apsConfigMapper.findByClientId(clientId);
+    }
+
+    @Override
+    public ApsConfigData updateApsConfigClientId(String managerId, String clientId, JSONObject apsConfig) {
+        apsConfig.put("clientId", clientId);
+        apsConfig.put("modifier", managerId);
+        apsConfigMapper.updateApsConfigClientId(apsConfig);
+        return apsConfigMapper.findByClientId(clientId);
+    }
+}

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

@@ -58,13 +58,12 @@ import au.com.royalpay.payment.manage.mappers.redpack.ActClientInvitationCodeMap
 import au.com.royalpay.payment.manage.mappers.risk.RiskAttentionMerchantsMapper;
 import au.com.royalpay.payment.manage.mappers.system.*;
 import au.com.royalpay.payment.manage.merchants.beans.*;
-import au.com.royalpay.payment.manage.merchants.core.ClientConfigService;
-import au.com.royalpay.payment.manage.merchants.core.ClientInfoCacheSupport;
-import au.com.royalpay.payment.manage.merchants.core.ClientManager;
-import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport;
+import au.com.royalpay.payment.manage.merchants.core.*;
 import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBank;
 import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBankClientNullException;
 import au.com.royalpay.payment.manage.merchants.core.bank.AustraliaBankInfo;
+import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor;
+import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData;
 import au.com.royalpay.payment.manage.merchants.entity.impls.*;
 import au.com.royalpay.payment.manage.merchants.enums.UPayAuthFileEnum;
 import au.com.royalpay.payment.manage.notice.core.MailService;
@@ -333,6 +332,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     private PaymentApi paymentApi;
     @Resource
     private MerchantChannelPermissionManager merchantChannelPermissionManager;
+    @Resource
+    private ApsConfigService apsConfigService;
 
     DateTimeFormatter formatter = DateTimeFormat.forPattern("dd MMM yyyy");
 
@@ -360,7 +361,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     private String agreetemplatePdfPath;
     @Value("${app.agreetemplate.aggregate.path}")
     private String aggregateAgreetemplatePdfPath;
-//    private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf";
+    //    private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2020/04/08/1586313342533_41vI3w9R8OHrhAVYWvdv7S2IyQra4z.pdf";
     private final String IMG_AGGREGATE_FILE = "https://file.royalpay.com.au/open/2021/09/07/1630997571126_fqWcLQ5Rx0wFm8pVwpKuI1gjf6FmwX.pdf";
 
 
@@ -558,7 +559,13 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 resolver.newOrderEnabled(client, null, PlatformEnvironment.getEnv().getForeignCurrency())) {
             client.put("enable_alipayplus", true);
         }
-
+        ApsConfigData apsConfig = apsConfigService.getApsConfigByClientId(client.getString("client_id"));
+        if (apsConfig == null) {
+            apsConfig = apsConfigService.saveApsConfigClientId(manager.getString("manager_id"), client.getString("client_id"), new ApsConfigDescriptor());
+        }
+        client.put("aps_config_id", apsConfig.getId());
+        client.put("enable_alipayaps", apsConfig.getEnableAlipayAps());
+        client.put("alipay_cn_switch", apsConfig.getAlipayCnSwitch());
         return client;
     }
 
@@ -1587,12 +1594,18 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 if (client == null) {
                     throw new NotFoundException("Client Not Exists");
                 }
+                if (channelApi.channel().equalsIgnoreCase("alipayaps")) {
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("enableAlipayAps", allow);
+                    apsConfigService.updateApsConfigClientId(manager.getString("manager_id"), client.getString("client_id"), jsonObject);
+                } else {
                     merchantChannelPermissionManager.switchMerchantChannelPermission(channelApi.getMetadata().payChannel(), client.getIntValue("client_id"), allow);
                     try {
                         clientModifySupport.processModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow));
                     } catch (Exception e) {
                         logger.error("Failed to change channel switch:{}", channel);
                     }
+                }
                 logger.info("{}({}) switched client {} channel {} to {}", manager.getString("display_name"), manager.getString("manager_id"), clientMoniker, channel, allow);
                 if (allow && (StringUtils.equalsAnyIgnoreCase("Wechat", channel) || StringUtils.equalsAnyIgnoreCase("Alipay", channel))) {
                     int clientId = client.getIntValue("client_id");
@@ -2984,21 +2997,21 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new BadRequestException("The Partner's Rate is not config!");
         }
         client.put("wechat_rate", weChatRate.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
-        client.put("clean", "T+"+weChatRate.getString("clean_days"));
+        client.put("clean", "T+" + weChatRate.getString("clean_days"));
         client.put("clean_days", weChatRate.getString("clean_days"));
         client.put("located_country", "Australia");
-        if("1".equalsIgnoreCase(weChatRate.getString("clean_days"))){
+        if ("1".equalsIgnoreCase(weChatRate.getString("clean_days"))) {
 //        clean_1    clean_1_friday  clean_1_saturday
             //            second, third or fourth
             client.put("clean_1", weChatRate.getString("clean_days"));
             client.put("clean_1_friday", "first");
             client.put("clean_1_saturday", "second");
-        }else if("2".equalsIgnoreCase(weChatRate.getString("clean_days"))){
+        } else if ("2".equalsIgnoreCase(weChatRate.getString("clean_days"))) {
             client.put("clean_1", weChatRate.getString("clean_days"));
             client.put("clean_1_friday", "second");
             client.put("clean_1_saturday", "third");
 
-        }else if("3".equalsIgnoreCase(weChatRate.getString("clean_days"))){
+        } else if ("3".equalsIgnoreCase(weChatRate.getString("clean_days"))) {
             client.put("clean_1", weChatRate.getString("clean_days"));
             client.put("clean_1_friday", "third");
             client.put("clean_1_saturday", "fourth");
@@ -3120,16 +3133,16 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 client.put("wechat_rate", p.getBigDecimal("rate_value").setScale(2, RoundingMode.DOWN));
                 client.put("clean", "T+" + p.getString("clean_days"));
                 client.put("clean_days", p.getString("clean_days"));
-                if("1".equalsIgnoreCase(p.getString("clean_days"))){
+                if ("1".equalsIgnoreCase(p.getString("clean_days"))) {
                     client.put("clean_1", p.getString("clean_days"));
                     client.put("clean_1_friday", "first");
                     client.put("clean_1_saturday", "second");
-                }else if("2".equalsIgnoreCase(p.getString("clean_days"))){
+                } else if ("2".equalsIgnoreCase(p.getString("clean_days"))) {
                     client.put("clean_1", p.getString("clean_days"));
                     client.put("clean_1_friday", "second");
                     client.put("clean_1_saturday", "third");
 
-                }else if("3".equalsIgnoreCase(p.getString("clean_days"))){
+                } else if ("3".equalsIgnoreCase(p.getString("clean_days"))) {
                     client.put("clean_1", p.getString("clean_days"));
                     client.put("clean_1_friday", "third");
                     client.put("clean_1_saturday", "fourth");
@@ -3209,18 +3222,18 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         client.put("clean", "T+" + weChatRate.getString("clean_days"));
         client.put("clean_days", weChatRate.getString("clean_days"));
         client.put("located_country", "Australia");
-        if("1".equalsIgnoreCase(weChatRate.getString("clean_days"))){
+        if ("1".equalsIgnoreCase(weChatRate.getString("clean_days"))) {
 //        clean_1    clean_1_friday  clean_1_saturday
             //            second, third or fourth
             client.put("clean_1", weChatRate.getString("clean_days"));
             client.put("clean_1_friday", "first");
             client.put("clean_1_saturday", "second");
-        }else if("2".equalsIgnoreCase(weChatRate.getString("clean_days"))){
+        } else if ("2".equalsIgnoreCase(weChatRate.getString("clean_days"))) {
             client.put("clean_1", weChatRate.getString("clean_days"));
             client.put("clean_1_friday", "second");
             client.put("clean_1_saturday", "third");
 
-        }else if("3".equalsIgnoreCase(weChatRate.getString("clean_days"))){
+        } else if ("3".equalsIgnoreCase(weChatRate.getString("clean_days"))) {
             client.put("clean_1", weChatRate.getString("clean_days"));
             client.put("clean_1_friday", "third");
             client.put("clean_1_saturday", "fourth");
@@ -4110,18 +4123,18 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         client.put("clean", "T+" + weChatRate.getString("clean_days"));
         client.put("clean_days", weChatRate.getString("clean_days"));
         client.put("located_country", "Australia");
-        if("1".equalsIgnoreCase(weChatRate.getString("clean_days"))){
+        if ("1".equalsIgnoreCase(weChatRate.getString("clean_days"))) {
 //        clean_1    clean_1_friday  clean_1_saturday
             //            second, third or fourth
             client.put("clean_1", weChatRate.getString("clean_days"));
             client.put("clean_1_friday", "first");
             client.put("clean_1_saturday", "second");
-        }else if("2".equalsIgnoreCase(weChatRate.getString("clean_days"))){
+        } else if ("2".equalsIgnoreCase(weChatRate.getString("clean_days"))) {
             client.put("clean_1", weChatRate.getString("clean_days"));
             client.put("clean_1_friday", "second");
             client.put("clean_1_saturday", "third");
 
-        }else if("3".equalsIgnoreCase(weChatRate.getString("clean_days"))){
+        } else if ("3".equalsIgnoreCase(weChatRate.getString("clean_days"))) {
             client.put("clean_1", weChatRate.getString("clean_days"));
             client.put("clean_1_friday", "third");
             client.put("clean_1_saturday", "fourth");
@@ -4205,7 +4218,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc")));
         logs.forEach(log -> log.put("padding", log.getBooleanValue("editable")));
         JSONObject result = PageListUtils.buildPageListResult(logs);
-        result.put("padding", logs.stream().anyMatch(log->log.getBooleanValue("editable")));
+        result.put("padding", logs.stream().anyMatch(log -> log.getBooleanValue("editable")));
         logger.info("##editable{}", result.getBooleanValue("padding"));
         return result;
     }

src/main/java/au/com/royalpay/payment/manage/merchants/entity/ApsConfigData.java

@@ -0,0 +1,46 @@
+package au.com.royalpay.payment.manage.merchants.entity;
+
+
+import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor;
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.UUID;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+public class ApsConfigData implements Serializable {
+
+    private String id;
+
+    private String creator;
+
+    private Date createTime;
+
+    private String modifier;
+
+    private Date modifyTime;
+
+    private String clientId;
+
+    private Boolean enableAlipayAps;
+
+    private Boolean alipayCnSwitch;
+
+    public static ApsConfigData saveData(String managerId, String clientId, ApsConfigDescriptor apsConfigDescriptor) {
+        return new ApsConfigData()
+                .setClientId(clientId)
+                .setId(UUID.randomUUID().toString().replace("-", ""))
+                .setAlipayCnSwitch(apsConfigDescriptor.getAlipayCnSwitch())
+                .setEnableAlipayAps(apsConfigDescriptor.getEnableAlipayAps())
+                .setCreator(managerId)
+                .setCreateTime(new Date());
+    }
+}

src/main/java/au/com/royalpay/payment/manage/merchants/web/ApsConfigController.java

@@ -0,0 +1,55 @@
+package au.com.royalpay.payment.manage.merchants.web;
+
+import au.com.royalpay.payment.manage.merchants.core.ApsConfigService;
+import au.com.royalpay.payment.manage.merchants.core.descriptor.ApsConfigDescriptor;
+import au.com.royalpay.payment.manage.merchants.entity.ApsConfigData;
+import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
+import au.com.royalpay.payment.tools.CommonConsts;
+import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/sys/partners/aps")
+public class ApsConfigController {
+
+    @Resource
+    private ApsConfigService apsConfigService;
+
+    /**
+     * 获取aps配置信息
+     *
+     * @param clientId
+     * @return
+     */
+    @GetMapping("/{clientId}")
+    public ApsConfigData getApsConfigByClientId(@PathVariable("clientId") String clientId) {
+        return apsConfigService.getApsConfigByClientId(clientId);
+    }
+
+    /**
+     * 初始化aps配置
+     *
+     * @param clientId
+     * @param apsConfigDescriptor
+     * @return
+     */
+    @ManagerMapping(value = "/{clientId}", method = RequestMethod.POST, role = { ManagerRole.ADMIN,ManagerRole.OPERATOR,ManagerRole.SITE_MANAGER })
+    public ApsConfigData saveApsConfigClientId(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable("clientId") String clientId, @RequestBody ApsConfigDescriptor apsConfigDescriptor) {
+        return apsConfigService.saveApsConfigClientId(manager.getString("managerId"), clientId, apsConfigDescriptor);
+    }
+
+    /**
+     * 修改aps配置
+     *
+     * @param clientId
+     * @param apsConfig
+     * @return
+     */
+    @ManagerMapping(value = "/{clientId}", method = RequestMethod.PUT, role = { ManagerRole.ADMIN,ManagerRole.OPERATOR,ManagerRole.SITE_MANAGER })
+    public ApsConfigData updateApsConfigClientId(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager,@PathVariable("clientId") String clientId, @RequestBody JSONObject apsConfig) {
+        return apsConfigService.updateApsConfigClientId(manager.getString("managerId"),clientId, apsConfig);
+    }
+}

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ spring:
       host: 192.168.0.92:3306
       jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
       password: SuTUUxyvzS0cLETi6Rzm
-      schema-name: royalpay_payment
+      schema-name: royalpay
       username: rpaydev
     slave:
       host: 192.168.0.84:3306
@@ -13,20 +13,71 @@ spring:
       schema-name: royalpay
       username: root
     type: com.zaxxer.hikari.HikariDataSource
+#spring:
+#  datasource:
+#    master:
+#      host: office.geekforbest.com:33306
+#      jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+#      username: rpaydev_out
+#      schema-name: royalpay
+#      password: SuTUUxyvzS0cLETi6Rzm
+#    slave:
+#      host: 192.168.0.84:3306
+#      jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
+#      password: rpayplus123
+#      schema-name: royalpay
+#      username: root
+#    type: com.zaxxer.hikari.HikariDataSource
+
+
+#spring:
+#  datasource:
+#    master:
+#      host: 127.0.0.1:3306
+#      jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+#      password: dalong
+#      schema-name: royalpay_payment
+#      username: root
+#    slave:
+#      host: 127.0.0.1:3306
+#      jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+#      password: dalong
+#      schema-name: royalpay_payment
+#      username: root
+#    type: com.zaxxer.hikari.HikariDataSource
+#spring:
+#  datasource:
+#    master:
+#      host: 119.28.3.196:3310
+#      jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+#      password: read0nly
+#      schema-name: royalpay_production
+#      username: readonly
+#    slave:
+#      host: 119.28.3.196:3310
+#      jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+#      password: read0nly
+#      schema-name: royalpay_production
+#      username: readonly
+#    type: com.zaxxer.hikari.HikariDataSource
   redis:
     database: 1
-    host: 192.168.0.84
+    host: 127.0.0.1
     port: 6379
+#  redis:
+#    database: 1
+#    host: 192.168.0.84
+#    port: 6379
   mail:
     host: smtp.exmail.qq.com
     port: 465
 app:
   run-tasks: false
   host:
-    main: http://192.168.0.38:5000/
+    main: http://192.168.0.14:8888/
     regions:
-      au: http://192.168.0.38:5000/
-      cn: http://192.168.0.38:5000/
+      au: http://192.168.0.14:8888/
+      cn: http://192.168.0.14:8888/
   mail:
     appid: 1
     host: https://dev.mailsupport.hcqtech.com

src/main/resources/application-wechat.yml

@@ -1,23 +1,23 @@
 app:
   wechatpay:
-    api-host: https://apihk.mch.weixin.qq.com
+    api-host: https://api.mch.weixin.qq.com
     merchants:
       '1307485301':
         app-id: wx703febcbd34dae38
         example-sub-merchant-id: 11755174
-        key-file: classpath:apiclient_cert.p12
+        key-file: /Users/qingjiaoxuan/extra/apiclient_cert.p12
         mch-key: 7e2d8c4aab15e4cabec1207ba79086b1
         merchant-id: 1307485301
       '1431999902':
         app-id: wx703febcbd34dae38
         example-sub-merchant-id: 42991963
-        key-file: classpath:apiclient_new_cert.p12
+        key-file: /Users/qingjiaoxuan/extra/apiclient_new_cert.p12
         mch-key: p3tgzrAJbe6eQrunbv8jb8gz5yXxvJdE
         merchant-id: 1431999902
       '1487387142':
         app-id: wx3e14d1144d898197
         example-sub-merchant-id: 117551742
-        key-file: classpath:napclient_cert.p12
+        key-file: /Users/qingjiaoxuan/extra/napclient_cert.p12
         mch-key: OuvLIL93STqFhTngNaBGT8751ZJn4FKL
         merchant-id: 1487387142
         mp-id: globalpay

src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 5555
 spring:
   profiles:
-    active: dev,alipay,bestpay,jd,wechat,rpay,yeepay,rppaysvc,common
+    active: dev,alipay,bestpay,jd,wechat,rpay,yeepay,rppaysvc,common,alipayplusaps
   mail:
     host: ''
     port: ''

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="au.com.royalpay.payment.manage.mappers.system.aps.ApsConfigMapper">
+
+    <resultMap type="au.com.royalpay.payment.manage.merchants.entity.ApsConfigData" id="ApsConfigResult">
+        <result property="id" column="id"/>
+        <result property="creator" column="creator"/>
+        <result property="createTime" column="create_time"/>
+        <result property="modifier" column="modifier"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="enableAlipayAps" column="enable_alipayaps"/>
+        <result property="alipayCnSwitch" column="alipay_cn_switch"/>
+        <result property="clientId" column="client_id"/>
+    </resultMap>
+
+    <update id="updateApsConfigClientId">
+        UPDATE sys_client_aps_config SET modify_time = now(), modifier = #{modifier}
+        <if test="alipayCnSwitch !=null">, alipay_cn_switch = #{alipayCnSwitch}</if>
+        <if test="enableAlipayAps !=null">, enable_alipayaps = #{enableAlipayAps}</if>
+        WHERE client_id = #{clientId}
+    </update>
+
+</mapper>

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

@@ -108,7 +108,7 @@
                         <label class="col-sm-3 control-label">Max Order Amount</label>
                         <div class="col-sm-9">
                             <p ng-if="!ctrl.editMaxOrderAmount" class="form-control-static">
-                                {{(paymentInfo.max_order_amount|currency:'AUD ')||'Not Configure'}}
+                                {{(paymentInfo.max_order_amount | currency:'AUD ') || 'Not Configure'}}
                                 <a role="button" ng-click="ctrl.editMaxOrderAmount=true"><i class="fa fa-edit"></i></a>
                             </p>
                             <div class="input-group" ng-if="ctrl.editMaxOrderAmount">
@@ -140,7 +140,7 @@
                         <label class="col-sm-3 control-label">Customer Surcharge Rate</label>
                         <div class="col-sm-9">
                             <p ng-if="!ctrl.editCustomerSurchargeRate" class="form-control-static">
-                                {{paymentInfo.customer_surcharge_rate||'Not Configure'}}
+                                {{paymentInfo.customer_surcharge_rate || 'Not Configure'}}
                                 <a role="button" ng-click="ctrl.editCustomerSurchargeRate=true"><i
                                         class="fa fa-edit"></i></a>
                             </p>
@@ -178,7 +178,7 @@
                         <label class="col-sm-3 control-label">Order Expiry Config</label>
                         <div class="col-sm-9">
                             <p ng-if="!ctrl.editOrderExpiryConfig" class="form-control-static">
-                                {{paymentInfo.order_expiry_config||'Not Configure'}}
+                                {{paymentInfo.order_expiry_config || 'Not Configure'}}
                                 <a role="button" ng-click="ctrl.editOrderExpiryConfig=true" ng-if="'01'|withRole"><i
                                         class="fa fa-edit"></i></a>
                             </p>
@@ -257,6 +257,13 @@
                            ng-change="toggleChannel('alipayplus')">
                 </div>
             </div>
+            <div class="form-group col-sm-4">
+                <label class="col-xs-6 control-label">Alipay+(APS)</label>
+                <div class="col-xs-6">
+                    <input type="checkbox" ng-model="paymentInfo.enable_alipayaps" bs-switch
+                           ng-change="toggleChannel('alipayaps')">
+                </div>
+            </div>
         </div>
     </div>
 </div>
@@ -483,7 +490,7 @@
             <div class="form-group" ng-if="paymentInfo.enable_cb_bankpay && paymentInfo.enable_cb_bankpay_link">
                 <label class="col-sm-2 control-label">CB Bank Pay QR Code</label>
                 <div class="col-sm-10">
-                    <img ng-src="{{paymentInfo.cbBankPayQrcodeUrl}}" class="img-responsive" />
+                    <img ng-src="{{paymentInfo.cbBankPayQrcodeUrl}}" class="img-responsive"/>
                     <div>
                         &nbsp;&nbsp;<span style="padding-left: 4.2%;font-size:9px;">仅支持微信客户端扫描</span>
                     </div>
@@ -541,6 +548,23 @@
     </div>
 </div>
 
+<!--AlipayCN支付渠道切换-->
+<div class="panel panel-default" ng-if="(('111'|withRole))">
+    <div class="panel-heading">AlipayCN channel replace</div>
+    <div class="panel-body">
+        <div class="form-horizontal">
+            <div class="form-group col-sm-4">
+                <label class="col-xs-6 control-label">AlipayCN channel</label>
+                <div class="col-xs-6">
+                    <input type="checkbox" ng-model="paymentInfo.alipay_cn_switch" bs-switch switch-on-text="APS"
+                           switch-off-text="Alipay"
+                           ng-change="switchAlipayCn(paymentInfo.client_id,paymentInfo.aps_config_id,paymentInfo.alipay_cn_switch)">
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class="panel panel-default" ng-if="('111'|withRole) || ('retail_surcharge'|withFunc)">
     <div class="panel-heading">Retail In Store Payment(App, WePayLite, Albert)</div>
     <div class="panel-body">
@@ -565,7 +589,7 @@
 </div>
 
 <div class="panel panel-default">
-    <div class="panel-heading">Refund </div>
+    <div class="panel-heading">Refund</div>
     <div class="panel-body">
         <div class="form-horizontal">
             <div class="form-group" ng-if="'1000000000111'|withRole">
@@ -589,7 +613,7 @@
                 <label class="col-sm-2 control-label">Refund Credit Line</label>
                 <div class="col-sm-9">
                     <p ng-if="!ctrl.editRefundCreditLine" class="form-control-static">
-                        {{paymentInfo.refund_credit_line||'Not Configure'}}
+                        {{paymentInfo.refund_credit_line || 'Not Configure'}}
                         <a role="button" ng-click="ctrl.editRefundCreditLine=true" ng-if="'01'|withRole"><i
                                 class="fa fa-edit"></i></a>
                     </p>
@@ -714,7 +738,7 @@
                         <option value="v4">v4</option>
                         <option value="v5">v5</option>
                         <option value="v6">v6</option>
-<!--                        <option value="v2101">multiple payment methods</option>-->
+                        <!--                        <option value="v2101">multiple payment methods</option>-->
                     </select>
                 </div>
                 <div class="col-sm-12">