|
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.xy.dto.MercFeeSettleDto;
|
|
|
import com.xy.entity.MercFeeSettle;
|
|
|
+import com.xy.entity.MercFeeStatistic;
|
|
|
import com.xy.mapper.MercFeeSettleMapper;
|
|
|
import com.xy.utils.Emptys;
|
|
|
import com.xy.utils.MybatisPlusQuery;
|
|
@@ -40,6 +41,8 @@ import static com.xy.utils.PlusBeans.toPageBean;
|
|
|
@Api(tags = "商户佣金费用结算")
|
|
|
public class MercFeeSettleServiceImpl extends ServiceImpl<MercFeeSettleMapper, MercFeeSettle> implements MercFeeSettleService {
|
|
|
|
|
|
+ private MercFeeStatisticServiceImpl mercFeeStatisticService;
|
|
|
+
|
|
|
@PostMapping("obj")
|
|
|
@ApiOperation("对象查询")
|
|
|
public R<MercFeeSettleDto.Vo> obj(@RequestBody MercFeeSettleDto.Vo vo) {
|
|
@@ -85,6 +88,12 @@ public class MercFeeSettleServiceImpl extends ServiceImpl<MercFeeSettleMapper, M
|
|
|
mercFeeSettles.forEach(mfs -> {
|
|
|
mfs.setSettleState(MercFeeSettleSate.S3.getCode());
|
|
|
mfs.setFinishSettleTime(LocalDateTime.now());
|
|
|
+ //结算完成需要更新统计表
|
|
|
+ Long mercId = mfs.getMercId();
|
|
|
+ MercFeeStatistic mercFeeStatistic = mercFeeStatisticService.getByMercId(mercId);
|
|
|
+ //累计已结算金额
|
|
|
+ mercFeeStatistic.setSettleMoney(mercFeeStatistic.getSettleMoney() + mfs.getSettleMoney());
|
|
|
+ mercFeeStatisticService.updateById(mercFeeStatistic);
|
|
|
});
|
|
|
return R.ok(updateBatchById(mercFeeSettles));
|
|
|
}
|