Browse Source

xingxingdiandeng

release_toaliyun_real
xhxu 5 years ago
parent
commit
78ca93d628
3 changed files with 28 additions and 17 deletions
  1. +4
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
  2. +10
    -3
      mallinkService/src/main/resources/mapper/WxBillRentMapper.xml
  3. +14
    -9
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 4
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java View File

@@ -162,11 +162,10 @@ public class WxShopServiceImpl implements WxShopService {
updateMerchantShop.setIsDel(EnumDelStatus.DEL.getCode());
wxMerchantShopMapper.updateById(updateMerchantShop);
}
}
//else {
//无关联商铺直接删除
//wxShopMapper.deleteById(id);
//}
} else {
// 无关联商铺直接删除
wxShopMapper.deleteById(id);
}
return new ResultData(Result.SUCCESS, "删除成功");
}



+ 10
- 3
mallinkService/src/main/resources/mapper/WxBillRentMapper.xml View File

@@ -144,15 +144,22 @@
<select id="queryPayInfo" resultType="hashmap" parameterType="hashmap">
select IFNULL(sum(receive_pay),0) receivepay,IFNULL(sum(pay),0) pay,tenant_id from wx_bill_rent
where is_preview = 0
and receive_date between #{startdate} and #{enddate}
and status!=6
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
</if>
and receive_date between #{startdate} and #{enddate}
and status!=6
group by tenant_id
<if test=" null != tenantId and '' != tenantId">
group by tenant_id
</if>

<if test=" null == tenantId or '' == tenantId">
group by parent_tenant_id
</if>

</select>

<select id="queryPayInfoTotal" resultType="hashmap" parameterType="hashmap">


+ 14
- 9
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml View File

@@ -201,29 +201,34 @@
</select>

<select id="findListVo2" parameterType="com.iformall.domain.po.WxMerchant" resultMap="BaseResultMap">
select * from wx_merchant where 1=1 and is_del=0
select distinct wm.* from wx_merchant wm
left join wx_merchant_b_user wmbu on wmbu.merchant_id = wm.id
where 1=1 and wm.is_del=0
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
and wm.`tenant_id` = #{tenantId}
</if>
<if test=" null != parentTenantId and '' != parentTenantId">
and `parent_tenant_id` = #{parentTenantId}
and wm.`parent_tenant_id` = #{parentTenantId}
</if>
<if test=" null != name and ''!=name ">
and `name` like concat('%', #{name},'%')
and wm.`name` like concat('%', #{name},'%')
</if>
<if test=" null != linkPhone and ''!=linkPhone ">
and `link_phone` like concat('%', #{linkPhone},'%')
and wm.`link_phone` like concat('%', #{linkPhone},'%')
</if>
<if test=" null != phone and ''!=phone ">
and wmbu.`phone` like concat('%', #{phone},'%')
</if>
<if test=" null != businessId ">
and `business_id` = #{businessId}
and wm.`business_id` = #{businessId}
</if>
<if test=" null != status ">
and `status` = #{status}
and wm.`status` = #{status}
</if>
<if test=" null != type ">
and `type` = #{type}
and wm.`type` = #{type}
</if>
order by create_date desc
order by wm.create_date desc
</select>
<sql id="dataRule">


Loading…
Cancel
Save