| @@ -92,6 +92,11 @@ public class WxRentContractController extends BaseController { | |||||
| return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); | return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); | ||||
| } | } | ||||
| /** | |||||
| * 防止前端3秒重复提交 | |||||
| * @param wxRentContract | |||||
| * @return | |||||
| */ | |||||
| @PostMapping("updateMoney") | @PostMapping("updateMoney") | ||||
| @SystemControllerLog(description = "租赁合同-更新金额") | @SystemControllerLog(description = "租赁合同-更新金额") | ||||
| public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) { | public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) { | ||||
| @@ -142,7 +142,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| if (page.getSize() > 0) { | if (page.getSize() > 0) { | ||||
| for (WxCUserBasicInfo info : page.getList()) { | for (WxCUserBasicInfo info : page.getList()) { | ||||
| setUserInfoLevel(info); | |||||
| // setUserInfoLevel(info); | |||||
| setUserInfoCarCount(info); | setUserInfoCarCount(info); | ||||
| } | } | ||||
| } | } | ||||
| @@ -1,12 +1,9 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.iformall.common.SortColumn; | import com.iformall.common.SortColumn; | ||||
| import io.swagger.models.auth.In; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| import java.io.Serializable; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -495,7 +495,7 @@ | |||||
| <select id="getOweBillAsPage" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap"> | <select id="getOweBillAsPage" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap"> | ||||
| select bill.tenant_id tenantId,bill.merchant_id merchantId,m.name merchantName,bill.bill_type billType, | select bill.tenant_id tenantId,bill.merchant_id merchantId,m.name merchantName,bill.bill_type billType, | ||||
| m.link_phone managerPhone,m.`link_person` manager,m.email, | m.link_phone managerPhone,m.`link_person` manager,m.email, | ||||
| bill.receive_date receiveDate,DATEDIFF(now(),bill.receive_date) expiredDay,ws.building,ws.floor, | |||||
| bill.receive_date receiveDate,DATEDIFF(now(),bill.receive_date) expiredDay,mb.building_name building,mf.floor_name floor, | |||||
| round(bill.rentOwe/100,2) rentOwe, | round(bill.rentOwe/100,2) rentOwe, | ||||
| round(bill.propertyOwe/100,2) propertyOwe, | round(bill.propertyOwe/100,2) propertyOwe, | ||||
| @@ -585,6 +585,8 @@ | |||||
| left join wx_merchant m on bill.merchant_id=m.id | left join wx_merchant m on bill.merchant_id=m.id | ||||
| left join wx_merchant_shop ms on ms.`merchant_id` = m.id | left join wx_merchant_shop ms on ms.`merchant_id` = m.id | ||||
| left join wx_shop ws on ms.`shop_id` = ws.id | left join wx_shop ws on ms.`shop_id` = ws.id | ||||
| left join wx_mall_building mb on ws.building = mb.id | |||||
| left join wx_mall_floor mf on ws.floor = mf.id | |||||
| where m.status=1 and m.tenant_id = #{tenantId} | where m.status=1 and m.tenant_id = #{tenantId} | ||||
| <if test=" null != month and ''!=month"> | <if test=" null != month and ''!=month"> | ||||
| and date_format(bill.receive_date,'%Y-%m')=#{month} | and date_format(bill.receive_date,'%Y-%m')=#{month} | ||||
| @@ -23,7 +23,8 @@ | |||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`, | `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`, | ||||
| `create_date`,`update_date`,`tenant_id`,`name`,`level`,`nick_name`,`credit`,`active_time` | |||||
| `create_date`,`update_date`,`tenant_id`,`name`,`nick_name`,`credit`,`active_time` | |||||
| ,(select level from wx_level_config where discount_enable=1 and poins >= points order by points desc limit 1 ) level | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -84,11 +85,6 @@ | |||||
| <if test=" null != name "> | <if test=" null != name "> | ||||
| and `name` like concat('%', #{name},'%') | and `name` like concat('%', #{name},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != level "> | |||||
| <if test=" '' != level "> | |||||
| and `level` like concat('%', #{level},'%') | |||||
| </if> | |||||
| </if> | |||||
| <if test=" null != startTime and null!=endTime"> | <if test=" null != startTime and null!=endTime"> | ||||
| and `create_date` between #{startTime} and #{endTime} | and `create_date` between #{startTime} and #{endTime} | ||||
| </if> | </if> | ||||
| @@ -102,10 +98,16 @@ | |||||
| </sql> | </sql> | ||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCUserBasicInfo" resultMap="BaseResultMap"> | <select id="findList" parameterType="com.iformall.domain.po.WxCUserBasicInfo" resultMap="BaseResultMap"> | ||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from wx_c_user_basic_info | |||||
| <include refid="dynamicWhereConditions"/> | |||||
| select r.* from ( | |||||
| select | |||||
| <include refid="allColumns"/> | |||||
| from wx_c_user_basic_info | |||||
| <include refid="dynamicWhereConditions"/> | |||||
| ) r where 1=1 | |||||
| <if test="null != level and '' != level"> | |||||
| and r.level =#{level} | |||||
| </if> | |||||
| </select> | </select> | ||||
| <sql id="allUserColumns"> | <sql id="allUserColumns"> | ||||