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

[解单][修复]:导出增加业态字段,增加时间段控制

release_toaliyun_real
hupeng 6 лет назад
Родитель
Сommit
bf4f911295
8 измененных файлов: 133 добавлений и 138 удалений
  1. +9
    -25
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +6
    -0
      mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java
  3. +5
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java
  4. +47
    -19
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java
  5. +1
    -3
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java
  6. +4
    -4
      mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java
  7. +36
    -37
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
  8. +25
    -48
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

+ 9
- 25
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java Просмотреть файл

@@ -30,14 +30,6 @@ public class WxMerchantTradeDailyController extends BaseController {
@Autowired
private WxMerchantTradeDailyService wxMerchantTradeDailyService;

@ApiOperation("获得指定日期的解单,默认不传reportDate为当天")
@GetMapping("/getVolume")
@SystemControllerLog(description = "解单-获得指定日期的解单")
public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) {
wxMerchantTradeDaily.setTenantId(getTenantId());
return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getUser().getId());
}


@ApiOperation("获得解单列表")
@GetMapping("/list")
@@ -45,18 +37,14 @@ public class WxMerchantTradeDailyController extends BaseController {
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "商户-获得昨日解单列表")
public ResultData list(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily, Integer pageNum, Integer pageSize) {
public ResultData list(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday");

if (wxMerchantTradeDaily == null)
wxMerchantTradeDaily = new WxMerchantTradeDailyVo();
wxMerchantTradeDaily = new WxMerchantTradeDaily();
wxMerchantTradeDaily.setTenantId(getTenantId());

if (wxMerchantTradeDaily.getReportDate() == null) {
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
wxMerchantTradeDaily.setReportDate(fmt.format(new Date()));
}
wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.MerchantId_DESC);
wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC);
PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize);

