Przeglądaj źródła

fix trade daily

release_toaliyun_real
lin 3 lat temu
rodzic
commit
f1cfba972f
5 zmienionych plików z 35 dodań i 0 usunięć
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  3. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  4. +15
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
  5. +11
    -0
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantTradeDaily.java Wyświetl plik

@@ -9,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;


import java.util.Date;
import java.util.List;

@TableName(value = "wx_merchant_trade_daily")
@Data
@@ -19,6 +20,8 @@ public class WxMerchantTradeDaily extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId")
protected Long merchantId;
@TableField(exist = false)
private List<Long> merchantIdList;

public Long getbUserId() {
return bUserId;


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java Wyświetl plik

@@ -96,6 +96,7 @@ public interface WxMerchantService {
* @return
*/
List<WxMerchant> findList(WxMerchant record);
List<Long> findIdList(WxMerchant record);

/**
* 根据商管商户


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Wyświetl plik

@@ -283,6 +283,11 @@ public class WxMerchantServiceImpl implements WxMerchantService {
public List<WxMerchant> findList(WxMerchant record) {
return wxMerchantMapper.findList(record);
}
@Override
public List<Long> findIdList(WxMerchant record) {
return wxMerchantMapper.findIdList(record);
}

@Override
public List<WxMerchant> findAdminList(TenantEntity tenantEntity) {


+ 15
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java Wyświetl plik

@@ -156,6 +156,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ

@Override
public PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) {
handleQueryParam(record);
PageInfo<WxMerchantTradeDaily> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record));
PageInfo<WxMerchantTradeDailyVo> retPageInfo = new PageInfo<WxMerchantTradeDailyVo>();
retPageInfo.setPageNum(pageIndex);
@@ -166,6 +167,20 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
return retPageInfo;
}
private void handleQueryParam(WxMerchantTradeDaily record) {
if (!StringUtils.isBlank(record.getMerchantName())) {
WxMerchant m = new WxMerchant();
m.updateTenantInfo(record);
m.setName(StringUtils.trimToNull(record.getMerchantName()));
List<Long> merchantIdList = wxMerchantService.findIdList(m);
if (null != merchantIdList && merchantIdList.size() > 0 ) {
record.setMerchantIdList(merchantIdList);
}else {
record.setId(-999L);
}
}
}
private List<WxMerchantTradeDailyVo> toVoList(List<WxMerchantTradeDaily> list,TenantEntity tenantEntity) {
if (null == list || list.size() <= 0 ){
return null;


+ 11
- 0
mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml Wyświetl plik

@@ -72,6 +72,17 @@
and id != #{ignoreId}
</if>
<if test=" null != startTime and null != endTime">
and mtd.report_date &gt;= date_format(#{startTime},'%Y-%m-%d')
and mtd.report_date &lt;= date_format(#{endTime},'%Y-%m-%d')
</if>
<if test=" null != merchantIdList ">
and merchant_id in
<foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")">
#{midItem}
</foreach>
</if>

<if test=" null != ids ">


Ładowanie…
Anuluj
Zapisz