更新

unimall-admin/src/views/wuye/info/index.vue

@@ -245,7 +245,7 @@
         </el-form-item>
         <!-- <el-form-item label="垃圾清运费" prop="garbageClearing">
           <el-input v-model="form.garbageClearing" placeholder="请输入垃圾清运费" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="缴费日期" prop="paymentDate">
           <el-date-picker
             v-model="form.paymentDate"
@@ -259,12 +259,12 @@
         <el-form-item label="缴费方式" prop="paymentMethod">
           <el-input v-model="form.paymentMethod" placeholder="请输入缴费方式" />
         </el-form-item>
-        <el-form-item label="实际缴费总合计" prop="totalActualPayment">
+        <el-form-item label="实际缴费" prop="totalActualPayment">
           <el-input v-model="form.totalActualPayment" placeholder="请输入实际缴费总合计" />
         </el-form-item>
-        <el-form-item label="缴费区间" prop="paymentRange">
+        <!-- <el-form-item label="缴费区间" prop="paymentRange">
           <el-input v-model="form.paymentRange" placeholder="请输入缴费区间" />
-        </el-form-item>-->
+        </el-form-item> -->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/tools/gen/GenTableColumnMapper.xml

@@ -3,59 +3,59 @@
 <mapper
 	namespace="com.iotechn.unimall.data.mapper.tools.gen.GenTableColumnMapper">
 
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
-		<id property="columnId" column="column_id" />
-		<result property="tableId" column="table_id" />
-		<result property="columnName" column="column_name" />
-		<result property="columnComment" column="column_comment" />
-		<result property="columnType" column="column_type" />
-		<result property="javaType" column="java_type" />
-		<result property="javaField" column="java_field" />
-		<result property="isPk" column="is_pk" />
-		<result property="isIncrement" column="is_increment" />
-		<result property="isRequired" column="is_required" />
-		<result property="isInsert" column="is_insert" />
-		<result property="isEdit" column="is_edit" />
-		<result property="isList" column="is_list" />
-		<result property="isQuery" column="is_query" />
-		<result property="queryType" column="query_type" />
-		<result property="htmlType" column="html_type" />
-		<result property="dictType" column="dict_type" />
-		<result property="sort" column="sort" />
-		<result property="createBy" column="create_by" />
-		<result property="createTime" column="create_time" />
-		<result property="updateBy" column="update_by" />
-		<result property="updateTime" column="update_time" />
-	</resultMap>
-	<sql id="selectDictTypeVo">
-		SELECT
-		table_id AS tableId,
-		`table_name` AS tableName,
-		table_comment AS tableComment,
-		class_name AS className,
-		tpl_category AS tplCategory,
-		package_name AS packageName,
-		module_name AS moduleName,
-		business_name AS businessName,
-		function_name AS functionName,
-		function_author AS functionAuthor,
-		create_by AS createBy,
-		create_time AS createTime,
-		update_by AS updateBy,
-		update_time AS updateTime,
-		`options`
-		FROM
-		sys_gen_table
-	</sql>
-	<select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
-		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]>
-		column_key != 'PRI') then '1' else null end) as is_required, (case
-		when column_key = 'PRI' then '1' else '0' end) as is_pk,
-		ordinal_position as sort, column_comment, (case when extra =
-		'auto_increment' then '1' else '0' end) as is_increment, column_type
-		from information_schema.columns where table_schema = (select
-		database()) and table_name = (#{tableName})
-		order by ordinal_position
-	</select>
+<!--	<resultMap type="GenTableColumn" id="GenTableColumnResult">-->
+<!--		<id property="columnId" column="column_id" />-->
+<!--		<result property="tableId" column="table_id" />-->
+<!--		<result property="columnName" column="column_name" />-->
+<!--		<result property="columnComment" column="column_comment" />-->
+<!--		<result property="columnType" column="column_type" />-->
+<!--		<result property="javaType" column="java_type" />-->
+<!--		<result property="javaField" column="java_field" />-->
+<!--		<result property="isPk" column="is_pk" />-->
+<!--		<result property="isIncrement" column="is_increment" />-->
+<!--		<result property="isRequired" column="is_required" />-->
+<!--		<result property="isInsert" column="is_insert" />-->
+<!--		<result property="isEdit" column="is_edit" />-->
+<!--		<result property="isList" column="is_list" />-->
+<!--		<result property="isQuery" column="is_query" />-->
+<!--		<result property="queryType" column="query_type" />-->
+<!--		<result property="htmlType" column="html_type" />-->
+<!--		<result property="dictType" column="dict_type" />-->
+<!--		<result property="sort" column="sort" />-->
+<!--		<result property="createBy" column="create_by" />-->
+<!--		<result property="createTime" column="create_time" />-->
+<!--		<result property="updateBy" column="update_by" />-->
+<!--		<result property="updateTime" column="update_time" />-->
+<!--	</resultMap>-->
+<!--	<sql id="selectDictTypeVo">-->
+<!--		SELECT-->
+<!--		table_id AS tableId,-->
+<!--		`table_name` AS tableName,-->
+<!--		table_comment AS tableComment,-->
+<!--		class_name AS className,-->
+<!--		tpl_category AS tplCategory,-->
+<!--		package_name AS packageName,-->
+<!--		module_name AS moduleName,-->
+<!--		business_name AS businessName,-->
+<!--		function_name AS functionName,-->
+<!--		function_author AS functionAuthor,-->
+<!--		create_by AS createBy,-->
+<!--		create_time AS createTime,-->
+<!--		update_by AS updateBy,-->
+<!--		update_time AS updateTime,-->
+<!--		`options`-->
+<!--		FROM-->
+<!--		sys_gen_table-->
+<!--	</sql>-->
+<!--	<select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">-->
+<!--		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]>-->
+<!--		column_key != 'PRI') then '1' else null end) as is_required, (case-->
+<!--		when column_key = 'PRI' then '1' else '0' end) as is_pk,-->
+<!--		ordinal_position as sort, column_comment, (case when extra =-->
+<!--		'auto_increment' then '1' else '0' end) as is_increment, column_type-->
+<!--		from information_schema.columns where table_schema = (select-->
+<!--		database()) and table_name = (#{tableName})-->
+<!--		order by ordinal_position-->
+<!--	</select>-->
 
 </mapper>

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/tools/gen/GenTableMapper.xml

@@ -2,124 +2,124 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.tools.gen.GenTableMapper">
 	
-	<resultMap type="GenTable" id="GenTableResult">
-	    <id     property="tableId"        column="table_id"        />
-		<result property="tableName"      column="table_name"      />
-		<result property="tableComment"   column="table_comment"   />
-		<result property="className"      column="class_name"      />
-		<result property="tplCategory"    column="tpl_category"    />
-		<result property="packageName"    column="package_name"    />
-		<result property="moduleName"     column="module_name"     />
-		<result property="businessName"   column="business_name"   />
-		<result property="functionName"   column="function_name"   />
-		<result property="functionAuthor" column="function_author" />
-		<result property="options"        column="options"         />
-		<result property="createBy"       column="create_by"       />
-		<result property="createTime"     column="create_time"     />
-		<result property="updateBy"       column="update_by"       />
-		<result property="updateTime"     column="update_time"     />
-		<result property="remark"         column="remark"          />
-		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
-	</resultMap>
-	
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
-        <id     property="columnId"       column="column_id"      />
-        <result property="tableId"        column="table_id"       />
-        <result property="columnName"     column="column_name"    />
-        <result property="columnComment"  column="column_comment" />
-        <result property="columnType"     column="column_type"    />
-        <result property="javaType"       column="java_type"      />
-        <result property="javaField"      column="java_field"     />
-        <result property="isPk"           column="is_pk"          />
-        <result property="isIncrement"    column="is_increment"   />
-        <result property="isRequired"     column="is_required"    />
-        <result property="isInsert"       column="is_insert"      />
-        <result property="isEdit"         column="is_edit"        />
-        <result property="isList"         column="is_list"        />
-        <result property="isQuery"        column="is_query"       />
-        <result property="queryType"      column="query_type"     />
-        <result property="htmlType"       column="html_type"      />
-        <result property="dictType"       column="dict_type"      />
-        <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
-        <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
-        <result property="updateTime"     column="update_time"    />
-    </resultMap>
-	<sql id="selectDictTypeVo">
-		SELECT
-			table_id AS tableId,
-			`table_name` AS tableName,
-			table_comment AS tableComment,
-			class_name AS className,
-			tpl_category AS tplCategory,
-			package_name AS packageName,
-			module_name AS moduleName,
-			business_name AS businessName,
-			function_name AS functionName,
-			function_author AS functionAuthor,
-			create_by AS createBy,
-			create_time AS createTime,
-			update_by AS updateBy,
-			update_time AS updateTime,
-			`options` 
-		FROM
-			sys_gen_table 
-	</sql>
-	<select id="selectDbTableListByNames" resultMap="GenTableResult">
-		SELECT
-			table_name,
-			table_comment,
-			create_time,
-			update_time
-		FROM
-			information_schema.TABLES 
-		WHERE
-			table_schema = ( SELECT DATABASE ( ) ) 
-			AND table_name NOT LIKE 'qrtz_%' 
-			AND table_name NOT LIKE 'gen_%' 
-			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )	
-			AND table_name in 
-			<foreach  item="item" collection="array" index="index"  open="(" separator="," close=")">
-			#{item}
-			</foreach>
-	</select>
-	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">
-		SELECT
-			table_name,
-			table_comment,
-			create_time,
-			update_time
-		FROM
-			information_schema.TABLES 
-		WHERE
-			table_schema = ( SELECT DATABASE ( ) ) 
-			AND table_name NOT LIKE 'qrtz_%' 
-			AND table_name NOT LIKE 'gen_%' 
-			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )	
-		<if test="tableName != null and tableName != ''">
-			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
-		</if>
-		<if test="tableComment != null and tableComment != ''">
-			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-		</if>
-	</select>
-	<select id="selectDbTableCount" parameterType="GenTable" resultType="java.lang.Integer">
-		SELECT
-			COUNT(*)
-		FROM
-			information_schema.TABLES 
-		WHERE
-			table_schema = ( SELECT DATABASE ( ) ) 
-			AND table_name NOT LIKE 'qrtz_%' 
-			AND table_name NOT LIKE 'gen_%' 
-			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )	
-		<if test="tableName != null and tableName != ''">
-			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))
-		</if>
-		<if test="tableComment != null and tableComment != ''">
-			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
-		</if>
-	</select>
+<!--	<resultMap type="GenTable" id="GenTableResult">-->
+<!--	    <id     property="tableId"        column="table_id"        />-->
+<!--		<result property="tableName"      column="table_name"      />-->
+<!--		<result property="tableComment"   column="table_comment"   />-->
+<!--		<result property="className"      column="class_name"      />-->
+<!--		<result property="tplCategory"    column="tpl_category"    />-->
+<!--		<result property="packageName"    column="package_name"    />-->
+<!--		<result property="moduleName"     column="module_name"     />-->
+<!--		<result property="businessName"   column="business_name"   />-->
+<!--		<result property="functionName"   column="function_name"   />-->
+<!--		<result property="functionAuthor" column="function_author" />-->
+<!--		<result property="options"        column="options"         />-->
+<!--		<result property="createBy"       column="create_by"       />-->
+<!--		<result property="createTime"     column="create_time"     />-->
+<!--		<result property="updateBy"       column="update_by"       />-->
+<!--		<result property="updateTime"     column="update_time"     />-->
+<!--		<result property="remark"         column="remark"          />-->
+<!--		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />-->
+<!--	</resultMap>-->
+<!--	-->
+<!--	<resultMap type="GenTableColumn" id="GenTableColumnResult">-->
+<!--        <id     property="columnId"       column="column_id"      />-->
+<!--        <result property="tableId"        column="table_id"       />-->
+<!--        <result property="columnName"     column="column_name"    />-->
+<!--        <result property="columnComment"  column="column_comment" />-->
+<!--        <result property="columnType"     column="column_type"    />-->
+<!--        <result property="javaType"       column="java_type"      />-->
+<!--        <result property="javaField"      column="java_field"     />-->
+<!--        <result property="isPk"           column="is_pk"          />-->
+<!--        <result property="isIncrement"    column="is_increment"   />-->
+<!--        <result property="isRequired"     column="is_required"    />-->
+<!--        <result property="isInsert"       column="is_insert"      />-->
+<!--        <result property="isEdit"         column="is_edit"        />-->
+<!--        <result property="isList"         column="is_list"        />-->
+<!--        <result property="isQuery"        column="is_query"       />-->
+<!--        <result property="queryType"      column="query_type"     />-->
+<!--        <result property="htmlType"       column="html_type"      />-->
+<!--        <result property="dictType"       column="dict_type"      />-->
+<!--        <result property="sort"           column="sort"           />-->
+<!--        <result property="createBy"       column="create_by"      />-->
+<!--        <result property="createTime"     column="create_time"    />-->
+<!--        <result property="updateBy"       column="update_by"      />-->
+<!--        <result property="updateTime"     column="update_time"    />-->
+<!--    </resultMap>-->
+<!--	<sql id="selectDictTypeVo">-->
+<!--		SELECT-->
+<!--			table_id AS tableId,-->
+<!--			`table_name` AS tableName,-->
+<!--			table_comment AS tableComment,-->
+<!--			class_name AS className,-->
+<!--			tpl_category AS tplCategory,-->
+<!--			package_name AS packageName,-->
+<!--			module_name AS moduleName,-->
+<!--			business_name AS businessName,-->
+<!--			function_name AS functionName,-->
+<!--			function_author AS functionAuthor,-->
+<!--			create_by AS createBy,-->
+<!--			create_time AS createTime,-->
+<!--			update_by AS updateBy,-->
+<!--			update_time AS updateTime,-->
+<!--			`options` -->
+<!--		FROM-->
+<!--			sys_gen_table -->
+<!--	</sql>-->
+<!--	<select id="selectDbTableListByNames" resultMap="GenTableResult">-->
+<!--		SELECT-->
+<!--			table_name,-->
+<!--			table_comment,-->
+<!--			create_time,-->
+<!--			update_time-->
+<!--		FROM-->
+<!--			information_schema.TABLES -->
+<!--		WHERE-->
+<!--			table_schema = ( SELECT DATABASE ( ) ) -->
+<!--			AND table_name NOT LIKE 'qrtz_%' -->
+<!--			AND table_name NOT LIKE 'gen_%' -->
+<!--			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )	-->
+<!--			AND table_name in -->
+<!--			<foreach  item="item" collection="array" index="index"  open="(" separator="," close=")">-->
+<!--			#{item}-->
+<!--			</foreach>-->
+<!--	</select>-->
+<!--	<select id="selectDbTableList" parameterType="GenTable" resultMap="GenTableResult">-->
+<!--		SELECT-->
+<!--			table_name,-->
+<!--			table_comment,-->
+<!--			create_time,-->
+<!--			update_time-->
+<!--		FROM-->
+<!--			information_schema.TABLES -->
+<!--		WHERE-->
+<!--			table_schema = ( SELECT DATABASE ( ) ) -->
+<!--			AND table_name NOT LIKE 'qrtz_%' -->
+<!--			AND table_name NOT LIKE 'gen_%' -->
+<!--			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )	-->
+<!--		<if test="tableName != null and tableName != ''">-->
+<!--			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))-->
+<!--		</if>-->
+<!--		<if test="tableComment != null and tableComment != ''">-->
+<!--			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))-->
+<!--		</if>-->
+<!--	</select>-->
+<!--	<select id="selectDbTableCount" parameterType="GenTable" resultType="java.lang.Integer">-->
+<!--		SELECT-->
+<!--			COUNT(*)-->
+<!--		FROM-->
+<!--			information_schema.TABLES -->
+<!--		WHERE-->
+<!--			table_schema = ( SELECT DATABASE ( ) ) -->
+<!--			AND table_name NOT LIKE 'qrtz_%' -->
+<!--			AND table_name NOT LIKE 'gen_%' -->
+<!--			AND table_name NOT IN ( SELECT table_name FROM sys_gen_table )	-->
+<!--		<if test="tableName != null and tableName != ''">-->
+<!--			AND lower(table_name) like lower(concat('%', #{tableName}, '%'))-->
+<!--		</if>-->
+<!--		<if test="tableComment != null and tableComment != ''">-->
+<!--			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))-->
+<!--		</if>-->
+<!--	</select>-->
 	
 </mapper>

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/wuye/WuyeAmountInfoMapper.xml

