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`;
 
@@ -64,7 +70,10 @@ ALTER TABLE `bd_access_log`
   MODIFY COLUMN `bd_id`  varchar(50) NOT NULL AFTER `date`;
 
 ALTER TABLE `sys_clients`
-  MODIFY COLUMN `creator`  varchar(50) NOT NULL COMMENT '创建者' AFTER `logo_thumbnail`;
+  MODIFY COLUMN `creator`  varchar(50) NOT NULL COMMENT '创建者' 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`
   MODIFY COLUMN `creator`  varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `is_using`;
@@ -89,3 +98,13 @@ 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/appclient/beans/AppQueryBean.java

@@ -78,8 +78,8 @@ public class AppQueryBean {
             }
         }
 
-        params.put("status", status.toString());
+        params.put("status", status.getStatus());
-        params.put("channel", channel.toString());
+        params.put("channel", channel.getChannels());
         if (client_ids != null) {
             params.put("client_ids", client_ids);
         }

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/resources/templates/mail/new_client_notice.html

@@ -75,7 +75,7 @@
         <span th:text="${bd.display_name}"></span><br>
         Email:<a href="mailto:$bd.email" th:utext="${bd.email}"></a><br>
         <span th:text="${bd.phone}"></span><br>
-        <span th:text="${bd.wechat}"></span>
+        <span th:if="${bd['wechat']!=null} and ${bd['wechat']!=''}" th:text="${bd.wechat}"></span>
     </p>
 </div>
 <hr>

src/main/resources/templates/mail/reset_password.html

@@ -42,8 +42,6 @@
                                     </td>
                                 </tr>
                                 </tbody></table>
-                        #end
-
                     </td>
                 </tr>
 

src/main/resources/templates/reports/daily_report.html

@@ -131,37 +131,6 @@
                     </div>
                 </div>
             </div>
-            ##
-            <div class="weui-panel">
-                ##
-                <div class="weui-panel__hd">Total</div>
-                ##
-                <div class="weui-panel__ft">
-                    ##
-                    <div class="weui-cell">
-                        ##
-                        <div class="weui-cell__bd weui-cell_primary">总计支出</div>
-                        ##
-                        <div class="weui-cell__ft" th:text="${report.debit.total_debit}"></div>
-                        ##
-                    </div>
-                    ##
-                    <div class="weui-cell">
-                        ##
-                        <div class="weui-cell__bd weui-cell_primary">较昨天比较</div>
-                        ##
-                        <div class="weui-cell__ft">
-                            ## <span style="color: green" th:if="${report.debit.compare>0}" th:text="'↑'+${report.debit.compare_value}"></span>
-                            ## <span style="color: red" th:if="${report.debit.compare<0}" th:text="'↓'+${report.debit.compare_value}"></span>
-                            ## <span th:if="${report.debit.compare<0}" th:text="${report.debit.compare_value}"></span>
-                            ##
-                        </div>
-                        ##
-                    </div>
-                    ##
-                </div>
-                ##
-            </div>
 
         </div>
     </div>