From 0c37b5139c82a4b4ae7adf1b88b82e7617573798 Mon Sep 17 00:00:00 2001
From: PeiYY <youpei.yin@royalpay.com.au>
Date: Fri, 23 Oct 2020 17:13:21 +0800
Subject: [PATCH] =?UTF-8?q?upgrade=20=E5=AE=98=E7=BD=91=E5=8D=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98/=E8=B4=B7=E6=AC=BE=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../descriptor/LoanApplicationDescriptor.java | 10 +++
 .../domain/entity/LoanApplication.java        | 11 ++-
 .../service/PartnerApplyServiceImpl.java      |  2 +
 .../loanapplication/LoanApplicationMapper.xml |  7 ++
 .../static/payment/partner/partner-apply.js   | 82 ++++++++++++++++-
 .../templates/partner_application.html        |  4 +-
 .../templates/partner_loans_application.html  | 90 +++++++++++++++++++
 .../partner_loans_application_edit.html       | 33 +++++++
 .../partner/templates/partners_apply.html     |  6 +-
 9 files changed, 234 insertions(+), 11 deletions(-)
 create mode 100644 src/main/ui/static/payment/partner/templates/partner_loans_application.html
 create mode 100644 src/main/ui/static/payment/partner/templates/partner_loans_application_edit.html

diff --git a/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/descriptor/LoanApplicationDescriptor.java b/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/descriptor/LoanApplicationDescriptor.java
index 543ba9454..f1c072c6f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/descriptor/LoanApplicationDescriptor.java
+++ b/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/descriptor/LoanApplicationDescriptor.java
@@ -37,8 +37,18 @@ public class LoanApplicationDescriptor {
      */
     private String status;
 
+    /**
+     * 处理状态值
+     */
+    private String statusDescription;
+
     /**
      * 备注信息
      */
     private String remark;
+
+    /**
+     * 申请来源
+     */
+    private Integer source;
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/entity/LoanApplication.java b/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/entity/LoanApplication.java
index 4ad6d9099..b9117657f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/entity/LoanApplication.java
+++ b/src/main/java/au/com/royalpay/payment/manage/loanapplicaiton/domain/entity/LoanApplication.java
@@ -60,6 +60,11 @@ public class LoanApplication {
      */
     private String remark;
 
+    /**
+     * 申请来源
+     */
+    private Integer source;
+
     public LoanApplicationDescriptor describe() {
         return new LoanApplicationDescriptor()
                 .setId(this.id)
@@ -70,7 +75,9 @@ public class LoanApplication {
                 .setEmail(this.email)
                 .setBusinessName(this.businessName)
                 .setIndustry(this.industry)
-                .setStatus(this.status.description())
-                .setRemark(this.remark);
+                .setStatus(this.status.value())
+                .setStatusDescription(this.status.description())
+                .setRemark(this.remark)
+                .setSource(this.source);
     }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/officialwebsit/infrastructure/service/PartnerApplyServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/officialwebsit/infrastructure/service/PartnerApplyServiceImpl.java
index 62e0742e3..534129e57 100644
--- a/src/main/java/au/com/royalpay/payment/manage/officialwebsit/infrastructure/service/PartnerApplyServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/officialwebsit/infrastructure/service/PartnerApplyServiceImpl.java
@@ -60,6 +60,7 @@ public class PartnerApplyServiceImpl implements PartnerApplyService, Application
         result.put("industry", apply.getIndustry());
         result.put("business_name", apply.getBusinessName());
         result.put("status", LoanApplicationStatus.READY.code());
+        result.put("source", 0);
         return result;
     }
 
@@ -71,6 +72,7 @@ public class PartnerApplyServiceImpl implements PartnerApplyService, Application
         result.put("contact_phone", apply.getPhoneNumber());
         result.put("contact_email", apply.getEmailAddress());
         result.put("company_name", apply.getBusinessName());
+        result.put("short_name", apply.getBusinessName());
         result.put("industry", apply.getIndustry());
         result.put("type", 1);
         return result;
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/loanapplication/LoanApplicationMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/loanapplication/LoanApplicationMapper.xml
index e01308a94..e00f94c5e 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/loanapplication/LoanApplicationMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/loanapplication/LoanApplicationMapper.xml
@@ -16,12 +16,19 @@
         <result column="business_name" property="businessName"/>
         <result column="industry" property="industry"/>
         <result column="remark" property="remark"/>
+        <result column="source" property="source"/>
         <result column="status" property="status" typeHandler="org.apache.ibatis.type.EnumOrdinalTypeHandler"/>
     </resultMap>
 
     <select id="listPagedLoanApplication"
             resultMap="loanApplicationMap">
         SELECT * FROM sys_clients_loans_apply scla
+        <where>
+            <if test="businessName!=null">
+                <bind name="business_name_pattern" value="'%'+businessName+'%'"/>
+                and scla.business_name like #{business_name_pattern}
+            </if>
+        </where>
         ORDER BY scla.create_time DESC
     </select>
     <select id="findById"
diff --git a/src/main/ui/static/payment/partner/partner-apply.js b/src/main/ui/static/payment/partner/partner-apply.js
index cc1e1c034..31fc03ec5 100644
--- a/src/main/ui/static/payment/partner/partner-apply.js
+++ b/src/main/ui/static/payment/partner/partner-apply.js
@@ -19,15 +19,28 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
                     return $http.get('/partners/application/' + $stateParams.client_apply_id);
                 }]
             }
