提交 447715a2 authored 作者: huyufan's avatar huyufan

接单借款判断

上级 90e6271a
...@@ -27,8 +27,7 @@ public class OwnerLoanAccountDaoImpl extends BaseDaoImpl<OwnerLoanAccountMapper, ...@@ -27,8 +27,7 @@ public class OwnerLoanAccountDaoImpl extends BaseDaoImpl<OwnerLoanAccountMapper,
if (flag) { if (flag) {
return baseMapper.addAccount(account, nowStr); return baseMapper.addAccount(account, nowStr);
} else { } else {
return null; return baseMapper.subAccount(account, nowStr);
// return baseMapper.subAccount(account, nowStr);
} }
} }
......
...@@ -55,6 +55,11 @@ public class OwnerLoanRecordDaoImpl extends BaseDaoImpl<OwnerLoanRecordMapper, O ...@@ -55,6 +55,11 @@ public class OwnerLoanRecordDaoImpl extends BaseDaoImpl<OwnerLoanRecordMapper, O
return baseMapper.pageByParam(page,param); return baseMapper.pageByParam(page,param);
} }
/**
* 查询审批通过并且未用完的借款
* @param userNo
* @return
*/
@Override @Override
public List<OwnerLoanRecord> selectLoanBalance(Long userNo) { public List<OwnerLoanRecord> selectLoanBalance(Long userNo) {
return baseMapper.selectList( return baseMapper.selectList(
......
...@@ -8,6 +8,7 @@ import com.clx.order.feign.OrderFeign; ...@@ -8,6 +8,7 @@ import com.clx.order.feign.OrderFeign;
import com.clx.order.vo.feign.FeignAddressVO; import com.clx.order.vo.feign.FeignAddressVO;
import com.clx.order.vo.feign.FeignOrderInfoVO; import com.clx.order.vo.feign.FeignOrderInfoVO;
import com.clx.performance.component.GoodsOrderTruckRecordComponent; import com.clx.performance.component.GoodsOrderTruckRecordComponent;
import com.clx.performance.component.OrderChildLoanComponent;
import com.clx.performance.constant.RedisConstants; import com.clx.performance.constant.RedisConstants;
import com.clx.performance.constant.RedissonConstants; import com.clx.performance.constant.RedissonConstants;
import com.clx.performance.dao.*; import com.clx.performance.dao.*;
...@@ -153,17 +154,7 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -153,17 +154,7 @@ public class OrderChildServiceImpl implements OrderChildService {
private FeignPaymentService feignPaymentService; private FeignPaymentService feignPaymentService;
@Autowired @Autowired
private TruckService truckService; private OrderChildLoanComponent orderChildLoanComponent;
@Autowired
private ZjxlGpsService zjxlGpsService;
@Autowired
private UserService userService;
@Autowired
private OwnerRunningWaterRecordDao ownerRunningWaterRecordDao;
@Override @Override
public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) { public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
...@@ -265,7 +256,6 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -265,7 +256,6 @@ public class OrderChildServiceImpl implements OrderChildService {
FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID); FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(orderInfo.getOwnerUserNo()); OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(orderInfo.getOwnerUserNo());
// // 车型限制 // // 车型限制
// FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow // FeignOrderInfoVO orderInfo = orderService.getOrderInfo(orderGoods.getOrderNo()).orElseThrow
// (PerformanceResultEnum.DATA_NOT_FIND); // (PerformanceResultEnum.DATA_NOT_FIND);
...@@ -312,8 +302,8 @@ public class OrderChildServiceImpl implements OrderChildService { ...@@ -312,8 +302,8 @@ public class OrderChildServiceImpl implements OrderChildService {
throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK); throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
} }
//TODO 借款账户相关限制 //接单判断
orderChildLoanComponent.getChildDetermine(orderInfo, ownerInfo, orderGoods, childNo);
OrderChild orderChild = new OrderChild(); OrderChild orderChild = new OrderChild();
orderChild.setChildNo(childNo); orderChild.setChildNo(childNo);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论