| @@ -88,9 +88,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| } | } | ||||
| //关联的店铺 | //关联的店铺 | ||||
| if (wxRentContract.getShopId() != null) { | 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); | result.put("wxShops", list); | ||||
| } else { | } else { | ||||
| result.put("wxShops", Collections.EMPTY_LIST); | result.put("wxShops", Collections.EMPTY_LIST); | ||||
| @@ -29,7 +29,7 @@ | |||||
| <if test=" null != merchantName and ''!=merchantName ">and m.`name` like concat('%',#{merchantName},'%')</if> | <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 != billTypeValue ">and bill.bill_type_value = #{billTypeValue}</if> | ||||
| <if test=" null != status ">and bill.`status` = #{status}</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> | </select> | ||||
| @@ -74,7 +74,7 @@ | |||||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | ||||
| <if test=" null != type ">and br.`type` = #{type}</if> | <if test=" null != type ">and br.`type` = #{type}</if> | ||||
| </where> | </where> | ||||
| order by id | |||||
| order by id desc | |||||
| </select> | </select> | ||||
| <update id="updateNotPaidStatus" parameterType="hashmap"> | <update id="updateNotPaidStatus" parameterType="hashmap"> | ||||
| @@ -75,7 +75,7 @@ | |||||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | ||||
| </where> | </where> | ||||
| order by id | |||||
| order by id desc | |||||
| </select> | </select> | ||||
| <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | ||||
| @@ -75,7 +75,7 @@ | |||||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | ||||
| <if test=" null != name ">and br.`name` = #{name}</if> | <if test=" null != name ">and br.`name` = #{name}</if> | ||||
| </where> | </where> | ||||
| order by id | |||||
| order by id desc | |||||
| </select> | </select> | ||||
| <update id="updateNotPaidStatus" parameterType="hashmap"> | <update id="updateNotPaidStatus" parameterType="hashmap"> | ||||
| @@ -74,7 +74,7 @@ | |||||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | ||||
| </where> | </where> | ||||
| order by id | |||||
| order by id desc | |||||
| </select> | </select> | ||||
| <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | ||||
| @@ -74,7 +74,7 @@ | |||||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | ||||
| </where> | </where> | ||||
| order by id | |||||
| order by id desc | |||||
| </select> | </select> | ||||
| <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | ||||
| @@ -81,7 +81,7 @@ | |||||
| <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | <if test=" null != isDel ">and br.`is_del` = #{isDel}</if> | ||||
| </where> | </where> | ||||
| order by id | |||||
| order by id desc | |||||
| </select> | </select> | ||||
| <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | <select id="queryPayInfo" resultType="hashmap" parameterType="hashmap"> | ||||