Просмотр исходного кода

[优化合同][修改][开发优化合同需求]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
944057605d
5 измененных файлов: 21 добавлений и 15 удалений
  1. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  3. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  4. +3
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
  5. +12
    -10
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Просмотреть файл

@@ -92,6 +92,11 @@ public class WxRentContractController extends BaseController {
return wxRentContractService.update(wxRentContract, user.getId(),user.getName());
}

/**
* 防止前端3秒重复提交
* @param wxRentContract
* @return
*/
@PostMapping("updateMoney")
@SystemControllerLog(description = "租赁合同-更新金额")
public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) {


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java Просмотреть файл

@@ -142,7 +142,7 @@ public class WxCUserBasicInfoController extends BaseController {

if (page.getSize() > 0) {
for (WxCUserBasicInfo info : page.getList()) {
setUserInfoLevel(info);
// setUserInfoLevel(info);
setUserInfoCarCount(info);
}
}


+ 0
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Просмотреть файл

@@ -1,12 +1,9 @@
package com.iformall.domain.po;

import com.iformall.common.SortColumn;
import io.swagger.models.auth.In;

import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;


+ 3
- 1
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Просмотреть файл

@@ -495,7 +495,7 @@
<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,
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.propertyOwe/100,2) propertyOwe,
@@ -585,6 +585,8 @@
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_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}
<if test=" null != month and ''!=month">
and date_format(bill.receive_date,'%Y-%m')=#{month}


+ 12
- 10
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml Просмотреть файл

@@ -23,7 +23,8 @@

<sql id="allColumns">
`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 id="dynamicWhereConditions">
@@ -84,11 +85,6 @@
<if test=" null != name ">
and `name` like concat('%', #{name},'%')
</if>
<if test=" null != level ">
<if test=" '' != level ">
and `level` like concat('%', #{level},'%')
</if>
</if>
<if test=" null != startTime and null!=endTime">
and `create_date` between #{startTime} and #{endTime}
</if>
@@ -102,10 +98,16 @@
</sql>

<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>

<sql id="allUserColumns">


Загрузка…
Отмена
Сохранить