diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java index 2fbdcd5a2..cda95313e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BaseEntity.java @@ -41,9 +41,9 @@ public class BaseEntity implements Serializable { break; } } - if(!find) { - return null; - } +// if(!find) { +// return null; +// } //扫描注解,优先解析注解 for (Field field : fields) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index ebe4d15c0..98faac017 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -133,6 +133,7 @@ public class WxShop extends BaseEntity { //闲置时间 @io.swagger.annotations.ApiModelProperty(value = "闲置时间", name = "freeDay") @Transient + @SortColumn(column = "freeDay") private Integer freeDay; public Integer getFreeDay() { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index 4423e0163..87ce3695e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -1,6 +1,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; +import com.iformall.domain.dto.WxOrderReportDto; import com.iformall.domain.po.WxOrder; import com.iformall.domain.vo.*; @@ -31,7 +32,7 @@ public interface WxOrderMapper extends CommonMapper { List listMicroPayOrderReportByDateAndMerchant(HashMap params); - List findListOfMerchantMicroPayOrderByDate(HashMap params); + List findListOfMerchantMicroPayOrderByDate(WxOrderReportDto wxOrderReportDto); List findListOrder(WxOrderQueryVo record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 91ef3ce18..da87c7809 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -619,23 +619,18 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { @Override public PageInfo listMerchantMicroPayOrderReportByDate(WxOrderReportDto wxOrderReportDto,Integer pageIndex, Integer pageSize) { - HashMap params = new HashMap<>(); - - if (!StringUtils.isEmpty(wxOrderReportDto.getMerchantName())) - params.put("merchantName",wxOrderReportDto.getMerchantName()); - if (wxOrderReportDto.getStartTime() != null) { - params.put("startTime", convertDateAndAdd(wxOrderReportDto.getStartTime(), 0)); + wxOrderReportDto.setStartTime(convertDateAndAdd(wxOrderReportDto.getStartTime(), 0)); } else { - params.put("startTime", addDay(-1)); + wxOrderReportDto.setStartTime(addDay(-1)); } if (wxOrderReportDto.getEndTime() != null) { - params.put("endTime", convertDateAndAdd(wxOrderReportDto.getStartTime(), 0)); + wxOrderReportDto.setEndTime(convertDateAndAdd(wxOrderReportDto.getStartTime(), 0)); } else { - params.put("endTime", addDay(0)); + wxOrderReportDto.setEndTime(addDay(0)); } PageHelper.startPage(pageIndex, pageSize); - List list = wxOrderMapper.findListOfMerchantMicroPayOrderByDate(params); + List list = wxOrderMapper.findListOfMerchantMicroPayOrderByDate(wxOrderReportDto); return new PageInfo<>(list); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml index 2afa13a43..715ee30b4 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml @@ -52,9 +52,6 @@ and `is_del` = #{isDel} - - and `status` = #{status} - and id in diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index eb44b0d86..1b4885548 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -464,7 +464,7 @@ (case when mo.amount > 0 then mo.amount else 0 end) trade_amt - select from wx_merchant wm @@ -484,8 +484,10 @@ group by m.id,xTime) mo on mo.mid = wm.id where wm.status = 1 - + + and wm.name like concat('%', #{merchantName},'%') + order by ${sortColumns} order by wm.create_date desc diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 1f25c0450..cc9fad4df 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -150,7 +150,7 @@