return new ResultData(page);
@@ -81,7 +69,7 @@ public class WxMerchantTradeDailyController extends BaseController {
@ApiOperation("更新解单数据")
@PostMapping("/update")
@SystemControllerLog(description = "商户-更新解单数据")
public ResultData update(@RequestBody WxMerchantTradeDailyVo wxMerchantTradeDaily) {
public ResultData update(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::updateYesterday");
if (wxMerchantTradeDaily == null ||
wxMerchantTradeDaily.getMerchantId() == null ||
@@ -98,7 +86,7 @@ public class WxMerchantTradeDailyController extends BaseController {
@ApiOperation("查询解单数据")
@GetMapping("/queryTradeDaily")
@SystemControllerLog(description = "商户-查询解单数据")
public ResultData queryTradeDaily(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily) {
public ResultData queryTradeDaily(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::queryTradeDaily");
wxMerchantTradeDaily.setTenantId(getTenantId());
return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily);
@@ -106,17 +94,13 @@ public class WxMerchantTradeDailyController extends BaseController {

@GetMapping("exportData")
@SystemControllerLog(description = "商户解单数据-导出数据")
public void exportData(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response) {
public void exportData(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::exportData");
if (null == wxMerchantTradeDaily) {
wxMerchantTradeDaily = new WxMerchantTradeDailyVo();
wxMerchantTradeDaily = new WxMerchantTradeDaily();
}
wxMerchantTradeDaily.setTenantId(getTenantId());
if (wxMerchantTradeDaily.getReportDate() == null) {
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
wxMerchantTradeDaily.setReportDate(fmt.format(new Date()));
}
wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.MerchantId_DESC);

wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC);
wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response);
}



+ 6
- 0
mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java Просмотреть файл

@@ -166,6 +166,12 @@ public class BaseEntity implements Serializable {

Date_ASC("`date` ASC"),
Date_DESC("`date` DESC"),

TradeAmt_ASC("`trade_amt` ASC"),
TradeAmt_DESC("`trade_amt` DESC"),

ReportDate_ASC("`report_date` ASC"),
ReportDate_DESC("`report_date` DESC"),
;
private String value;


+ 5
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java Просмотреть файл

@@ -59,15 +59,18 @@ public class WxMerchantTradeDaily extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "凭证", name = "proof")
private String proof;
@io.swagger.annotations.ApiModelProperty(value = "月份如2019-05", name = "month")

@Transient
private String month;

@Transient
private String starttime;
private String startTime;

@Transient
private String endtime;
private String endTime;

@Transient
private String merchantName;

public Integer getTradeAmtInteger(){
if (StringUtils.isBlank(tradeAmt)){


+ 47
- 19
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java Просмотреть файл

@@ -2,6 +2,8 @@ package com.iformall.domain.vo;

import cn.afterturn.easypoi.excel.annotation.Excel;
import com.iformall.domain.po.BaseEntity;
import com.iformall.enums.EnumBusiness;
import com.iformall.enums.EnumSubBusiness;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
@@ -12,6 +14,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

@Data
@ToString(callSuper = true)
@@ -91,33 +94,58 @@ public class WxMerchantTradeDailyVo extends BaseEntity {
private String proof;


@Transient
private List<WxShopVo> shopVos;

@Transient
@Excel(name = "商铺", width = 20, orderNum = "10")
private String shopsStr;

@Transient
private Integer isToday;

public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC"),
TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"),
MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"),
TradeAmt_ASC("`trade_amt` ASC"), TradeAmt_DESC("`trade_amt` DESC"),
CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC")
;
private String value;

Field(String value) {
this.value = value;
}

public String getValue() {
return value;
private Integer businessId;
private Integer subBusinessId;

@Transient
@Excel(name = "业态", width = 20, orderNum = "8")
@io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId")
private String businessName;

@Transient
@Excel(name = "子业态", width = 20, orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusinessId")
private String subBusinessName;

public String getShopsStr() {
if (shopVos != null && shopVos.size() > 0) {
return String.join("\n",
shopVos.stream().map(
s->{return s.getBuildingName()+"-"+s.getFloorName()+"-"+s.getShopNumber();}
).collect(Collectors.toList()));
} else {
return null;
}
}

public void setCol(String value) {
this.value = value;
public String getBusinessName() {
if (businessId != null) {
EnumBusiness e = EnumBusiness.getEnum(businessId);
if (e != null) return e.getMessage();
else return null;
} else {
return null;
}
}

@Override
public String toString() {
return this.getValue();
public String getSubBusinessName() {
if (subBusinessId != null) {
EnumSubBusiness e = EnumSubBusiness.getEnum(subBusinessId);
if (e != null) return e.getMessage();
else return null;
} else {
return null;
}
}



+ 1
- 3
mallinkService/src/main/java/com/iformall/mapper/WxMerchantTradeDailyMapper.java Просмотреть файл

@@ -11,9 +11,7 @@ public interface WxMerchantTradeDailyMapper extends CommonMapper<WxMerchantTrade

List<WxMerchantTradeDaily> findListOfWeek(WxMerchantTradeDaily wxMerchantTradeDaily);

List<WxMerchantTradeDailyVo> findListVo(WxMerchantTradeDailyVo wxMerchantTradeDaily);

List<WxMerchantTradeDailyVo> findListVoOfMonth(WxMerchantTradeDaily wxMerchantTradeDaily);
List<WxMerchantTradeDailyVo> findVoList(WxMerchantTradeDaily wxMerchantTradeDaily);

List<WxMerchantTradeDaily> findTotalListOfMonth(WxMerchantTradeDaily wxMerchantTradeDaily);
}

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

@@ -81,11 +81,11 @@ public interface WxMerchantTradeDailyService {
* @param pageSize
* @return
*/
PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDailyVo record, Integer pageIndex, Integer pageSize);
PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize);

ResultData update(WxMerchantTradeDailyVo tradeDailyVo);
ResultData update(WxMerchantTradeDaily tradeDailyVo);

ResultData queryTradeDaily(WxMerchantTradeDailyVo wxMerchantTradeDaily);
ResultData queryTradeDaily(WxMerchantTradeDaily wxMerchantTradeDaily);

void exportData(WxMerchantTradeDailyVo wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response);
void exportData(WxMerchantTradeDaily wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response);
}

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

@@ -12,6 +12,7 @@ import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxMerchantTradeDaily;
import com.iformall.domain.vo.WxMerchantTradeDailyVo;
import com.iformall.mapper.WxMerchantTradeDailyMapper;
import com.iformall.mapper.WxShopMapper;
import com.iformall.service.*;
import com.iformall.utils.DateUtils;
import org.slf4j.Logger;
@@ -44,6 +45,10 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
@Autowired
ExcelService excelService;

@Autowired
WxShopMapper wxShopMapper;


@Override
public PageInfo<WxMerchantTradeDaily> listAsPage(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record));
@@ -126,74 +131,65 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ


@Override
public PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDailyVo record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findListVo(record));
public PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findVoList(record));
}

@Override
public ResultData update(WxMerchantTradeDailyVo tradeDailyVo) {
public ResultData update(WxMerchantTradeDaily tradeDaily) {

WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId());
wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate());
wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId());
wxMerchantTradeDaily.setReportDate(tradeDaily.getReportDate());

List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily);

if (tradeList.size() > 0) {
wxMerchantTradeDaily = tradeList.get(0);
wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()+"");
wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount());
wxMerchantTradeDaily.setProof(tradeDailyVo.getProof());
wxMerchantTradeDaily.setTradeAmt(tradeDaily.getTradeAmt()+"");
wxMerchantTradeDaily.setTradeCount(tradeDaily.getTradeCount());
wxMerchantTradeDaily.setProof(tradeDaily.getProof());
wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily);
return new ResultData(wxMerchantTradeDaily);
}

