Explorar el Código

[A端][修复]:收银记录商户名过滤

release_toaliyun_real
hupeng hace 7 años
padre
commit
11d05c3e80
Se han modificado 4 ficheros con 19 adiciones y 2 borrados
  1. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantMicroPayController.java
  2. +9
    -0
      mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
  4. +3
    -0
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantMicroPayController.java Ver fichero

@@ -52,9 +52,10 @@ public class WxMerchantMicroPayController extends BaseController {

@ApiOperation("获得昨日刷卡列表")
@GetMapping("/listYesterday")
public ResultData listYesterday(Integer pageNum, Integer pageSize) {
public ResultData listYesterday(@ModelAttribute WxOrderReportDto wxOrderReportDto, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday");
WxOrderReportDto wxOrderReportDto = new WxOrderReportDto();
if (wxOrderReportDto == null)
wxOrderReportDto = new WxOrderReportDto();
wxOrderReportDto.setTenantId(getTenantId());
final PageInfo<WxMerchantMicroPayVo> page = markingDataReportService.listMerchantMicroPayOrderReportByDate(wxOrderReportDto, pageNum, pageSize);
return new ResultData(page);


+ 9
- 0
mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java Ver fichero

@@ -8,6 +8,7 @@ import java.util.Date;
public class WxOrderReportDto {
private String tenantId;
private Long merchantId;
private String merchantName;
private Date startTime;
private Date endTime;
private Integer type;
@@ -28,6 +29,14 @@ public class WxOrderReportDto {
this.merchantId = merchantId;
}

public String getMerchantName() {
return merchantName;
}

public void setMerchantName(String merchantName) {
this.merchantName = merchantName;
}

public Integer getType() {
return type;
}


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java Ver fichero

@@ -13,6 +13,7 @@ import com.iformall.enums.EnumOrderType;
import com.iformall.mapper.*;
import com.iformall.service.MarkingDataReportService;
import com.iformall.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -502,6 +503,9 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {
public PageInfo<WxMerchantMicroPayVo> listMerchantMicroPayOrderReportByDate(WxOrderReportDto wxOrderReportDto,Integer pageIndex, Integer pageSize) {
HashMap<String, Object> params = new HashMap<>();

if (!StringUtils.isEmpty(wxOrderReportDto.getMerchantName()))
params.put("merchantName",wxOrderReportDto.getMerchantName());

if (wxOrderReportDto.getStartTime() != null) {
params.put("startTime", convertDateAndAdd(wxOrderReportDto.getStartTime(), 0));
} else {


+ 3
- 0
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Ver fichero

@@ -380,6 +380,9 @@
</if>
group by m.id,xTime) mo on mo.mid = wm.id
where wm.status = 1
<if test=" null != merchantName ">
and wm.name like concat('%', #{merchantName},'%')
</if>
order by wm.create_date desc
</select>


Cargando…
Cancelar
Guardar