Merge branch 'update' into develop

# Conflicts:
#	src/db/modify.sql

src/db/modify.sql

@@ -139,16 +139,15 @@ ALTER TABLE sys_clients_customers ADD COLUMN channel varchar(15) not NULL ;
 ALTER TABLE sys_clients_customers ADD COLUMN last_payment_time datetime DEFAULT NULL COMMENT '最后一次付款时间';
 
 ALTER TABLE sys_org ADD COLUMN parent_org_id int(11) DEFAULT NULL;
-ALTER TABLE sys_org ADD COLUMN min_wechat_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低微信费率';
-ALTER TABLE sys_org ADD COLUMN min_alipay_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低支付宝费率';
-ALTER TABLE sys_org ADD COLUMN min_alipayonline_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低支付宝线上费率';
-ALTER TABLE sys_org ADD COLUMN min_bestpay_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低翼支付费率';
-ALTER TABLE sys_org ADD COLUMN min_jd_rate DECIMAL(3,2) DEFAULT 'NULL' COMMENT '旗下商户最低京东费率';
+ALTER TABLE sys_org ADD COLUMN min_wechat_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低微信费率';
+ALTER TABLE sys_org ADD COLUMN min_alipay_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低支付宝费率';
+ALTER TABLE sys_org ADD COLUMN min_alipayonline_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低支付宝线上费率';
+ALTER TABLE sys_org ADD COLUMN min_bestpay_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低翼支付费率';
+ALTER TABLE sys_org ADD COLUMN min_jd_rate DECIMAL(3,2) DEFAULT NULL COMMENT '旗下商户最低京东费率';
 ALTER TABLE sys_org ADD COLUMN commission_type SMALLINT(1) DEFAULT '1' COMMENT '提成类型 1:渠道计算法 2:总交易额比例 3:收益比例';
 
 
 
-<<<<<<<<< Temporary merge branch 1
 --agent_commission
 
 CREATE TABLE `financial_agent_commission` (

src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java

@@ -75,6 +75,8 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
             item.put("total_charge", chargeInfo.getString("total_charge"));
             item.put("royalpay_charge", chargeInfo.getString("royalpay_charge"));
             item.put("org_charge", chargeInfo.getString("org_charge"));
+            JSONObject referrerChargeInfo = getReferrerPrizeInfo(item.getString("monthstr"));
+            item.put("referrer_charge",referrerChargeInfo.getString("org_charge"));
             monthObjs.add(item);
         }
         return monthObjs;

src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java

@@ -2,12 +2,10 @@ package au.com.royalpay.payment.manage.citypartner.web;
 
 import au.com.royalpay.payment.manage.citypartner.core.CityPartnerPrizeService;
 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.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/au/com/royalpay/payment/manage/signin/core/impls/SignInAccountServiceImpl.java

@@ -18,6 +18,7 @@ import au.com.royalpay.payment.tools.env.PlatformEnvironment;
 import au.com.royalpay.payment.tools.env.RequestEnvironment;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
+import au.com.royalpay.payment.tools.locale.LocaleSupport;
 import au.com.royalpay.payment.tools.utils.PasswordUtils;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
@@ -138,7 +139,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
         validLoginInfo(loginInfo, account);
         JSONObject client = clientManager.getClientInfoIgnoreInvalid(account.getIntValue("client_id"));
         if (client != null && !client.getBooleanValue("is_valid")) {
-            throw new BadRequestException("用户名或密码不正确");
+            throw new BadRequestException(LocaleSupport.localeMessage("error.login.password"));
         }
         validLoginInfo(loginInfo, account);
         publisher.publishEvent(new ManagerLoginEvent(this, account.getString("manager_id"), RequestEnvironment.getClientIp(), "PASSWORD"));
@@ -147,12 +148,12 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
 
     private void validLoginInfo(LoginInfo loginInfo, JSONObject account) {
         if (account == null) {
-            throw new BadRequestException("用户名或密码不正确");
+            throw new BadRequestException(LocaleSupport.localeMessage("login.error.password"));
         }
         String salt = account.getString("salt");
         String pwdHash = loginInfo.getPasswordHashed(salt);
         if (!StringUtils.equals(pwdHash, account.getString("password_hash"))) {
-            throw new BadRequestException("用户名或密码不正确");
+            throw new BadRequestException(LocaleSupport.localeMessage("login.error.password"));
         }
     }
 

src/main/resources/i18n/msg_en.properties

@@ -52,7 +52,7 @@ error.permission.not_login=Please sign in first
 error.permission.login_again=Your login has expired. Please sign in again.
 error.permission.nopermission=You have no permission to access this resource.
 error.permission.not_manager_login=Use manager account and sign in.
-s
+
 error.settlement.season_invalid=Season of next rate cycle not started. Unable to generate new rate automatically
 
 error.partner.valid.dumplicate_client_moniker=Partner code exists
@@ -76,6 +76,9 @@ error.register.valid.dumplicate_email=The email address has been registered,plea
 error.payment.xplan.enable=Activity not started yet. Keep attention about us.
 error.payment.xplan.not-auto-join=Self-join not allowed yet. Contact our service please.
 
+error.login.password=User name or password error.
+
+
 todo.settlement.date_setting=Settle Dates configured are running out. Config new Settle Dates
 todo.rate.expire_warning=Some clients' rate are expiring soon or expired. Please fix it as soon as possible.
 todo.client.approve=Some clients are waiting for compliance.
@@ -96,3 +99,5 @@ app.label.remark=Remark
 app.label.creating-order=...
 app.label.close=Close
 app.label.coupons=Available Coupons
+
+

src/main/resources/i18n/msg_zh.properties

@@ -73,6 +73,7 @@ error.payment.customer_cheat=交易次数过频，请明日再试
 error.payment.xplan.enable=活动暂未开通，敬请期待
 error.payment.xplan.not-auto-join=暂不允许自主申请，详请联系我们客服
 
+error.login.password=用户名或密码错误
 
 todo.settlement.date_setting=已配置清算日即将到期，请配置新的清算日
 todo.rate.expire_warning=有商户费率即将到期或已过期，请尽快处理

src/main/ui/static/config/orgcommission/templates/org_commission_root.html

@@ -29,18 +29,18 @@
                     <div class="info-box-content">
                         <!--<div class="info-box-text text-bold text-red" ng-bind="r.charge_date"></div>-->
                         <div>
-                            <div class="info-box-number-right">
+                           <!-- <div class="info-box-number-right">
                                 <span class="text-bold">Total Charge:</span>
                                 <span class="text-green" ng-bind="mon.total_charge|currency:'AUD'"></span>
-                            </div>
-                            <div class="info-box-number-right">
-                                <span class="text-bold">RoyalPay Charge:</span>
-                                <span class="text-green" ng-bind="mon.royalpay_charge|currency:'AUD'"></span>
-                            </div>
+                            </div>-->
                             <div class="info-box-number-right">
                                 <span class="text-bold">City Partner Charge:</span>
                                 <span class="text-green" ng-bind="mon.org_charge|currency:'AUD'"></span>
                             </div>
+                            <div class="info-box-number-right">
+                                <span class="text-bold">Referrer Charge:</span>
+                                <span class="text-green" ng-bind="mon.referrer_charge|currency:'AUD'"></span>
+                            </div>
                         </div>
                     </div>
                 </div>