Browse Source

feature1.0.0-img: 添加转入钱包接口

master
penny 4 years ago
parent
commit
0bb44ac7ce
  1. 7
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/ProfitVerifyOrderController.java
  2. 6
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java
  3. 13
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java
  4. 17
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/CreatorProfitServiceImpl.java
  5. 17
      bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProfitVerifyOrderServiceImpl.java
  6. 10
      bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml
  7. 10
      bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml

7
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)); log.debug("【图文平台后台】审核参数为:{}", JSON.toJSONString(dto));
return AjaxResult.success(profitVerifyOrderService.verify(dto)); return AjaxResult.success(profitVerifyOrderService.verify(dto));
} }
//@RequiresPermissions("system:config:list")
@ApiOperation(value="转入钱包")
@GetMapping(value = "/transInfoWallet")
public AjaxResult transInfoWallet(){
return AjaxResult.success(profitVerifyOrderService.transInfoWallet());
}
} }

6
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/CreatorProfitMapper.java

@ -142,4 +142,10 @@ public interface CreatorProfitMapper extends BaseMapper<CreatorProfit> {
* @return - * @return -
*/ */
List<ConfirmProfitVo> queryConfirmList(); List<ConfirmProfitVo> queryConfirmList();
/**
* 批量更新收益单状态为转入钱包
* @param list 订单列表
*/
int batchUpdateTransInfo(@Param("list") List<Long> list);
} }

13
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/CreatorProfitService.java

@ -168,4 +168,17 @@ public interface CreatorProfitService {
* @return - * @return -
*/ */
List<ConfirmProfitVo> queryConfirmList(); List<ConfirmProfitVo> queryConfirmList();
/**
* 根据艺术家id查询收益列表
* @param creatorId 艺术家id
* @return -
*/
List<CreatorProfit> queryProfitByCreatorId(Long creatorId);
/**
* 批量更新收益单状态为转入钱包
* @param list 订单列表
*/
int batchUpdate(List<Long> list);
} }

17
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.service.TiktokImgService;
import com.bnyer.img.vo.*; import com.bnyer.img.vo.*;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -286,4 +287,20 @@ public class CreatorProfitServiceImpl implements CreatorProfitService {
public List<ConfirmProfitVo> queryConfirmList() { public List<ConfirmProfitVo> queryConfirmList() {
return creatorProfitMapper.queryConfirmList(); return creatorProfitMapper.queryConfirmList();
} }
@Override
public List<CreatorProfit> queryProfitByCreatorId(Long creatorId) {
LambdaQueryWrapper<CreatorProfit> 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<Long> list) {
return creatorProfitMapper.batchUpdateTransInfo(list);
}
} }

17
bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ProfitVerifyOrderServiceImpl.java

@ -181,17 +181,28 @@ public class ProfitVerifyOrderServiceImpl implements ProfitVerifyOrderService {
//查询审所有核状态为已到账,且已确认且类型不为会员的收益 //查询审所有核状态为已到账,且已确认且类型不为会员的收益
List<ConfirmProfitVo> confirmProfits = creatorProfitService.queryConfirmList(); List<ConfirmProfitVo> confirmProfits = creatorProfitService.queryConfirmList();
List<Creator> list = new ArrayList<>(); List<Creator> list = new ArrayList<>();
List<Long> creatorIdList = new ArrayList<>();
if(confirmProfits.size() > 0 && creators.size() > 0){ if(confirmProfits.size() > 0 && creators.size() > 0){
for (ConfirmProfitVo confirmProfit : confirmProfits) { for (ConfirmProfitVo confirmProfit : confirmProfits) {
for (Creator creator : creators) { for (Creator creator : creators) {
if(confirmProfit.getCreatorId().equals(creator.getId())){ if(confirmProfit.getCreatorId().equals(creator.getId())){
creator.getAmt().add(confirmProfit.getAmt()); creator.setAmt(creator.getAmt().add(confirmProfit.getAmt()));
list.add(creator); list.add(creator);
creatorIdList.add(confirmProfit.getCreatorId());
} }
} }
} }
//TODO 批量更新艺术家 //更新艺术家钱包
return creatorService.batchUpdate(list); creatorService.batchUpdate(list);
//批量更新收益单状态
List<Long> profitIdList = new ArrayList<>();
for (Long aLong : creatorIdList) {
List<CreatorProfit> creatorProfits = creatorProfitService.queryProfitByCreatorId(aLong);
for (CreatorProfit creatorProfit : creatorProfits) {
profitIdList.add(creatorProfit.getId());
}
}
return creatorProfitService.batchUpdate(profitIdList);
}else{ }else{
return 0; return 0;
} }

10
bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorMapper.xml

@ -88,6 +88,14 @@
</select> </select>
<update id="updateBatch"> <update id="updateBatch">
<foreach collection="list" item="item" index="index" open="" close="" separator=";">
update img_creator
<set>
<if test="item.amt != null and item.amt != ''">
amt = #{item.amt}
</if>
</set>
where id = #{item.id}
</foreach>
</update> </update>
</mapper> </mapper>

10
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() set confirm_type = '0',confirm_status = '1',confirm_time = now()
where id in where id in
<foreach collection="params" item="item" separator="," open="(" close=")"> <foreach collection="params" item="item" separator="," open="(" close=")">
#{item.id} #{item}
</foreach> </foreach>
</update> </update>
<update id="updateDownloadNum"> <update id="updateDownloadNum">
@ -211,4 +211,12 @@
where status = '1' and confirm_status = '1' and type != '2' where status = '1' and confirm_status = '1' and type != '2'
group by creator_id group by creator_id
</select> </select>
<update id="batchUpdateTransInfo">
update img_creator_profit
set status = '2',wallet_time = (select NOW())
where id in
<foreach collection="list" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</update>
</mapper> </mapper>

Loading…
Cancel
Save