From 7f3644467e982aa66cab930660b061623a75bb55 Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Mon, 11 Oct 2021 15:19:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?partner=5Fdashboard=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B8=85=E7=AE=97=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/payment/TransactionMapper.java    |  2 +
 .../core/impls/TradeLogServiceImpl.java       |  2 +-
 .../mappers/payment/TransactionMapper.xml     | 44 +++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
index 828a5ca80..4278ea9bc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
@@ -60,6 +60,8 @@ public interface TransactionMapper {
 
     PageList<JSONObject> listSettlementLog(JSONObject params, PageBounds pagination);
 
+    PageList<JSONObject> listSettlementLogForDashbord(JSONObject params, PageBounds pagination);
+
     @CountRef(".countSettlementLogInClients")
     PageList<JSONObject> listSettlementLogInClients(JSONObject params, PageBounds pagination);
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
index 0ec3dff0f..46ffd3ea3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@@ -1423,7 +1423,7 @@ public class TradeLogServiceImpl implements TradeLogService {
             params.remove("client_ids");
             params.put("merge_settle", true);
         }
-        PageList<JSONObject> logs = transactionMapper.listSettlementLog(params,
+        PageList<JSONObject> logs = transactionMapper.listSettlementLogForDashbord(params,
                 new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc")));
         logs.forEach(log -> log.put("padding", log.getBooleanValue("editable")));
         result.putAll(PageListUtils.buildPageListResult(logs));
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index 4865a7dfa..5d679c115 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -600,6 +600,50 @@
         order by t.clearing_time desc
     </select>
 
+    <select id="listSettlementLogForDashbord" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT cd.client_id,cd.report_date clearing_time,
+        cd.report_date,
+        <if test="merge_settle!=null">
+            SUM(cd.tax_amount)  as tax_amount,
+            SUM(cd.total_charge) as total_charge,
+            1 as merge_settle,
+            SUM(cd.gross_amount) total,
+            SUM(cd.clearing_amount) income,
+            SUM(cd.gross_amount-cd.clearing_amount) fee,
+        </if>
+        <if test="merge_settle==null">
+            cd.tax_amount,
+            cd.total_charge,
+            cd.gross_amount total,
+            cd.clearing_amount income,
+            cd.gross_amount-cd.clearing_amount fee,
+        </if>
+
+        (SELECT min(r.rate_value) FROM  sys_client_rates r WHERE r.client_id = cd.client_id
+        AND date(r.expiry_time) >= DATE(cd.report_date)
+        AND date(r.active_time) &lt;= DATE(cd.report_date)) rate,
+        cd.clear_detail_id,
+        lc.balance_group, lc.editable
+        FROM log_clearing_detail cd
+        left join log_clearing lc on cd.clearing_id = lc.clearing_id
+        left join sys_clients sc on cd.client_id = sc.client_id
+        WHERE
+
+        <if test="client_ids!=null">
+            cd.client_id IN
+            <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                #{client_id}
+            </foreach>
+        </if>
+        <if test="client_ids==null and client_id !=null">
+             (sc.client_id=#{client_id} or sc.parent_client_id =#{client_id})
+        </if>
+        <if test="from!=null">and cd.report_date &gt;= #{from}</if>
+        <if test="to!=null">and cd.report_date &lt; #{to}</if>
+        <if test="merge_settle!=null">GROUP BY report_date</if>
+        order by cd.report_date desc
+    </select>
+
     <select id="listSettlementLogTotal" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT DATE(t.transaction_time) clearing_time,date_format(t.transaction_time, '%Y-%m-%d') clear_time,SUM(t.clearing_amount) total,

From 51d8e1eb363b1a0e3932ff10572adc7578a9f56a Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Tue, 12 Oct 2021 18:09:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?mcc=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/ClientManagerImpl.java         |   2 +-
 .../static/commons/services/wechatGoodMcc.js  | 507 +++++++++++-------
 .../ui/static/payment/partner/add-partner.js  |   2 +-
 .../static/payment/partner/partner-manage.js  |   2 +-
 4 files changed, 324 insertions(+), 189 deletions(-)

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 209f609dc..699e40147 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
@@ -546,7 +546,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
         JSONObject wechatMcc = paymentChannelMccGoodMapper.findWechatPayMccByClientId(client.getIntValue("client_id"));
         if (wechatMcc != null) {
-            client.put("mc_code", wechatMcc.getIntValue("mc_code"));
+            client.put("mc_code", wechatMcc.getString("mc_code"));
         }
         client.put("enable_alipayplus", false);
         MerchantChannelPermissionResolver resolver = this.paymentApi.channelApi(PayChannel.ALIPAY_PLUS.getChannelCode()).getChannelPermissionResolver();
diff --git a/src/main/ui/static/commons/services/wechatGoodMcc.js b/src/main/ui/static/commons/services/wechatGoodMcc.js
index 71fedb5a1..d32cbd8fe 100644
--- a/src/main/ui/static/commons/services/wechatGoodMcc.js
+++ b/src/main/ui/static/commons/services/wechatGoodMcc.js
@@ -574,927 +574,1062 @@ define(["../app"], function (app) {
     var wechatGoodMcc = [
         {
             "label": "Veterinary services",
-            "value": 742
+            "value": "0742"
         }
         ,
         {
             "label": "Landscaping and horticultural services",
-            "value": 780
+            "value": "0780"
         }
         ,
         {
             "label": "Special trade contractors — not elsewhere classified ",
-            "value": 1799
+            "value": "1799"
         }
         ,
         {
             "label": "Miscellaneous publishing and printing services",
-            "value": 2741
+            "value": "2741"
         }
         ,
         {
             "label": "Typesetting, platemaking and related services",
-            "value": 2791
+            "value": "2791"
         }
         ,
         {
             "label": "Local and suburban commuter passenger transportation, including ferries",
-            "value": 4111
+            "value": "4111"
         }
         ,
         {
             "label": "Passenger railways",
-            "value": 4112
+            "value": "4112"
         }
         ,
         {
             "label": "Ambulance services",
-            "value": 4119
+            "value": "4119"
         }
         ,
         {
             "label": "Taxi-cabs and limousines",
-            "value": 4121
+            "value": "4121"
         }
         ,
         {
             "label": "Bus lines",
-            "value": 4131
+            "value": "4131"
         }
         ,
         {
             "label": "Motor freight carriers and trucking — local and long distance, moving and storage companies and local delivery",
-            "value": 4214
+            "value": "4214"
         }
         ,
         {
             "label": "Courier services — air and ground and freight forwarders",
-            "value": 4215
+            "value": "4215"
         }
         ,
         {
             "label": "Steamships and cruise lines",
-            "value": 4411
+            "value": "4411"
         }
         ,
         {
             "label": "Boat rentals and leasing ",
-            "value": 4457
+            "value": "4457"
         }
         ,
         {
             "label": "Marinas, marine service and supplies",
-            "value": 4468
+            "value": "4468"
         }
         ,
         {
             "label": "Airlines and air carriers",
-            "value": 4511
+            "value": "4511"
+        }
+        ,
+        {
+            "label": "Airports, flying fields and airport terminals",
+            "value":"4582"
         }
         ,
         {
             "label": "Travel agencies and tour operators",
-            "value":4722
+            "value":"4722"
+        }
+        ,
+        {
+            "label": "Ticketing",
+            "value":"4733"
         }
         ,
         {
             "label": "Tolls and bridge fees",
-            "value":4784
+            "value":"4784"
         }
         ,
         {
             "label": "Transportation services — not elsewhere classified",
-            "value": 4789
+            "value": "4789"
         }
         ,
         {
             "label": "Telecommunication equipment and telephone sales",
-            "value":4812
+            "value":"4812"
         }
         ,
         {
             "label": "Telecommunication services, including local and long distance calls, credit card calls, calls through use of magnetic stripe reading tele-phones and faxes",
-            "value":4814
+            "value":"4814"
         }
         ,
         {
             "label": "Monthly summary telephone charges",
-            "value":4815
+            "value":"4815"
         }
         ,
         {
             "label": "Computer network/information services",
-            "value":4816
+            "value":"4816"
         }
         ,
         {
             "label": "Telegraph services",
-            "value":4821
+            "value":"4821"
         }
         ,
         {
             "label": "Cable and other pay television services",
-            "value": 4899
+            "value": "4899"
         }
         ,
         {
             "label": "Utilities — electric, gas, water and sanitary",
-            "value": 4900
+            "value": "4900"
         }
         ,
         {
             "label": "Office and commercial furniture",
-            "value": 5021
+            "value": "5021"
         }
         ,
         {
             "label": "Construction materials — not elsewhere classified",
-            "value": 5039
+            "value": "5039"
         }
         ,
         {
             "label": "Office, photographic, photocopy and microfilm equipment ",
-            "value": 5044
+            "value": "5044"
         }
         ,
         {
             "label": "Computers, computer peripheral equipment — not elsewhere classified ",
-            "value": 5045
+            "value": "5045"
         }
         ,
         {
             "label": "Commercial equipment — not elsewhere classified ",
-            "value": 5046
+            "value": "5046"
         }
         ,
         {
             "label": "Dental/laboratory/medical/ophthalmic hospital equipment and supplies ",
-            "value": 5047
+            "value": "5047"
         }
         ,
         {
             "label": "Electrical parts and equipment",
-            "value": 5065
+            "value": "5065"
         }
         ,
         {
             "label": "Industrial supplies — not elsewhere classified ",
-            "value": 5085
+            "value": "5085"
         }
         ,
         {
             "label": "Precious stones and metals, watches and jewellery ",
-            "value": 5094
+            "value": "5094"
         }
         ,
         {
             "label": "Durable goods — not elsewhere classified ",
-            "value": 5099
+            "value": "5099"
         }
         ,
         {
             "label": "Stationery, office supplies and printing and writing paper ",
-            "value": 5111
+            "value": "5111"
         }
         ,
         {
             "label": "Drugs, drug proprietors ",
-            "value": 5122
+            "value": "5122"
         }
         ,
         {
             "label": "Piece goods, notions and other dry goods ",
-            "value": 5131
+            "value": "5131"
         }
         ,
         {
             "label": "Books, periodicals and newspapers ",
-            "value": 5192
+            "value": "5192"
         }
         ,
         {
             "label": "Paints, varnishes and supplies",
-            "value": 5198
+            "value": "5198"
         }
         ,
         {
             "label": "Home supply warehouse outlets",
-            "value": 5200
+            "value": "5200"
         }
         ,
         {
             "label": "Lumber and building materials outlets",
-            "value": 5211
+            "value": "5211"
         }
         ,
         {
             "label": "Glass, paint and wallpaper shops",
-            "value": 5231
+            "value": "5231"
         }
         ,
         {
             "label": "Hardware shops",
-            "value": 5251
+            "value": "5251"
         }
         ,
         {
             "label": "Lawn and garden supplies outlets, including nurseries",
-            "value": 5261
+            "value": "5261"
         }
         ,
         {
             "label": "Duty-free shops",
-            "value": 5309
+            "value": "5309"
         }
         ,
         {
             "label": "Discount shops",
-            "value": 5310
+            "value": "5310"
         }
         ,
         {
             "label": "Department stores",
-            "value": 5311
+            "value": "5311"
         }
         ,
         {
             "label": "Variety stores",
-            "value": 5331
+            "value": "5331"
         }
         ,
         {
             "label": "Miscellaneous general merchandise",
-            "value": 5399
+            "value": "5399"
         }
         ,
         {
             "label": "Groceries and supermarkets",
-            "value": 5411
+            "value": "5411"
         }
         ,
         {
             "label": "Freezer and locker meat provisioners ",
-            "value": 5422
+            "value": "5422"
         }
         ,
         {
             "label": "Candy, nut and confectionery shops ",
-            "value": 5441
+            "value": "5441"
         }
         ,
         {
             "label": "Dairies",
-            "value": 5451
+            "value": "5451"
         }
         ,
         {
             "label": "Bakeries",
-            "value": 5462
+            "value": "5462"
         }
         ,
         {
             "label": "Miscellaneous food shops — convenience and speciality retail outlets ",
-            "value": 5499
+            "value": "5499"
         }
         ,
         {
             "label": "Car and truck dealers (new and used) sales, services, repairs, parts and leasing ",
-            "value": 5511
+            "value": "5511"
+        }
+        ,
+        {
+            "label": "Car and truck dealers (used only) sales, service, repairs, parts and leasing",
+            "value": "5521"
         }
         ,
         {
             "label": "Auto and home supply outlets ",
-            "value": 5531
+            "value": "5531"
         }
         ,
         {
             "label": "Automotive tyre outlets ",
-            "value":5532
+            "value":"5532"
         }
         ,
         {
             "label": "Automotive parts and accessories outlets ",
-            "value":5533
+            "value":"5533"
         }
         ,
         {
             "label": "Service stations (with or without ancillary services)",
-            "value":5541
+            "value":"5541"
         }
         ,
         {
             "label": "Automated fuel dispensers ",
-            "value":5542
+            "value":"5542"
         }
         ,
         {
             "label": "Motorcycle shops and dealers ",
-            "value":5571
+            "value":"5571"
         }
         ,
         {
             "label": "Men’s and boys’ clothing and accessory shops ",
-            "value":5611
+            "value":"5611"
         }
         ,
         {
             "label": "Women’s ready-to-wear shops ",
-            "value":5621
+            "value":"5621"
+        }
+        ,
+        {
+            "label": "Women’s accessory and speciality shops",
+            "value":"5631"
         }
         ,
         {
             "label": "Children’s and infants’ wear shops",
-            "value":5641
+            "value":"5641"
         }
         ,
         {
             "label": "Family clothing shops",
-            "value":5651
+            "value":"5651"
         }
         ,
         {
             "label": "Sports and riding apparel shops ",
-            "value":5655
+            "value":"5655"
         }
         ,
         {
             "label": "Shoe shops ",
-            "value":5661
+            "value":"5661"
         }
         ,
         {
             "label": "Furriers and fur shops ",
-            "value":5681
+            "value":"5681"
         }
         ,
         {
             "label": "Men’s and women’s clothing shops ",
-            "value":5691
+            "value":"5691"
         }
         ,
         {
             "label": "Tailors, seamstresses, mending and alterations",
-            "value":5697
+            "value":"5697"
         }
         ,
         {
             "label": "Wig and toupee shops ",
-            "value":5698
+            "value":"5698"
         }
         ,
         {
             "label": "Miscellaneous apparel and accessory shops ",
-            "value":5699
+            "value":"5699"
+        }
+        ,
+        {
+            "label": "Furniture, home furnishings and equipment shops and manufacturers, except appliances ",
+            "value": "5712"
+        }
+        ,
+        {
+            "label": "Floor covering services",
+            "value": "5713"
+        }
+        ,
+        {
+            "label": "Drapery, window covering and upholstery shops",
+            "value": "5714"
+        }
+        ,
+        {
+            "label": "Alcoholic beverage wholesalers",
+            "value": "5715"
+        }
+        ,
+        {
+            "label": "Fireplaces, fireplace screens and accessories shops",
+            "value": "5718"
         }
         ,
         {
             "label": "Miscellaneous home furnishing speciality shops ",
-            "value": 5719
+            "value": "5719"
         }
         ,
         {
             "label": "Household appliance shops ",
-            "value":5722
+            "value":"5722"
         }
         ,
         {
             "label": "Electronics shops ",
-            "value":5732
+            "value":"5732"
         }
         ,
         {
             "label": "Music shops — musical instruments, pianos and sheet music ",
-            "value":5733
+            "value":"5733"
         }
         ,
         {
             "label": "Record shops ",
-            "value":5735
+            "value":"5735"
+        }
+        ,
+        {
+            "label": "Caterers",
+            "value":"5811"
         }
         ,
         {
             "label": "Eating places and restaurants ",
-            "value":5812
+            "value":"5812"
         }
         ,
         {
             "label": "Drinking places (alcoholic beverages) — bars, taverns, night-clubs, cocktail lounges and discothèques ",
-            "value":5813
+            "value":"5813"
         }
         ,
         {
             "label": "Fast food restaurants ",
-            "value":5814
+            "value":"5814"
         }
         ,
         {
             "label": "Digital Goods-Media: Books, Movies, Music ",
-            "value":5815
+            "value":"5815"
         }
         ,
         {
             "label": "Digital Goods: Games ",
-            "value":5816
+            "value":"5816"
         }
         ,
         {
             "label": "Digital Goods: Application (Excludes Games) ",
-            "value":5817
+            "value":"5817"
         }
         ,
         {
             "label": "Large Digital Goods Merchant ",
-            "value":5818
+            "value":"5818"
         }
         ,
         {
             "label": "Drug stores and pharmacies ",
-            "value":5912
+            "value":"5912"
         }
         ,
         {
             "label": "Package shops — beer, wine and liquor ",
-            "value":5921
+            "value":"5921"
         }
         ,
         {
             "label": "Used merchandise and second-hand shops ",
-            "value":5931
+            "value":"5931"
         }
         ,
         {
             "label": "Bicycle shops — sales and service ",
-            "value":5940
+            "value":"5940"
         }
         ,
         {
             "label": "Sporting goods shops ",
-            "value":5941
+            "value":"5941"
         }
         ,
         {
             "label": "Bookshops ",
-            "value":5942
+            "value":"5942"
         }
         ,
         {
             "label": "Stationery, office and school supply shops ",
-            "value":5943
+            "value":"5943"
         }
         ,
         {
             "label": "Jewellery, watch, clock and silverware shops ",
-            "value":5944
+            "value":"5944"
         }
         ,
         {
             "label": "Hobby, toy and game shops ",
-            "value":5945
+            "value":"5945"
         }
         ,
         {
             "label": "Camera and photographic supply shops ",
-            "value":5946
+            "value":"5946"
         }
         ,
         {
             "label": "Gift, card, novelty and souvenir shops ",
-            "value":5947
+            "value":"5947"
         }
         ,
         {
             "label": "Luggage and leather goods shops ",
-            "value":5948
+            "value":"5948"
         }
         ,
         {
             "label": "Sewing, needlework, fabric and piece goods shops ",
-            "value":5949
+            "value":"5949"
         }
         ,
         {
             "label": "Glassware and crystal shops ",
-            "value":5950
+            "value":"5950"
         }
         ,
         {
             "label": "Artist supply and craft shops ",
-            "value":5970
+            "value":"5970"
         }
         ,
         {
             "label": "Art dealers and galleries ",
-            "value":5971
+            "value":"5971"
         }
         ,
         {
             "label": "Stamp and coin shops ",
-            "value":5972
+            "value":"5972"
         }
         ,
         {
             "label": "Religious goods and shops ",
-            "value":5973
+            "value":"5973"
         }
         ,
         {
             "label": "Hearing aids — sales, service and supplies ",
-            "value":5975
+            "value":"5975"
         }
         ,
         {
             "label": "Orthopaedic goods and prosthetic devices ",
-            "value":5976
+            "value":"5976"
         }
         ,
         {
             "label": "Cosmetic shops ",
-            "value":5977
+            "value":"5977"
+        }
+        ,
+        {
+            "label": "Typewriter outlets - sales, service and rentals",
+            "value":"5978"
         }
         ,
         {
             "label": "Florists ",
-            "value":5992
+            "value":"5992"
         }
         ,
         {
             "label": "Cigar shops and stands ",
-            "value":5993
+            "value":"5993"
         }
         ,
         {
             "label": "Newsagents and news-stands ",
-            "value":5994
+            "value":"5994"
         }
         ,
         {
             "label": "Pet shops, pet food and supplies ",
-            "value":5995
+            "value":"5995"
         }
         ,
         {
             "label": "Swimming pools — sales, supplies and services ",
-            "value":5996
+            "value":"5996"
+        }
+        ,
+        {
+            "label": "Electric razor shops - sales and service",
+            "value":"5997"
         }
         ,
         {
             "label": "Tent and awning shops ",
-            "value":5998
+            "value":"5998"
         }
         ,
         {
             "label": "Miscellaneous and speciality retail outlets ",
-            "value":5999
+            "value":"5999"
         }
         ,
         {
-            "label": "#N/A",
-            "value":6513
+            "label": "Real estate agents and managers-rentals",
+            "value":"6513"
         }
         ,
         {
             "label": "Lodging — hotels, motels and resorts ",
-            "value":7011
+            "value":"7011"
         }
         ,
         {
             "label": "Sporting and recreational camps ",
-            "value":7032
+            "value":"7032"
+        }
+        ,
+        {
+            "label": "Trailer parks and camp-sites",
+            "value":"7033"
         }
         ,
         {
             "label": "Laundry, cleaning and garment services ",
-            "value":7210
+            "value":"7210"
+        }
+        ,
+        {
+            "label": "Laundry services - family and commercial",
+            "value":"7211"
+        }
+        ,
+        {
+            "label": "Dry cleaners",
+            "value":"7216"
         }
         ,
         {
             "label": "Carpet and upholstery cleaning ",
-            "value":7217
+            "value":"7217"
         }
         ,
         {
             "label": "Photographic studios ",
-            "value":7221
+            "value":"7221"
         }
         ,
         {
             "label": "Beauty and barber shops ",
-            "value":7230
+            "value":"7230"
         }
         ,
         {
             "label": "Shoe repair shops, shoe shine parlours and hat cleaning shops ",
-            "value":7251
+            "value":"7251"
         }
         ,
         {
             "label": "Tax Preparation Service ",
-            "value":7276
+            "value":"7276"
+        }
+        ,
+        {
+            "label": "private hospital",
+            "value":"7280"
+        }
+        ,
+        {
+            "label": "Babysitting and housekeeping services",
+            "value":"7295"
         }
         ,
         {
             "label": "Clothing rentals - costumes, uniforms and formal wear",
-            "value":7296
+            "value":"7296"
         }
         ,
         {
             "label": "Massage parlours ",
-            "value":7297
+            "value":"7297"
         }
         ,
         {
             "label": "Health and beauty spas ",
-            "value":7298
+            "value":"7298"
         }
         ,
         {
             "label": "Miscellaneous personal services — not elsewhere classified ",
-            "value":7299
+            "value":"7299"
         }
         ,
         {
             "label": "Advertising services ",
-            "value":7311
+            "value":"7311"
         }
         ,
         {
             "label": "Blueprinting and Photocopying Services  ",
-            "value":7332
+            "value":"7332"
         }
         ,
         {
             "label": "Commercial photography, art and graphics ",
-            "value": 7333
+            "value": "7333"
         }
         ,
         {
             "label": "Quick copy, reproduction and blueprinting services",
-            "value":7338
+            "value":"7338"
         }
         ,
         {
             "label": "Stenographic and secretarial support services",
-            "value":7339
+            "value":"7339"
         }
         ,
         {
             "label": "Exterminating and disinfecting services ",
-            "value":7342
+            "value":"7342"
         }
         ,
         {
             "label": "Cleaning, maintenance and janitorial services ",
-            "value":7349
+            "value":"7349"
         }
         ,
         {
             "label": "Employment agencies and temporary help services ",
-            "value":7361
+            "value":"7361"
         }
         ,
         {
             "label": "Computer programming, data processing and integrated systems design services ",
-            "value":7372
+            "value":"7372"
         }
         ,
         {
             "label": "Computer maintenance and repair services — not elsewhere classified ",
-            "value":7379
+            "value":"7379"
         }
         ,
         {
             "label": "Management, consulting and public relations services ",
-            "value":7392
+            "value":"7392"
         }
         ,
         {
             "label": "Equipment, tool, furniture and appliance rentals and leasing ",
-            "value":7394
+            "value":"7394"
         }
         ,
         {
             "label": "Photofinishing laboratories and photo developing ",
-            "value":7395
+            "value":"7395"
         }
         ,
         {
             "label": "Business services — not elsewhere classified ",
-            "value":7399
+            "value":"7399"
         }
         ,
         {
             "label": "Automobile rentals ",
-            "value":7512
+            "value":"7512"
+        }
+        ,
+        {
+            "label": "Truck and utility trailer rentals",
+            "value":"7513"
+        }
+        ,
+        {
+            "label": "Motor home and recreational vehicle rentals",
+            "value":"7519"
         }
         ,
         {
             "label": "Parking lots and garages ",
-            "value":7523
+            "value":"7523"
+        }
+        ,
+        {
+            "label": "Automotive body repair shops",
+            "value":"7531"
+        }
+        ,
+        {
+            "label": "Tyre retreading and repair shops",
+            "value":"7534"
+        }
+        ,
+        {
+            "label": "Automotive paint shops",
+            "value":"7535"
         }
         ,
         {
             "label": "Automotive service shops (non-dealer) ",
-            "value":7538
+            "value":"7538"
         }
         ,
         {
             "label": "Car washes ",
-            "value":7542
+            "value":"7542"
         }
         ,
         {
             "label": "Towing services ",
-            "value":7549
+            "value":"7549"
+        }
+        ,
+        {
+            "label": "Electronics repair shops",
+            "value":"7622"
         }
         ,
         {
             "label": "Air conditioning and refrigeration repair shops ",
-            "value":7623
+            "value":"7623"
         }
         ,
         {
             "label": "Electrical and small appliance repair shops ",
-            "value":7629
+            "value":"7629"
         }
         ,
         {
             "label": "Watch, clock and jewellery repair shops ",
-            "value":7631
+            "value":"7631"
         }
         ,
         {
             "label": "Furniture reupholstery, repair and refinishing ",
-            "value":7641
+            "value":"7641"
         }
         ,
         {
             "label": "Welding services",
-            "value":7692
+            "value":"7692"
         }
         ,
         {
             "label": "Miscellaneous repair shops and related services ",
-            "value":7699
+            "value":"7699"
         }
         ,
         {
             "label": "Motion picture theatres ",
-            "value":7832
+            "value":"7832"
+        }
+        ,
+        {
+            "label": "Video tape rentals",
+            "value":"7841"
         }
         ,
         {
             "label": "Dance halls, studios and schools ",
-            "value":7911
+            "value":"7911"
         }
         ,
         {
             "label": "Theatrical producers (except motion pictures) and ticket agencies ",
-            "value":7922
+            "value":"7922"
         }
         ,
         {
             "label": "Bands, orchestras and miscellaneous entertainers — not elsewhere classified ",
-            "value":7929
+            "value":"7929"
         }
         ,
         {
             "label": "Billiard and pool establishments",
-            "value": 7932
+            "value": "7932"
         }
         ,
         {
             "label": "Bowling alleys ",
-            "value":7933
+            "value":"7933"
         }
         ,
         {
             "label": "Commercial sports, professional sports clubs, athletic fields and sports promoters ",
-            "value":7941
+            "value":"7941"
         }
         ,
         {
             "label": "Tourist attractions and exhibits ",
-            "value":7991
+            "value":"7991"
         }
         ,
         {
             "label": "Public golf courses ",
-            "value":7992
+            "value":"7992"
         }
         ,
         {
             "label": "Video amusement game supplies ",
-            "value":7993
+            "value":"7993"
         }
         ,
         {
             "label": "Video game arcades and establishments ",
-            "value":7994
+            "value":"7994"
         }
         ,
         {
             "label": "Amusement parks, circuses, carnivals and fortune tellers ",
-            "value":7996
+            "value":"7996"
         }
         ,
         {
             "label": "Membership clubs (sports, recreation, athletic), country clubs and private golf courses ",
-            "value":7997
+            "value":"7997"
         }
         ,
         {
             "label": "Aquariums, seaquariums and dolphinariums ",
-            "value":7998
+            "value":"7998"
         }
         ,
         {
             "label": "Recreation services — not elsewhere classified ",
-            "value":7999
+            "value":"7999"
         }
         ,
         {
             "label": "Doctors and physicians — not elsewhere classified ",
-            "value":8011
+            "value":"8011"
         }
         ,
         {
             "label": "Dentists and orthodontists ",
-            "value":8021
+            "value":"8021"
+        }
+        ,
+        {
+            "label": "Osteopaths",
+            "value":"8031"
+        }
+        ,
+        {
+            "label": "Chiropractors",
+            "value":"8041"
         }
         ,
         {
             "label": "Optometrists and ophthalmologists ",
-            "value":8042
+            "value":"8042"
         }
         ,
         {
             "label": "Opticians, optical goods and eyeglasses ",
-            "value":8043
+            "value":"8043"
+        }
+        ,
+        {
+            "label": "Podiatrists and chiropodists",
+            "value":"8049"
         }
         ,
         {
             "label": "Nursing and personal care facilities ",
-            "value":8050
+            "value":"8050"
         }
         ,
         {
             "label": "Hospitals ",
-            "value":8062
+            "value":"8062"
         }
         ,
         {
             "label": "Medical and dental laboratories ",
-            "value":8071
+            "value":"8071"
         }
         ,
         {
             "label": "Medical services and health practitioners — not elsewhere classified ",
-            "value":8099
+            "value":"8099"
         }
         ,
         {
             "label": "Elementary and secondary schools ",
-            "value":8211
+            "value":"8211"
         }
         ,
         {
             "label": "Colleges, universities, professional schools and junior colleges ",
-            "value":8220
+            "value":"8220"
         }
         ,
         {
             "label": "Correspondence schools ",
-            "value":8241
+            "value":"8241"
         }
         ,
         {
             "label": "Business and secretarial schools ",
-            "value":8244
+            "value":"8244"
         }
         ,
         {
             "label": "Trade and vocational schools ",
-            "value":8249
+            "value":"8249"
         }
         ,
         {
             "label": "Schools and educational services — not elsewhere classified ",
-            "value":8299
+            "value":"8299"
         }
         ,
         {
             "label": "Child care services ",
-            "value":8351
+            "value":"8351"
         }
         ,
         {
             "label": "Professional services — not elsewhere classified ",
-            "value":8999
+            "value":"8999"
         }
         ,
         {
             "label": "Government services — not elsewhere classified ",
-            "value":9399
+            "value":"9399"
         }
 
         ];
diff --git a/src/main/ui/static/payment/partner/add-partner.js b/src/main/ui/static/payment/partner/add-partner.js
index 2289ba3a5..18d2c8318 100644
--- a/src/main/ui/static/payment/partner/add-partner.js
+++ b/src/main/ui/static/payment/partner/add-partner.js
@@ -513,7 +513,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 }
             }
             if($scope.partner.mc_code ){
-                $scope.partner.mc_code=parseInt($scope.partner.mc_code);
+                $scope.partner.mc_code=$scope.partner.mc_code;
             }
             if (!$scope.partner.client_type) {
                 $scope.partner.client_type = 'cross-border';
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 4e63e0fb4..2475ecc50 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -1185,7 +1185,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
       $scope.isComplianceOfBusinessStructure = false
       $scope.cardPromotionaparams = {}
       if ($scope.partner.mc_code) {
-        $scope.partner.mc_code = parseInt($scope.partner.mc_code)
+        $scope.partner.mc_code = $scope.partner.mc_code
       }
       var website = partner.data.company_website
       if (website != null) {