Browse Source

[A端][修复]:解单显示更改,显示未解单商户

release_toaliyun_real
hupeng 7 years ago
parent
commit
5ef412c71d
2 changed files with 9 additions and 9 deletions
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java
  2. +8
    -9
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java View File

@@ -40,6 +40,7 @@ public class WxMerchantTradeDailyController extends BaseController {
cal.add(Calendar.DAY_OF_YEAR, -1);
SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd");
wxMerchantTradeDaily.setReportDate(fmt.format(cal.getTime()));
wxMerchantTradeDaily.setSortColumns(WxMerchantTradeDailyVo.Field.CreateDate_DESC);
final PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize);
return new ResultData(page);
}


+ 8
- 9
mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml View File

@@ -105,13 +105,16 @@
</resultMap>

<sql id="allColumnsVo">
mtd.id as id, mtd.tenant_id as tenant_id, mtd.merchant_id as merchant_id, mtd.b_user_id as b_user_id,`trade_amt`,mtd.create_date as create_date,mtd.update_date as update_date,`report_date`, m.name as merchant_name, mbu.name as b_user_name, mbu.phone as b_user_phone
mtd.id as id, m.tenant_id as tenant_id, m.id as merchant_id, mtd.b_user_id as b_user_id, mtd.trade_amt as trade_amt, mtd.create_date as create_date,mtd.update_date as update_date,mtd.report_date as report_date, m.name as merchant_name, mbu.name as b_user_name, mbu.phone as b_user_phone
</sql>

<select id="findListVo" parameterType="com.iformall.domain.vo.WxMerchantTradeDailyVo" resultMap="BaseResultMapVo">
select <include refid="allColumnsVo" />
from wx_merchant_trade_daily mtd
inner join wx_merchant m on mtd.merchant_id = m.id
from wx_merchant m
left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id
<if test=" reportDate!=null">
and mtd.report_date = #{reportDate}
</if>
left join wx_merchant_b_user mbu on mtd.b_user_id = mbu.id

where 1=1
@@ -120,16 +123,12 @@
and m.name like concat('%', #{merchantName},'%')
</if>

<if test=" reportDate!=null">
and mtd.report_date = #{reportDate}
</if>

<if test=" null != tenantId ">
and mtd.tenant_id = #{tenantId}
and m.tenant_id = #{tenantId}
</if>

<if test=" null != merchantId ">
and mtd.merchant_id = #{merchantId}
and m.id = #{merchantId}
</if>

<if test=" null != sortColumns"> order by ${sortColumns} </if>


Loading…
Cancel
Save