final IdWorker idWorker = IdWorker.get();
wxMerchantTradeDaily.setId(idWorker.nextId());
wxMerchantTradeDaily.setTenantId(tradeDailyVo.getTenantId());
wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId());
wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()+"");
wxMerchantTradeDaily.setTenantId(tradeDaily.getTenantId());
wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId());
wxMerchantTradeDaily.setTradeAmt(tradeDaily.getTradeAmt()+"");
wxMerchantTradeDaily.setCreateDate(new Date());
wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount());
wxMerchantTradeDaily.setProof(tradeDailyVo.getProof());
wxMerchantTradeDaily.setTradeCount(tradeDaily.getTradeCount());
wxMerchantTradeDaily.setProof(tradeDaily.getProof());
wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily);

return new ResultData(Result.SUCCESS);
}

@Override
public ResultData queryTradeDaily(WxMerchantTradeDailyVo tradeDailyVo) {
public ResultData queryTradeDaily(WxMerchantTradeDaily tradeDaily) {
WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId());
wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate());
wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId());
wxMerchantTradeDaily.setReportDate(tradeDaily.getReportDate());
List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily);
wxMerchantTradeDaily = tradeList.size() > 0 ? tradeList.get(0) : new WxMerchantTradeDaily();
return new ResultData(wxMerchantTradeDaily);
}

@Override
public void exportData(WxMerchantTradeDailyVo wxMerchantTradeDailyVo, HttpServletRequest request, HttpServletResponse response) {
public void exportData(WxMerchantTradeDaily tradeDaily, HttpServletRequest request, HttpServletResponse response) {
//没有商户ID导出全部数据
String name = "解单数据";
if (wxMerchantTradeDailyVo.getMerchantId() == null) {
String title = "商户解单数据";
List<WxMerchantTradeDailyVo> list = wxMerchantTradeDailyMapper.findListVo(wxMerchantTradeDailyVo);
list.parallelStream().forEach(t -> t.setReportDate(wxMerchantTradeDailyVo.getReportDate()));
excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false);
} else {
WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
wxMerchantTradeDaily.setTenantId(wxMerchantTradeDailyVo.getTenantId());
wxMerchantTradeDaily.setMerchantId(wxMerchantTradeDailyVo.getMerchantId());
String starttime = DateUtils.getTimeBefore(29, new Date());
String endtime = DateUtils.getSystemTime("yyyy-MM-dd");
wxMerchantTradeDaily.setStarttime(starttime);
wxMerchantTradeDaily.setEndtime(endtime);
List<WxMerchantTradeDailyVo> list = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily);
String title = "近30天解单数据";
excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false);
}
List<WxMerchantTradeDailyVo> list = wxMerchantTradeDailyMapper.findVoList(tradeDaily);

list.stream().forEach(m->{
//商铺信息
m.setShopVos(wxShopMapper.findShopVoList(m.getMerchantId()));
});
//商铺信息

