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

[账单][修改][排序]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
0347dbe51b
8 измененных файлов: 10 добавлений и 10 удалений
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml
  6. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml
  7. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml
  8. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -88,9 +88,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
//关联的店铺
if (wxRentContract.getShopId() != null) {
List<WxShop> list = new ArrayList<>();
WxShop wxShop = wxShopMapper.selectByPrimaryKey(wxRentContract.getShopId());
list.add(wxShop);
WxShop record = new WxShop();
record.setId(wxRentContract.getShopId());
List<Map<String, Object>> list = wxShopMapper.findListMap(record);
result.put("wxShops", list);
} else {
result.put("wxShops", Collections.EMPTY_LIST);


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

@@ -29,7 +29,7 @@
<if test=" null != merchantName and ''!=merchantName ">and m.`name` like concat('%',#{merchantName},'%')</if>
<if test=" null != billTypeValue ">and bill.bill_type_value = #{billTypeValue}</if>
<if test=" null != status ">and bill.`status` = #{status}</if>
order by bill.id,bill.merchant_id
order by bill.id desc,bill.merchant_id,bill.status,bill.receive_date desc
</select>


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

@@ -74,7 +74,7 @@
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != type ">and br.`type` = #{type}</if>
</where>
order by id
order by id desc
</select>
<update id="updateNotPaidStatus" parameterType="hashmap">


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

@@ -75,7 +75,7 @@
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
</where>
order by id
order by id desc
</select>
<select id="queryPayInfo" resultType="hashmap" parameterType="hashmap">


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

@@ -75,7 +75,7 @@
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
<if test=" null != name ">and br.`name` = #{name}</if>
</where>
order by id
order by id desc
</select>
<update id="updateNotPaidStatus" parameterType="hashmap">


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

@@ -74,7 +74,7 @@
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
</where>
order by id
order by id desc
</select>
<select id="queryPayInfo" resultType="hashmap" parameterType="hashmap">


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

@@ -74,7 +74,7 @@
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
</where>
order by id
order by id desc
</select>
<select id="queryPayInfo" resultType="hashmap" parameterType="hashmap">


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

@@ -81,7 +81,7 @@
<if test=" null != isDel ">and br.`is_del` = #{isDel}</if>
</where>
order by id
order by id desc
</select>
<select id="queryPayInfo" resultType="hashmap" parameterType="hashmap">


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