diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index af4a53e..ae7e745 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,7 +1,7 @@ server: port: 8099 - url: http://127.0.0.1:8099/operator-plugin - ip: 127.0.0.1 + url: http://192.168.0.115:8099/operator-plugin + ip: 192.168.0.115 system-title: 运营平台(扩展) system-sub-title: 运营平台(扩展) # default-home-page: route/land/page @@ -217,7 +217,7 @@ file: security: oauth2: - oauth-server: http://127.0.0.1:8091/operator/ + oauth-server: http://192.168.0.115:8091/operator/ oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url} client: client-id: 0cf040b3344f471f882fb751c15493ff diff --git a/src/main/resources/mybatis/mapper/packageinfo/package-info-mapper.xml b/src/main/resources/mybatis/mapper/packageinfo/package-info-mapper.xml index 49646a7..3f0ea70 100644 --- a/src/main/resources/mybatis/mapper/packageinfo/package-info-mapper.xml +++ b/src/main/resources/mybatis/mapper/packageinfo/package-info-mapper.xml @@ -384,15 +384,11 @@ AND t1.package_onlien = 1 AND t1.package_status = 1 AND ( ( - t1.package_limit_users = '' AND t1.package_mode = 'all' + t1.package_mode = 'all' AND t1.package_limit_users = '' ) OR ( - t1.package_limit_users LIKE CONCAT('%', #{userId} ,'%') - ) - OR - ( - t1.package_mode = 'single' AND NOT EXISTS(SELECT t2.id FROM operator_package_order t2 WHERE t1.package_info_id = t2.package_info_id AND t2.creator = #{userId} AND t2.is_delete = 0) + t1.package_mode = 'single' AND t1.package_limit_users LIKE CONCAT('%', #{userId} ,'%') AND 1 > (SELECT COUNT(1) FROM operator_package_order t2 WHERE t1.package_info_id = t2.package_info_id AND t2.creator = #{userId} AND t2.is_delete = 0) ) ) ORDER BY t1.package_order , t1.package_onlien_time DESC diff --git a/src/main/resources/templates/coupon/save.html b/src/main/resources/templates/coupon/save.html index fadeedf..26ea658 100644 --- a/src/main/resources/templates/coupon/save.html +++ b/src/main/resources/templates/coupon/save.html @@ -10,6 +10,7 @@ +
diff --git a/src/main/resources/templates/packageinfo/list.html b/src/main/resources/templates/packageinfo/list.html index fb23a20..4cccb7e 100644 --- a/src/main/resources/templates/packageinfo/list.html +++ b/src/main/resources/templates/packageinfo/list.html @@ -186,7 +186,7 @@ return rowData + "件"; } }, - {field: 'packageOnlien', width: 240, title: '发布', align:'center', + {field: 'packageOnlien', width: 240, title: '发布', align:'center', fixed: 'right', templet: function(row) { var rowData = row[this.field]; var packageOnlienTime = row["packageOnlienTime"]; @@ -197,7 +197,7 @@ } } }, - {field: 'packageStatus', width: 180, title: '上架状态', align:'center', + {field: 'packageStatus', width: 180, title: '上架状态', align:'center', fixed: 'right', templet: function(row) { var rowData = row[this.field]; return ''; diff --git a/src/main/resources/templates/packageorder/list.html b/src/main/resources/templates/packageorder/list.html index 372a7d7..123ca36 100644 --- a/src/main/resources/templates/packageorder/list.html +++ b/src/main/resources/templates/packageorder/list.html @@ -113,7 +113,7 @@ return rowData; } }, - {field: 'userName', width: 250, title: '购买人', align:'center', + {field: 'userName', width: 320, title: '购买人', align:'center', templet: function(row) { var rowData = row[this.field]; var userType = row["userType"];