excelService.exportExcel(list, "商户解单数据", "商户解单数据", WxMerchantTradeDailyVo.class, "商户解单数据.xlsx", response, false);
}

@Override
@@ -204,8 +200,11 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
wxMerchantTradeDaily.setMerchantId(merchantId);

List<WxMerchantTradeDailyVo> recordList = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily);
String startTime = DateUtils.getTimeBefore(29, new Date());
String endTime = DateUtils.getSystemTime("yyyy-MM-dd");
wxMerchantTradeDaily.setStartTime(startTime);
wxMerchantTradeDaily.setEndTime(endTime);
List<WxMerchantTradeDailyVo> recordList = wxMerchantTradeDailyMapper.findVoList(wxMerchantTradeDaily);
Map<String,WxMerchantTradeDailyVo> recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDailyVo::getReportDate, r -> r));

List<WxMerchantTradeDailyVo> tradeList = new ArrayList<>();


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

@@ -23,43 +23,40 @@
<if test=" null != id ">
and `id` = #{id}
</if>
<if test=" null != tenantId ">
and `tenant_id` = #{tenantId}
</if>
<if test=" null != merchantId ">
and `merchant_id` = #{merchantId}
and `merchant_id` = #{merchantId}
</if>

<if test=" null != bUserId ">
and `b_user_id` = #{bUserId}

</if>

<if test=" null != tradeAmt ">
and `trade_amt` = #{tradeAmt}
and `trade_amt` = #{tradeAmt}
</if>
<if test=" null != createDate ">
and `create_date` = #{createDate}

</if>

<if test=" null != updateDate ">
and `update_date` = #{updateDate}

</if>

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

<if test=" null != month ">
and date_format(create_date,'%Y-%m')=#{month}
</if>

<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -94,7 +91,6 @@
</select>



<resultMap id="BaseResultMapVo" type="com.iformall.domain.vo.WxMerchantTradeDailyVo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
@@ -104,49 +100,26 @@
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="report_date" jdbcType="VARCHAR" property="reportDate" />
<result column="trade_count" property="tradeCount" />
<result column="proof" property="proof"/>

<result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />
<result column="business_id" jdbcType="VARCHAR" property="businessId" />
<result column="subBusiness_id" jdbcType="VARCHAR" property="subBusinessId" />

<result column="b_user_name" jdbcType="VARCHAR" property="bUserName" />
<result column="b_user_phone" jdbcType="VARCHAR" property="bUserPhone"/>

<result column="trade_count" property="tradeCount" />
<result column="proof" property="proof"/>
</resultMap>

<sql id="allColumnsVo">
mtd.id as id,
m.tenant_id as tenant_id, m.id as merchant_id,m.name as merchant_name,
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,
mbu.name as b_user_name, mbu.phone as b_user_phone,
trade_count,proof
mtd.id as id, mtd.b_user_id as b_user_id, mtd.trade_amt, mtd.report_date, mtd.trade_count, mtd.proof,
mtd.create_date as create_date, mtd.update_date as update_date,
m.tenant_id as tenant_id, m.id as merchant_id, m.name as merchant_name, m.business_id, m.sub_business_id,
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 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
and m.status = 1
<if test=" null != merchantName and ''!=merchantName">
and m.name like concat('%', #{merchantName},'%')
</if>

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

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

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

<select id="findListVoOfMonth" parameterType="com.iformall.domain.po.WxMerchantTradeDaily" resultMap="BaseResultMapVo">
<select id="findVoList" parameterType="com.iformall.domain.po.WxMerchantTradeDaily" resultMap="BaseResultMapVo">
select <include refid="allColumnsVo" />
from wx_merchant_trade_daily mtd
inner join wx_merchant m on mtd.merchant_id = m.id
@@ -160,12 +133,16 @@
<if test=" null != merchantId ">
and mtd.merchant_id = #{merchantId}
</if>
<if test=" null != starttime and null != endtime">
and mtd.report_date between #{starttime} and #{endtime}
<if test=" null != merchantName and ''!=merchantName">
and m.name like concat('%', #{merchantName},'%')
</if>
order by mtd.create_date desc LIMIT 30
<if test=" null != startTime and null != endTime">
and mtd.report_date between #{startTime} and #{endTime}
</if>

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




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