diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index ba9cbfe23..95edd4456 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -9,6 +9,7 @@ import com.cool.store.entity.*; import com.cool.store.enums.DownSystemTypeEnum; import com.cool.store.enums.MessageEnum; import com.cool.store.enums.SMSMsgEnum; +import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.job.XxlJobHandler; import com.cool.store.mapper.FranchiseFeeMapper; import com.cool.store.mapper.LineInfoMapper; @@ -42,6 +43,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; import java.util.*; +import java.util.stream.Collectors; @Slf4j @RestController @@ -358,4 +360,48 @@ public class PCTestController { return ResponseResult.success(Boolean.TRUE); } + @Resource + ShopStageInfoDAO shopStageInfoDAO; + + @GetMapping("/franchiseFeeDataHandler") + @ApiOperation("加盟费数据处理") + public ResponseResult franchiseFeeDataHandler(){ + //查询所有的待加盟商缴费 推送账单 + List shopList = shopStageInfoDAO.getShopIdListByStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus()); + log.info("----------开始推送账单数据---------"); + shopList.forEach(x->{ + try { + FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(x.getShopId()); + ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(x.getShopId()); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); + PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO); + pushService.pushFranchiseFeeToXGJ(feeRequest); + } catch (Exception e) { + log.error("推送数据失败 shopId {},异常信息:{}",x,e.getMessage()); + } + }); + log.info("----------推送账单数据结束---------"); + //对账中 + log.info("----------开始推送账单与收款单数据---------"); + List shopList2 = shopStageInfoDAO.getShopIdListByStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72.getShopSubStageStatus()); + shopList2.forEach(x->{ + //先推送账单 + try { + FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(x.getShopId()); + ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(x.getShopId()); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfoDO.getLineId()); + PushFranchiseFeeRequest feeRequest = new PushFranchiseFeeRequest(shopInfoDO.getId(), lineInfoDO.getUsername(), franchiseFeeDO); + pushService.pushFranchiseFeeToXGJ(feeRequest); + List franchiseFeePayInfoByShopId = linePayDAO.getFranchiseFeePayInfoByShopId(x.getShopId()); + franchiseFeePayInfoByShopId.forEach(y->{ + linePayService.pushPayInfo(x.getShopId(),y); + }); + } catch (Exception e) { + log.error("推送数据失败 shopId {},异常信息:{}",x,e.getMessage()); + } + }); + log.info("----------账单与收款单数据推送完成---------"); + return ResponseResult.success(Boolean.TRUE); + } + }