Commit def7e7e8 by yao.xiao

补充提交

parent 35b2784e
...@@ -527,10 +527,9 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService { ...@@ -527,10 +527,9 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
@Override @Override
public FortunePayToOrderResponseVO fortunePayToOrder(FortunePayToOrderRequestVO requestVO) { public FortunePayToOrderResponseVO fortunePayToOrder(FortunePayToOrderRequestVO requestVO) {
FortunePayToOrderResponseVO responseVO = new FortunePayToOrderResponseVO(); FortunePayToOrderResponseVO responseVO = new FortunePayToOrderResponseVO();
Long customerId = requestVO.getCustomerId();
Long payId = requestVO.getPayId(); Long payId = requestVO.getPayId();
//查询所有订单,并根据支付id标记本次提现订单 //查询所有订单,并根据支付id标记本次提现订单
List<FortunePayToOrderInfo> fortunePayToOrderInfos = agmsFortuneDalService.fortunePayToOrder(customerId,payId); List<FortunePayToOrderInfo> fortunePayToOrderInfos = agmsFortuneDalService.fortunePayToOrder(payId);
BigDecimal totalOrderPrice = fortunePayToOrderInfos.stream() BigDecimal totalOrderPrice = fortunePayToOrderInfos.stream()
.map(f -> f.getOrderPrice() == null ? BigDecimal.ZERO : f.getOrderPrice()) .map(f -> f.getOrderPrice() == null ? BigDecimal.ZERO : f.getOrderPrice())
.reduce(BigDecimal.ZERO,BigDecimal::add); .reduce(BigDecimal.ZERO,BigDecimal::add);
......
...@@ -7,6 +7,5 @@ import lombok.Data; ...@@ -7,6 +7,5 @@ import lombok.Data;
*/ */
@Data @Data
public class FortunePayToOrderRequestVO { public class FortunePayToOrderRequestVO {
private Long customerId;
private Long payId; private Long payId;
} }
...@@ -25,11 +25,10 @@ public interface AgmsFortuneMapper { ...@@ -25,11 +25,10 @@ public interface AgmsFortuneMapper {
/** /**
* 通过customerId 和 payId 查询 fortune 信息 * 通过customerId 和 payId 查询 fortune 信息
* @param customerId customerId
* @param payId payId * @param payId payId
* @return FortunePayToOrderInfo * @return FortunePayToOrderInfo
*/ */
List<FortunePayToOrderInfo> fortunePayToOrder(@Param("customerId") Long customerId,@Param("payId") Long payId); List<FortunePayToOrderInfo> fortunePayToOrder(@Param("payId") Long payId);
/** /**
* 经纪人支付列表 * 经纪人支付列表
......
...@@ -30,7 +30,7 @@ public interface AgmsFortuneDALService { ...@@ -30,7 +30,7 @@ public interface AgmsFortuneDALService {
* @param payId payId * @param payId payId
* @return FortunePayToOrderInfo * @return FortunePayToOrderInfo
*/ */
List<FortunePayToOrderInfo> fortunePayToOrder(Long customerId, Long payId); List<FortunePayToOrderInfo> fortunePayToOrder(Long payId);
/** /**
* 支付列表插叙 * 支付列表插叙
......
...@@ -51,8 +51,8 @@ public class AgmsFortuneDALServiceImpl implements AgmsFortuneDALService { ...@@ -51,8 +51,8 @@ public class AgmsFortuneDALServiceImpl implements AgmsFortuneDALService {
} }
@Override @Override
public List<FortunePayToOrderInfo> fortunePayToOrder(Long customerId, Long payId) { public List<FortunePayToOrderInfo> fortunePayToOrder( Long payId) {
return agmsFortuneMapper.fortunePayToOrder(customerId,payId); return agmsFortuneMapper.fortunePayToOrder(payId);
} }
@Override @Override
......
...@@ -104,7 +104,6 @@ ...@@ -104,7 +104,6 @@
on o.id = f.order_id on o.id = f.order_id
where (o.status = 3 or o.status = 4) where (o.status = 3 or o.status = 4)
and f.order_price != 0 and f.order_price != 0
and f.customer_id = #{customerId,jdbcType=BIGINT}
and f.fortune_payed_id = #{payId,jdbcType=BIGINT} and f.fortune_payed_id = #{payId,jdbcType=BIGINT}
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment