Merge remote-tracking branch 'origin/master'

src/db/modify.sql

@@ -45,9 +45,15 @@ ALTER TABLE `financial_bd_config`
 ALTER TABLE `sys_client_bd`
   MODIFY COLUMN `bd_id`  varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL AFTER `client_id`;
 
+ALTER TABLE `sys_client_bd`
+  MODIFY COLUMN `create_id`  varchar(50) DEFAULT NULL FIRST ;
+
 ALTER TABLE `sys_managers`
   MODIFY COLUMN `manager_id`  varchar(50) NOT NULL COMMENT '管理员账户编号' FIRST ;
 
+ALTER TABLE `sys_client_rates`
+  MODIFY COLUMN `manager_id`  varchar(50) DEFAULT NULL FIRST ;
+
 ALTER TABLE `log_manager_login`
   MODIFY COLUMN `manager_id`  varchar(50) NOT NULL AFTER `id`;
 
@@ -65,7 +71,8 @@ ALTER TABLE `bd_access_log`
 
 ALTER TABLE `sys_clients`
   MODIFY COLUMN `creator`  varchar(50) NOT NULL COMMENT '创建者' AFTER `logo_thumbnail`,
-  MODIFY COLUMN `approver`  varchar(50) NOT NULL AFTER `logo_thumbnail`;
+  MODIFY COLUMN `bd_user`  varchar(300) DEFAULT NULL COMMENT '所属BD用户' AFTER `logo_thumbnail`,
+  MODIFY COLUMN `approver`  varchar(50) DEFAULT NULL AFTER `logo_thumbnail`;
 
 
 ALTER TABLE `pat_goods`
@@ -92,6 +99,12 @@ ALTER TABLE `pat_goods`
 ALTER TABLE `pat_goods_sale`
   MODIFY COLUMN `good_id`  varchar(50) NOT NULL AFTER `client_id`;
 
+ALTER TABLE `commodities`
+  MODIFY COLUMN `create_id`  varchar(50) DEFAULT NULL;
+
+ALTER TABLE `sys_accounts`
+  MODIFY COLUMN `creator`  varchar(50) NOT NULL COMMENT '开户者';
+
 
 
 

src/main/java/au/com/royalpay/payment/manage/signin/web/SignInController.java

@@ -322,6 +322,7 @@ public class SignInController {
         if (ua.toLowerCase().contains("royalpayclient")) {
             response.sendRedirect("/api/v1.0/retail/app/partner_signin_app_qrcode/" + codeId);
         }
+        System.err.println("The Wrong Browser's UA is :" + ua);
         throw new ForbiddenException("error.not_support_browser");
     }
 }

src/main/ui/static/templates/cashier_aggregate_payment.js

@@ -227,7 +227,7 @@ $(function () {
             return;
         }
         dataCache.paying = true;
-        var data = {price: dataCache.price + '', original_number: true, currency: window.currency,device_id: window.cashier_phone};
+        var data = {amount: dataCache.price + '', original_number: true, currency: window.currency,device_id: window.cashier_phone};
         if (dataCache.remark) {
             data.description = dataCache.remark;
         }else {