winter 2 лет назад
Родитель
Сommit
43ac3e7b23
7 измененных файлов: 37 добавлений и 6 удалений
  1. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +6
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java
  3. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/dto/PageMerchantMicroPayDTO.java
  5. +8
    -0
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
  6. +8
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  7. +6
    -0
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

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

@@ -64,8 +64,12 @@ public class WxMerchantTradeDailyController extends BaseController {
@ApiOperation("数据汇总")
@GetMapping("/summary")
public ResultData summary(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::summary");
wxMerchantTradeDaily.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds());
wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds());
}
return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily);
}



+ 6
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java Просмотреть файл

@@ -7,6 +7,7 @@ import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.dto.PageMerchantMicroPayDTO;
import com.iformall.domain.dto.WxOrderReportDto;
import com.iformall.domain.po.WxUserDataRule;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.PageMerchantMicroPayVO;
import com.iformall.domain.vo.WxMerchantMicroPayVo;
@@ -76,8 +77,12 @@ public class WxMerchantMicroPayController extends BaseController {
@ApiOperation("商户收银分页查询")
@GetMapping("/page")
public ResultData pageMerchantMicroPay(PageMerchantMicroPayDTO dto) {
logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::pageMerchantMicroPay");
dto.updateTenantInfo(getTenantInfo());
WxUserDataRule dataRule = this.getCurrentDataFloors();
if (null != dataRule) {
dto.setFloorForRule(dataRule.getFloorIds());
dto.setBusinessForRule(dataRule.getBussinessIds());
}
PageInfo<PageMerchantMicroPayVO> page = markingDataReportService.pageMerchantMicroPay(dto);
return new ResultData(page);
}


+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java Просмотреть файл

@@ -160,6 +160,7 @@ public class WxRaffleActivityController extends BaseController {
WxRaffleActivityRecord r = new WxRaffleActivityRecord();
r.setActivityId(a.getId());
r.updateTenantInfo(a);
r.setMerchantId(getLoginBUser().getMerchantId());
wxCashBackActivityRecord.setMerchantId(getLoginBUser().getMerchantId());
int allRecordCount = wxCashBackActivityService.getRecordCount(r);


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

@@ -5,6 +5,7 @@ import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

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

/**
* a端收银记录分页查询DTO
@@ -35,4 +36,6 @@ public class PageMerchantMicroPayDTO extends TenantEntity {
* 商户id
*/
private Long merchantId;
private List<Long> merchantIds;
}

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

@@ -626,6 +626,14 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService {

@Override
public PageInfo<PageMerchantMicroPayVO> pageMerchantMicroPay(PageMerchantMicroPayDTO dto) {
if (null != dto.getFloorForRule()) {
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(dto, dto.getFloorForRule(), null, null, 0, 0);
if (null == mids || mids.size() <= 0 ) {
dto.setMerchantId(-1L);
}else {
dto.setMerchantIds(mids);
}
}
PageInfo<PageMerchantMicroPayVO> pageResult = PageHelper.startPage(dto.getPageNum(), dto.getPageSize()).doSelectPageInfo(() -> wxOrderMapper.listMerchantMicroPay(dto));
Map<Long, ListMerchantVO> merchantMap = wxMerchantService.listMerchant(dto, null).stream().collect(Collectors.toMap(ListMerchantVO::getId, Function.identity()));
List<PageMerchantMicroPayVO> result = pageResult.getList().stream().map(x -> {


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

@@ -1239,10 +1239,8 @@ public class WxMerchantServiceImpl implements WxMerchantService {
merchantIds.addAll(userMerchantIds);
}
}
String floorRule = StringUtils.trimToNull(record.getFloorForRule());
Long building = record.getBuilding();
Long floor = record.getFloor();
List<Long> floorMerchantIds = getFloorBuildMerchantIds(record, floorRule, building, floor, 0, 0);
List<Long> floorMerchantIds = getFloorBuildingMerchantIds(record,record.getFloorForRule(),record.getBuilding(),record.getFloor());
if(floorMerchantIds != null){
if(merchantIds.size() > 0){
merchantIds.retainAll(floorMerchantIds);
@@ -1293,6 +1291,12 @@ public class WxMerchantServiceImpl implements WxMerchantService {
// }
}
private List<Long> getFloorBuildingMerchantIds(TenantEntity tenantEntity,String floorForRule,Long buildingId,Long floor) {
String floorRule = StringUtils.trimToNull(floorForRule);
List<Long> floorMerchantIds = getFloorBuildMerchantIds(tenantEntity, floorRule, buildingId, floor, 0, 0);
return floorMerchantIds;
}
@Override
public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,Integer merchantShopDel,Integer shopDel ) {
if (null != floorRule || null != building || null != floor) {


+ 6
- 0
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Просмотреть файл

@@ -1222,6 +1222,12 @@
<if test="merchantId != null">
AND m.id = #{merchantId}
</if>
<if test=" null != merchantIds ">
and m.id in
<foreach collection="merchantIds" index="index" item="mIdItem" open="(" separator="," close=")">
#{mIdItem}
</foreach>
</if>
ORDER BY
o.create_date DESC
</select>


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