upgrade complete shopify OAuth

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

@@ -396,7 +396,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     }
 
     @Override
-    @Cacheable(value = ":app_client_info_moniker:", key = "#clientMoniker")
+    @Cacheable(value = ":app_client_info_moniker:", key = "#clientMoniker",unless="#result == null")
     public JSONObject getClientInfoByMoniker(String clientMoniker) {
         return clientMapper.findClientByMonikerAll(clientMoniker);
     }

src/main/java/au/com/royalpay/payment/manage/shopify/store/domain/application/ShopifyStoreApplication.java

@@ -30,13 +30,13 @@ public class ShopifyStoreApplication {
     private ShopifyMerchantAuthApplication shopifyMerchantAuthApplication;
 
     /**
-     * 检查loginId的商户是否存在
+     * 检查partnerCode的商户是否存在
      *
-     * @param loginId 商户用户标识
+     * @param partnerCode 商户用户标识
      * @return
      */
-    public Boolean existMerchant(String loginId) {
+    public Boolean existMerchant(String partnerCode) {
-        return merchantservice.existMerchant(loginId);
+        return merchantservice.existMerchant(partnerCode);
     }
 
     /**

src/main/java/au/com/royalpay/payment/manage/shopify/store/domain/service/MerchantService.java

@@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.shopify.store.domain.service;
 import au.com.royalpay.payment.manage.management.sysconfig.core.impls.PermissionPartnerManagerImpl;
 import au.com.royalpay.payment.manage.mappers.shopify.MerchantMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
+import au.com.royalpay.payment.manage.merchants.core.ClientManager;
 import au.com.royalpay.payment.manage.shopify.store.domain.context.MerchantCreateContext;
 import au.com.royalpay.payment.manage.shopify.store.domain.entity.MerchantRequest;
 import au.com.royalpay.payment.manage.shopify.store.domain.entity.SimpleMerchant;
@@ -25,9 +26,12 @@ public class MerchantService {
     @Autowired
     private PermissionPartnerManagerImpl permissionPartnerManager;
 
-    public Boolean existMerchant(String loginId) {
+    @Autowired
-        JSONObject account = clientAccountMapper.findByUsername(loginId);
+    private ClientManager clientManager;
-        if (account == null) {
+
+    public Boolean existMerchant(String partnerCode) {
+        JSONObject clientInfo = clientManager.getClientInfoByMoniker(partnerCode);
+        if (clientInfo == null) {
             return false;
         }
         return true;

src/main/java/au/com/royalpay/payment/manage/shopify/store/web/ShopifyStoreController.java

@@ -21,11 +21,11 @@ public class ShopifyStoreController {
     /**
      * 检查loginId的商户是否存在
      *
-     * @param loginId 商户用户标识
+     * @param partnerCode 商户标识
      */
     @GetMapping("/exist")
-    public Boolean validPaymentAppMerchant(@RequestParam("loginId") String loginId) {
+    public Boolean validPaymentAppMerchant(@RequestParam("partnerCode") String partnerCode) {
-        return shopifyStoreApplication.existMerchant(loginId);
+        return shopifyStoreApplication.existMerchant(partnerCode);
     }
 
     /**

src/main/ui/static/shopify/auth/shopify.auth.js

@@ -32,16 +32,16 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
         module.controller('ShopifyAuthController', ['$scope', '$http', '$state', function ($scope, $http, $state) {
             var that = $scope;
             that.store = {
-                loginId: ''
+                partnerCode: ''
             }
             that.authDisable = false
             that.validStoreLoginId = function () {
                 that.authDisable = true
                 $http.get("/shopify/store/exist", {params: that.store}).then(function (res) {
                     if (res.data) {
-                        $state.go('shopify.login', {userId: that.store.loginId});
+                        $state.go('shopify.login', {partnerCode: that.store.partnerCode});
                     } else {
-                        $state.go('shopify.register', {userId: that.store.loginId});
+                        $state.go('shopify.register', {partnerCode: that.store.partnerCode});
                     }
                 },function (error) {
                     that.resError = error.data.message;
@@ -54,7 +54,8 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
             var that = $scope;
             that.model = {
                 shop: '',
-                loginId: $stateParams.userId,
+                partnerCode: $stateParams.partnerCode,
+                loginId: '',
                 password: ''
             }
             that.loginDisable = false
@@ -182,7 +183,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
             that.states = angular.copy(stateMap);
             that.industries = angular.copy(industryMap);
             that.partner = {
-                loginId: $stateParams.userId
+                partnerCode: $stateParams.partnerCode
             };
             that.registerDisable = false
             that.saveForm = function (form) {

src/main/ui/static/shopify/auth/templates/shopify_auth.html

@@ -30,7 +30,7 @@
                 <div class="m-t-40"></div>
                 <form>
                     <div class="form-group form-group-lg">
-                        <input class="form-control input-lg" id="exampleInputEmail" placeholder="Login ID" ng-model="store.loginId">
+                        <input class="form-control input-lg" id="exampleInputEmail" placeholder="Partner Code" ng-model="store.partnerCode">
                     </div>
                     <button class="btn btn-warning btn-lg btn-block" ng-disabled="authDisable" ng-click="validStoreLoginId()">Next</button>
                 </form>