|
|
|
@@ -11,9 +11,11 @@ import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.domain.vo.WxMerchantTradeDailyVo; |
|
|
|
import com.iformall.enums.EnumTradeDailyDateType; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.mapper.WxMerchantTradeDailyHistoryMapper; |
|
|
|
import com.iformall.mapper.WxMerchantTradeDailyMapper; |
|
|
|
import com.iformall.mapper.WxShopMapper; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
@@ -182,10 +184,13 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
} |
|
|
|
|
|
|
|
private void handleQueryParam(WxMerchantTradeDaily record) { |
|
|
|
if (!StringUtils.isBlank(record.getMerchantName())) { |
|
|
|
//楼层楼座 |
|
|
|
List<Long> floorMids = wxMerchantService.getFloorBuildMerchantIds(record, null, record.getBuildingId(), record.getFloorId(), EnumYesOrNo.NO.getCode(), EnumYesOrNo.NO.getCode()); |
|
|
|
if (null != floorMids || StringUtils.isNotBlank(record.getMerchantName())) { |
|
|
|
WxMerchant m = new WxMerchant(); |
|
|
|
m.updateTenantInfo(record); |
|
|
|
m.setName(StringUtils.trimToNull(record.getMerchantName())); |
|
|
|
m.setIds(floorMids); |
|
|
|
List<Long> merchantIdList = wxMerchantService.findIdList(m); |
|
|
|
if (null != merchantIdList && merchantIdList.size() > 0 ) { |
|
|
|
record.setMerchantIdList(merchantIdList); |
|
|
|
@@ -468,6 +473,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ |
|
|
|
if (merchant == null) |
|
|
|
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); |
|
|
|
WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); |
|
|
|
wxMerchantTradeDaily.updateTenantInfo(merchant); |
|
|
|
wxMerchantTradeDaily.setMerchantId(merchantId); |
|
|
|
String startTime = DateUtils.getTimeBefore(29, new Date()); |
|
|
|
String endTime = DateUtils.getSystemTime("yyyy-MM-dd"); |
|
|
|
|