+        }).state('partner_apply.loans_application', {
+            url: '/loans/application',
+            templateUrl: '/static/payment/partner/templates/partner_loans_application.html',
+            controller: 'partnerLoansApplicationListCtrl'
+        }).state('partner_apply.loans_application_detail', {
+            url: '/loans/application/{id}',
+            templateUrl: '/static/payment/partner/templates/partner_loans_application_detail.html',
+            controller: 'partnerLoansApplicationDetailCtrl',
+            resolve: {
+                partner: ['$http', '$stateParams', function ($http, $stateParams) {
+                    return $http.get('/partners/loanApplications/' + $stateParams.id);
+                }]
+            }
         })
     }]);
-    app.controller('partnerApplyCtrl', ['$rootScope','$state', function ($rootScope,$state) {
-        if ($state.is('partner_apply')){
+    app.controller('partnerApplyCtrl', ['$rootScope', '$state', function ($rootScope, $state) {
+        if ($state.is('partner_apply')) {
             $state.go('.partner_application');
         }
     }]);
-    app.controller('partnerApplicationListCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', 'industryMap', 'stateMap','countryMap',
-        function ($scope, $state, $http, $uibModal, commonDialog, industryMap, stateMap,countryMap) {
+    app.controller('partnerApplicationListCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', 'industryMap', 'stateMap', 'countryMap',
+        function ($scope, $state, $http, $uibModal, commonDialog, industryMap, stateMap, countryMap) {
             $scope.pagination = {};
             $scope.industries = industryMap.configs()
             $scope.states = stateMap.configs();
@@ -206,6 +219,67 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
 
     }]);
 
+    app.controller('partnerLoansApplicationListCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', 'industryMap', 'stateMap', 'countryMap',
+        function ($scope, $state, $http, $uibModal, commonDialog, industryMap, stateMap, countryMap) {
+            $scope.pagination = {};
+            $scope.industries = industryMap.configs()
+            $scope.states = stateMap.configs();
+            $scope.countries = countryMap.configs();
+            $scope.params = {};
+
+            $scope.loadPartners = function (page) {
+                var params = angular.copy($scope.params);
+                params.page = page || $scope.pagination.page || 1;
+                $http.get('/partners/loanApplications', {params: params}).then(function (resp) {
+                    $scope.partners = resp.data.data;
+                    $scope.pagination = resp.data.pagination;
+                });
+            };
+            $scope.loadPartners(1);
+
+            $scope.handleButton = function (obj) {
+                var partner = angular.copy(obj);
+                partner.link = true;
+                $uibModal.open({
+                    templateUrl: '/static/payment/partner/templates/partner_loans_application_edit.html',
+                    controller: 'partnerApplicationEditCtrl',
+                    resolve: {
+                        partner: partner
+                    }
+                }).result.then(function () {
+                    commonDialog.alert({title: 'Success', content: '修改成功！', type: 'success'});
+                    $state.reload();
+                    // $state.go('partner_application.detail', {client_apply_id: obj.client_apply_id}, {reload: true});
+                })
+            };
+
+
+        }]);
+
+
+    app.controller('partnerApplicationEditCtrl', ['$scope', '$http', '$state', 'partner', function ($scope, $http, $state, partner) {
+        $scope.partner = angular.copy(partner);
+        $scope.submit = function (form) {
+            if (form.$invalid) {
+                angular.forEach(form, function (item, key) {
+                    if (key.indexOf('$') <= 0) {
+                        item.$dirty = true;
+                    }
+                });
+                return;
+            }
+
+            $scope.errmsg = null;
+            $http.put('/partners/loanApplications/' + partner.id, $scope.partner).then(function (resp) {
+                $scope.$close();
+
+            }, function (resp) {
+                $scope.errmsg = resp.data.message;
+            });
+        };
+
+    }]);
+
     app.filter('cut', function () {
         return function (value, wordwise, max, tail) {
             if (!value) return '';
diff --git a/src/main/ui/static/payment/partner/templates/partner_application.html b/src/main/ui/static/payment/partner/templates/partner_application.html
index 63ac128bd..2de6c8ed1 100644
--- a/src/main/ui/static/payment/partner/templates/partner_application.html
+++ b/src/main/ui/static/payment/partner/templates/partner_application.html
@@ -53,7 +53,7 @@
                                 <!--<td ng-bind="partner.industry"></td>-->
                                 <td ng-bind="partner.suburb"></td>
                                 <td>
-                                    <span ng-if="partner.source==0">PC</span>
+                                    <span ng-if="partner.source==0">PC<span ng-if="partner.type==1">(卡支付)</span></span>
                                     <span ng-if="partner.source==1">公众号菜单</span>
                                     <span ng-if="partner.source==2">公众号推送</span>
                                     <span ng-if="partner.source==3">小程序申请</span>
@@ -108,4 +108,4 @@
         </div>
     </div>
 </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/main/ui/static/payment/partner/templates/partner_loans_application.html b/src/main/ui/static/payment/partner/templates/partner_loans_application.html
new file mode 100644
index 000000000..6ca3238fc
--- /dev/null
+++ b/src/main/ui/static/payment/partner/templates/partner_loans_application.html
@@ -0,0 +1,90 @@
+<div class="content">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="box-solid">
+                <div class="box box-warning">
+                    <div class="box-header">
+                        <div class="form-inline">
+                            <div class="form-group">
+                                <label class="control-label" for="short-name-search">Company Name</label>
+                                <input type="text" class="form-control" id="short-name-search"
+                                       ng-model="params.businessName">
+                            </div>
+                            <div class="form-group">
+                                <button class="btn btn-primary" type="button" ng-click="loadPartners(1)"><i
+                                        class="fa fa-search"></i></button>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="box">
+                    <div class="box-header">
+                        <h3 class="box-title">Application List</h3>
+                    </div>
+
+                    <div class="box-body no-padding table-responsive">
+                        <table class="table table-striped">
+                            <thead>
+                            <tr>
+
+                                <th>Application Time</th>
+                                <th>Company Name</th>
+                                <th>Source</th>
+                                <th>Approve Status</th>
+                                <th>Remark</th>
+                                <th>Operation</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr ng-repeat="partner in partners">
+                                <td ng-bind="partner.createTime"></td>
+                                <td ng-bind="partner.businessName"></td>
+                                <td>
+                                    <span ng-if="partner.source==0">PC</span>
+                                    <span ng-if="partner.source==1">公众号菜单</span>
+                                    <span ng-if="partner.source==2">公众号推送</span>
+                                    <span ng-if="partner.source==3">小程序申请</span>
+                                    <span ng-if="partner.source==4">App申请</span>
+                                </td>
+                                <td>
+                                    <span>{{partner.statusDescription}}</span>
+                                </td>
+                                <td ng-bind="partner.remark|limitTo:10" title="{{partner.remark}}"></td>
+                                <td>
+                                    <a class="text-primary" role="button" ng-click="handleButton(partner)">
+                                        <i class="fa fa-cog"></i> handle
+                                    </a>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+
+                    </div>
+                    <div class="box-footer" ng-if="partners.length">
+                        <uib-pagination class="pagination"
+                                        total-items="pagination.totalCount"
+                                        boundary-links="true"
+                                        ng-model="pagination.page"
+                                        items-per-page="pagination.limit"
+                                        max-size="10"
+                                        ng-change="loadPartners()"
+                                        previous-text="&lsaquo;"
+                                        next-text="&rsaquo;"
+                                        first-text="&laquo;"
+                                        last-text="&raquo;"></uib-pagination>
+                        <div class="row">
+                            <div class="col-xs-12">Total Records:{{pagination.totalCount}};Total
+                                Pages:{{pagination.totalPages}}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+
+            </div>
+
+        </div>
+    </div>
+</div>
+</div>
diff --git a/src/main/ui/static/payment/partner/templates/partner_loans_application_edit.html b/src/main/ui/static/payment/partner/templates/partner_loans_application_edit.html
new file mode 100644
index 000000000..8185fe753
--- /dev/null
+++ b/src/main/ui/static/payment/partner/templates/partner_loans_application_edit.html
@@ -0,0 +1,33 @@
+<div class="modal-body">
+    <div class="row">
+        <div class="col-sm-12">
+            <form name="partnerForm" novalidate>
+                <div class="form-group" style="display:flex;margin-top: 26px;">
+                    <label class="control-label col-xs-4 col-sm-3">Status</label>
+                    <div class="col-xs-8">
+                        <select class="form-control" ng-model="partner.status">
+                            <option value="READY">READY</option>
+                            <option value="PROCESSING">PROCESSING</option>
+                            <option value="COMPLETED">COMPLETED</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="form-group" style="display:flex;">
+                    <label class="control-label col-sm-3" for="short-id-input">Remark</label>
+                    <div class="col-sm-9">
+                        <input class="form-control" ng-model="partner.remark"
+                               type="text"
+                               id="short-id-input">
+                    </div>
+                </div>
+            </form>
+        </div>
+        <div class="col-sm-12">
+            <div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
+        </div>
+    </div>
+</div>
+<div class="modal-footer">
+    <button type="button" class="btn btn-danger" ng-click="$dismiss()">Cancel</button>
+    <button type="button" class="btn btn-success" ng-click="submit(partnerForm)">Submit</button>
+</div>
diff --git a/src/main/ui/static/payment/partner/templates/partners_apply.html b/src/main/ui/static/payment/partner/templates/partners_apply.html
index e05375a16..49839bc6c 100644
--- a/src/main/ui/static/payment/partner/templates/partners_apply.html
+++ b/src/main/ui/static/payment/partner/templates/partners_apply.html
@@ -19,9 +19,9 @@
                     <li ui-sref-active="active" ng-if="'simpleApplyApp'|withModule">
                         <a ui-sref="partner_apply.simple_application"> <span>Application & Open</span></a>
                     </li>
-                    <!--<li ui-sref-active-eq="active" ng-if="'citypartner'|withModule">
-                        <a ui-sref="partner_apply.citypartner_reg"><i class="fa fa-tv"></i> <span>City Partners</span></a>
-                    </li>-->
+                    <li ui-sref-active-eq="active" ng-if="'simpleApplyApp'|withModule">
+                        <a ui-sref="partner_apply.loans_application"><span>Loans Application</span></a>
+                    </li>
                 </ul>
             </div>
         </div>