@@ -4,35 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.wuye.WuyeAmountInfoMapper">
     
-    <resultMap type="WuyeAmountInfo" id="WuyeAmountInfoResult">
-      <result property="id" column="id"/>
-      <result property="buildingNo" column="building_no"/>
-      <result property="unitNo" column="unit_no"/>
-      <result property="floor" column="floor"/>
-      <result property="sourceNumber" column="source_number"/>
-      <result property="householder" column="householder"/>
-      <result property="predictedArea" column="predicted_area"/>
-      <result property="actualMoney" column="actual_money"/>
-      <result property="propertyFee" column="property_fee"/>
-      <result property="elevatorFee" column="elevator_fee"/>
-      <result property="parkingSpace" column="parking_space"/>
-      <result property="cheweiNo" column="chewei_no"/>
-      <result property="garage" column="garage"/>
-      <result property="garageNo" column="garage_no"/>
-      <result property="warehouse" column="warehouse"/>
-      <result property="warehouseNo" column="warehouse_no"/>
-      <result property="garbageClearing" column="garbage_clearing"/>
-      <result property="paymentDate" column="payment_date"/>
-      <result property="paymentMethod" column="payment_method"/>
-      <result property="totalActualPayment" column="total_actual_payment"/>
-      <result property="paymentRange" column="payment_range"/>
-      <result property="remark" column="remark"/>
-      <result property="deleteFlag" column="delete_flag"/>
-      <result property="gmtCreate" column="gmt_create"/>
-      <result property="gmtUpdate" column="gmt_update"/>
-      <result property="userId" column="user_id"/>
-      <result property="adminId" column="admin_id"/>
-    </resultMap>
 
 
 </mapper>

wuyeH5/pages/pay/pay.vue

@@ -56,7 +56,7 @@
 					wuyeAmountInfo: JSON.stringify({
 						id: this.id,
 						totalActualPayment: this.price,
-						paymentMethod:'在线扫码支付'
+						paymentMethod:'在线扫码支付',
 					})
 				}, failres => {
 					this.$refs.uToast.show({