Przeglądaj źródła

[租金管理][修改]修改业务逻辑

release_toaliyun_real
gongbiao 7 lat temu
rodzic
commit
d6d4935397
3 zmienionych plików z 7 dodań i 7 usunięć
  1. +3
    -3
      mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
  3. +3
    -3
      mallinkService/src/main/resources/mapper/WxShopMapper.xml

+ 3
- 3
mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java Wyświetl plik

@@ -45,7 +45,7 @@ public class WxBillRent implements Serializable {


/*商铺ID**/ /*商铺ID**/
@io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId")
private Integer shopId;
private Long shopId;
/*使用面积**/ /*使用面积**/
@io.swagger.annotations.ApiModelProperty(value="使用面积",name="userArea") @io.swagger.annotations.ApiModelProperty(value="使用面积",name="userArea")
private BigDecimal userArea; private BigDecimal userArea;
@@ -104,10 +104,10 @@ public class WxBillRent implements Serializable {
this.shopNumber = shopNumber; this.shopNumber = shopNumber;
} }


public Integer getShopId() {
public Long getShopId() {
return shopId; return shopId;
} }
public void setShopId(Integer _shopId) {
public void setShopId(Long _shopId) {
shopId = _shopId; shopId = _shopId;
} }
public BigDecimal getUserArea() { public BigDecimal getUserArea() {


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml Wyświetl plik

@@ -81,7 +81,7 @@
<if test=" null != payWay "> and br.`pay_way` = #{payWay} </if> <if test=" null != payWay "> and br.`pay_way` = #{payWay} </if>
<if test=" null != receiptNum "> and br.`receipt_num` = #{receiptNum} </if> <if test=" null != receiptNum "> and br.`receipt_num` = #{receiptNum} </if>
<if test=" null != tenantId "> and br.`tenant_id` = #{tenantId} </if> <if test=" null != tenantId "> and br.`tenant_id` = #{tenantId} </if>
<if test=" null != shopNumber "> and s.`shop_number` = #{shopNumber} </if>
<if test=" null != shopNumber and ''!=shopNumber"> and s.`shop_number` = #{shopNumber} </if>
<if test=" null != payStatus "> and br.`pay_status` = #{payStatus} </if> <if test=" null != payStatus "> and br.`pay_status` = #{payStatus} </if>
<if test=" null != ids "> <if test=" null != ids ">


+ 3
- 3
mallinkService/src/main/resources/mapper/WxShopMapper.xml Wyświetl plik

@@ -228,16 +228,16 @@


<select id="getbshoplist" resultType="hashmap" parameterType="hashmap"> <select id="getbshoplist" resultType="hashmap" parameterType="hashmap">
select id,shop_number shopNumber from wx_shop select id,shop_number shopNumber from wx_shop
where tenant_id=#{tenantId} and shop_number like concat('%', ${shopNumber},'%')
where tenant_id=#{tenantId} and shop_number = #{shopNumber}
</select> </select>
<select id="getMerchantShopByShopId" resultType="hashmap" parameterType="hashmap"> <select id="getMerchantShopByShopId" resultType="hashmap" parameterType="hashmap">
select m.`name` merchantName,s.build_area buildArea,s.operation_area operationArea, select m.`name` merchantName,s.build_area buildArea,s.operation_area operationArea,
c.price,c.receive_period receivePeriod
c.price,c.receive_period receivePeriod,s.shop_number shopNumber
from wx_merchant_shop ms inner join wx_merchant m on ms.merchant_id=m.id from wx_merchant_shop ms inner join wx_merchant m on ms.merchant_id=m.id
inner join wx_shop s on ms.shop_id=s.id inner join wx_shop s on ms.shop_id=s.id
inner join wx_rent_contract c on ms.merchant_id=c.merchant_id inner join wx_rent_contract c on ms.merchant_id=c.merchant_id
where ms.tenant_id=${tenantId} and ms.shop_id=${shopId} and ms.is_del=0
where ms.tenant_id=#{tenantId} and ms.shop_id=#{shopId} and ms.is_del=0
</select> </select>


</mapper> </mapper>

Ładowanie…
Anuluj
Zapisz