diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProfitVerifyOrderController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProfitVerifyOrderController.java index 8e173ad..ac0337c 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProfitVerifyOrderController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProfitVerifyOrderController.java @@ -78,4 +78,11 @@ public class ProfitVerifyOrderController extends BaseController { log.debug("【图文平台后台】审核参数为:{}", JSON.toJSONString(dto)); return AjaxResult.success(profitVerifyOrderService.verify(dto)); } + + //@RequiresPermissions("system:config:list") + @ApiOperation(value="转入钱包") + @GetMapping(value = "/transInfoWallet") + public AjaxResult transInfoWallet(){ + return AjaxResult.success(profitVerifyOrderService.transInfoWallet()); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java index 9c2c655..041e6be 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java @@ -142,4 +142,10 @@ public interface CreatorProfitMapper extends BaseMapper { * @return - */ List queryConfirmList(); + + /** + * 批量更新收益单状态为转入钱包 + * @param list 订单列表 + */ + int batchUpdateTransInfo(@Param("list") List list); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java index d9c86c2..7fc8ed3 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java @@ -168,4 +168,17 @@ public interface CreatorProfitService { * @return - */ List queryConfirmList(); + + /** + * 根据艺术家id查询收益列表 + * @param creatorId 艺术家id + * @return - + */ + List queryProfitByCreatorId(Long creatorId); + + /** + * 批量更新收益单状态为转入钱包 + * @param list 订单列表 + */ + int batchUpdate(List list); } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java index ff9aa0f..918e915 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java @@ -15,6 +15,7 @@ import com.bnyer.img.service.CreatorProfitService; import com.bnyer.img.service.TiktokImgService; import com.bnyer.img.vo.*; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -286,4 +287,20 @@ public class CreatorProfitServiceImpl implements CreatorProfitService { public List queryConfirmList() { return creatorProfitMapper.queryConfirmList(); } + + @Override + public List queryProfitByCreatorId(Long creatorId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CreatorProfit::getCreatorId,creatorId); + wrapper.eq(CreatorProfit::getStatus, "1"); + wrapper.eq(CreatorProfit::getConfirmStatus, "1"); + wrapper.notIn(CreatorProfit::getType,"2"); + return creatorProfitMapper.selectList(wrapper); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public int batchUpdate(List list) { + return creatorProfitMapper.batchUpdateTransInfo(list); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProfitVerifyOrderServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProfitVerifyOrderServiceImpl.java index 1b1f72e..c099f8f 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProfitVerifyOrderServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProfitVerifyOrderServiceImpl.java @@ -181,17 +181,28 @@ public class ProfitVerifyOrderServiceImpl implements ProfitVerifyOrderService { //查询审所有核状态为已到账,且已确认且类型不为会员的收益 List confirmProfits = creatorProfitService.queryConfirmList(); List list = new ArrayList<>(); + List creatorIdList = new ArrayList<>(); if(confirmProfits.size() > 0 && creators.size() > 0){ for (ConfirmProfitVo confirmProfit : confirmProfits) { for (Creator creator : creators) { if(confirmProfit.getCreatorId().equals(creator.getId())){ - creator.getAmt().add(confirmProfit.getAmt()); + creator.setAmt(creator.getAmt().add(confirmProfit.getAmt())); list.add(creator); + creatorIdList.add(confirmProfit.getCreatorId()); } } } - //TODO 批量更新艺术家 - return creatorService.batchUpdate(list); + //更新艺术家钱包 + creatorService.batchUpdate(list); + //批量更新收益单状态 + List profitIdList = new ArrayList<>(); + for (Long aLong : creatorIdList) { + List creatorProfits = creatorProfitService.queryProfitByCreatorId(aLong); + for (CreatorProfit creatorProfit : creatorProfits) { + profitIdList.add(creatorProfit.getId()); + } + } + return creatorProfitService.batchUpdate(profitIdList); }else{ return 0; } diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml index 0691fd0..8104b45 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml @@ -88,6 +88,14 @@ - + + update img_creator + + + amt = #{item.amt} + + + where id = #{item.id} + diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml index 30c411f..16bd055 100644 --- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml @@ -37,7 +37,7 @@ set confirm_type = '0',confirm_status = '1',confirm_time = now() where id in - #{item.id} + #{item} @@ -211,4 +211,12 @@ where status = '1' and confirm_status = '1' and type != '2' group by creator_id + + update img_creator_profit + set status = '2',wallet_time = (select NOW()) + where id in + + #{item} + +