From e997842879dc256c67d3695065c86f87bb6931d2 Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Tue, 19 Nov 2019 17:21:16 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E4=BF=AE=E5=BE=A9RService=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=88=B7=E6=96=B0=E4=B8=A2=E5=A4=B1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/ClientIncrementalMapper.java       |  1 +
 .../manage/merchants/core/ClientManager.java  |  7 ++++++
 .../core/impls/ClientManagerImpl.java         | 15 +++++++++++-
 .../merchants/web/PartnerViewController.java  | 12 ++++++++++
 .../partner-incremental-service.js            | 23 ++++++++++---------
 .../partner_incremental_service.html          |  6 ++---
 6 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java
index 8ba1c6a5f..c66c1003a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java
@@ -7,6 +7,7 @@ import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index d8149786a..74a2c790a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -499,4 +499,11 @@ public interface ClientManager {
      * @param incrementalService
      */
     void changeSwitchIncrementalService(String clientMoniker, JSONObject incrementalService,JSONObject manager);
+
+    /**
+     * 获取商户增值服务详情
+     * @param clientMoniker
+     * @return
+     */
+    JSONObject partnerIncrementalServiceInfo(String clientMoniker, String incrementalId);
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 0ea6b9324..542599c1e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -17,6 +17,7 @@ import au.com.royalpay.payment.core.PaymentChannelApi;
 import au.com.royalpay.payment.core.exceptions.EmailException;
 import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
 import au.com.royalpay.payment.core.mappers.SysClientMapper;
+import au.com.royalpay.payment.tools.defines.IncrementalChannel;
 import au.com.royalpay.payment.core.utils.OrderExpiryRuleResolver;
 import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper;
 import au.com.royalpay.payment.manage.appclient.beans.AppClientBean;
@@ -52,7 +53,6 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
 import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage;
 import au.com.royalpay.payment.tools.connections.mpsupport.exceptions.WechatException;
-import au.com.royalpay.payment.tools.defines.IncrementalChannel;
 import au.com.royalpay.payment.tools.env.PlatformEnvironment;
 import au.com.royalpay.payment.tools.env.SysConfigManager;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
@@ -5926,6 +5926,18 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }};
     }
 
+    public JSONObject partnerIncrementalServiceInfo(String clientMoniker,String channel){
+        JSONObject client = clientMapper.findClientByMoniker(clientMoniker);
+        if (client == null) {
+            throw new InvalidShortIdException();
+        }
+        JSONObject incrementalInfo = clientIncrementalMapper.findByClinetIdAndChannel(client.getInteger("client_id"), channel);
+        if(incrementalInfo==null){
+            throw new BadRequestException("Merchant service not opened");
+        }
+        return incrementalInfo;
+    }
+
     public void changePartnerIncrementalService(String clientMoniker, JSONObject incrementalService, JSONObject manager) {
         JSONObject client = clientMapper.findClientByMoniker(clientMoniker);
         if (client == null) {
@@ -5972,4 +5984,5 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         existIncrementalService.put("operator", manager.getString("display_name"));
         clientIncrementalMapper.update(existIncrementalService);
     }
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
index 7d3458318..263f41335 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
@@ -620,4 +620,16 @@ public class PartnerViewController {
         return  clientManager.partnerIncrementalService(clientMoniker);
     }
 
+    /**
+     * 获取商户增值服务详情
+     * @param clientMoniker
+     * @param channel
+     * @return
+     */
+    @PartnerMapping(value = "/{clientMoniker}/incremental_service/{channel}/info", method = RequestMethod.GET, roles = {PartnerRole.ADMIN, PartnerRole.MANAGER})
+    @ResponseBody
+    public JSONObject getClientIncrementalServiceInfo(@PathVariable("clientMoniker") String clientMoniker, @PathVariable("channel") String channel){
+        return  clientManager.partnerIncrementalServiceInfo(clientMoniker,channel);
+    }
+
 }
diff --git a/src/main/ui/static/incrementalService/partner-incremental-service.js b/src/main/ui/static/incrementalService/partner-incremental-service.js
index 529c7799b..b3c4b5c37 100644
--- a/src/main/ui/static/incrementalService/partner-incremental-service.js
+++ b/src/main/ui/static/incrementalService/partner-incremental-service.js
@@ -12,12 +12,13 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                 }]
             }
         }).state('partnerIncrementalServiceInfo', {
-            url: '/partner_incremental_service_info',
+            url: '/partner_incremental_service_info?:channel',
             templateUrl: '/static/incrementalService/templates/partner_incremental_service_info.html',
             controller: 'partnerIncrementalServiceInfoCtrl',
-            params:{
-                service:null,
-                partner:null
+            resolve:{
+                partner:['$http',function($http){
+                    return $http.get('/client/partner_info');
+                }]
             }
         });
     }]);
@@ -26,7 +27,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
             $scope.serviceAll = [];
             $scope.channelOptions = [];
             $scope.windowHeight = document.body.clientWidth;
-            $scope.clientInfo = angular.copy(partner.data);
+            $scope.clientInfo = partner.data
             $scope.initDate = function(){
                 $http.get("/client/partner_info/"+$scope.clientInfo.client_moniker+"/incremental_service").then(function (res) {
                     $scope.serviceAll = res.data.all_service;
@@ -35,18 +36,18 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                     })
                     $scope.channelOptions = res.data.incremental_channel;
                 })
+
             }
             $scope.initDate();
-            $scope.queryServiceInfo = function(service){
-                $state.go('partnerIncrementalServiceInfo', {service: service,partner:$scope.clientInfo});
-            }
     }]);
 
-    app.controller('partnerIncrementalServiceInfoCtrl',['$scope', '$http', '$state','$stateParams','$filter', '$timeout', 'partnerRefunder', 'orderService', 'commonDialog',
-        function($scope,$http,$state,$stateParams,$filter, $timeout, partnerRefunder, orderService, commonDialog){
+    app.controller('partnerIncrementalServiceInfoCtrl',['$scope', '$http', '$state','$stateParams','$filter', '$timeout', 'partnerRefunder', 'orderService', 'commonDialog','partner',
+        function($scope,$http,$state,$stateParams,$filter, $timeout, partnerRefunder, orderService, commonDialog,partner){
         $scope.serviceInfo = {}
         $scope.initDate = function () {
-            $scope.serviceInfo =  angular.copy($stateParams.service)
+             $http.get("/client/partner_info/"+partner.data.client_moniker+"/incremental_service/"+$stateParams.channel+"/info").then(function(res){
+                 $scope.serviceInfo =res.data
+             })
         }
         $scope.initDate();
         $scope.params = {source: $scope.serviceInfo.channel,status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()};
diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html
index f349e520a..37bb08869 100644
--- a/src/main/ui/static/incrementalService/templates/partner_incremental_service.html
+++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service.html
@@ -115,10 +115,10 @@
                                     </div>
                                 </div>
                                 <div class="row border-show" style="background-color: #F06101;margin: -5px 0px -1px 0px; border-radius: 2px 1px 8px 8px; width: 100%;margin-left: 0px" >
-                                    <div class="col-md-12 col-sm-12 col-xs-12 service-info-button"
-                                         title="点击查看交易详情" ng-click="queryServiceInfo(service)">
+                                    <a class="col-md-12 col-sm-12 col-xs-12 service-info-button"
+                                         title="点击查看交易详情" ui-sref="partnerIncrementalServiceInfo({channel:service.channel})">
                                        查看详情
-                                    </div>
+                                    </a>
                                 </div>
                             </div>
                         </div>