|
|
@@ -44,6 +44,20 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
@Override
|
|
|
public Pagination<OrderListBo> allUnassignedOrder(OrderListBo order, Integer pageNo,
|
|
|
Integer pageSize,Integer ob) {
|
|
|
+ BigDecimal b1 = new BigDecimal(2);
|
|
|
+ BigDecimal b2 = new BigDecimal(0.2);
|
|
|
+ BigDecimal b3 = new BigDecimal(0.4);
|
|
|
+ BigDecimal b4 = new BigDecimal(0.5);
|
|
|
+ System.out.println("b1 b2 " +b1.compareTo(b2));
|
|
|
+ System.out.println("b2 b1 " +b2.compareTo(b1));
|
|
|
+ System.out.println("b1 b3 " +b1.compareTo(b3));
|
|
|
+ System.out.println("b1+b2 b3 " +b1.add(b2).compareTo(b3));
|
|
|
+ System.out.println("b1+b2 b4 " +b1.add(b2).compareTo(b4));
|
|
|
+ System.out.println(" b4 b1+b2 " +b4.compareTo(b1.add(b2)));
|
|
|
+ System.out.println("b1 b2 b3 b4 " + b1.toString() + " " + b2.toString() + " " + b3.toString() + " "+ b4.toString());
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
params.put("o", order);
|
|
|
params.put("ob", ob);
|
|
|
@@ -52,10 +66,10 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Integer distributionFinance(String orderNo, String financeId, Integer approval) {
|
|
|
+ public Integer updateDistributionFinance(String orderNo, String financeId, Integer approval) {
|
|
|
// 先判断订单id和财务专员是否存在或者能够使用
|
|
|
//判断是不是特批的数据
|
|
|
- if(approval != 2){//特批未通过
|
|
|
+ if(approval != 2 && approval != 0){//特批未通过
|
|
|
return -1;
|
|
|
}
|
|
|
TOrderNew onew = new TOrderNew();
|
|
|
@@ -73,7 +87,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
TOrderNew record = new TOrderNew();
|
|
|
record.setOrderNo(orderNo);
|
|
|
record.setFinanceId(financeId);
|
|
|
- record.setProjectStatus(3);
|
|
|
+ record.setProcessStatus(3);
|
|
|
r = tOrderNewMapper.updateByPrimaryKeySelective(record);
|
|
|
}else{
|
|
|
//返回错误标志 提示订单编号或者财务专员选择错误
|
|
|
@@ -93,7 +107,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Integer reject(TOrderBack back) {
|
|
|
+ public Integer updateReject(TOrderBack back) {
|
|
|
// 是否已经收款
|
|
|
BigDecimal bd = billNewMapper.getAmountByOid(back.getOrderNo());
|
|
|
if(bd.compareTo(new BigDecimal(0.0)) == 1){
|
|
|
@@ -121,20 +135,25 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
|
|
|
@Override
|
|
|
public Integer addReceiptsFlow(TOrderBillNew billNew) {
|
|
|
+
|
|
|
//判断有没有要加入的金额有没有超过总金额
|
|
|
- BigDecimal bd = billNewMapper.getAmountByOid(billNew.getOrderNo());
|
|
|
+ BigDecimal bill = billNewMapper.getAmountByOid(billNew.getOrderNo());
|
|
|
//获得的单个订单金额数据(首付金额和总金额)
|
|
|
TOrderNew o = tOrderNewMapper.selectByPrimaryKey(billNew.getOrderNo());
|
|
|
if(null == o){
|
|
|
return -2;
|
|
|
}
|
|
|
- bd.add(billNew.getTransactionAmount().abs());
|
|
|
+ BigDecimal bd = bill.add(billNew.getTransactionAmount().abs());
|
|
|
int lstaus = 0;
|
|
|
|
|
|
//如果订单流水总额大于总金额 return -1
|
|
|
//如果订单流水等于于总金额 lstaus 2
|
|
|
//如果订单流水小于总金额大于首付 lstaus 1
|
|
|
//如果订单流水小于首付 lstaus 0
|
|
|
+
|
|
|
+ // 0 相等
|
|
|
+ // -1 小于
|
|
|
+ // 1 大于
|
|
|
if(bd.compareTo(o.getTotalAmount()) == 1){
|
|
|
return -1;//超过不能添加
|
|
|
}else if(bd.compareTo(o.getTotalAmount()) == 0){
|
|
|
@@ -145,7 +164,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
//否则新增流水信息
|
|
|
billNew.setBillNo(idGenerator.generateId().toString());
|
|
|
billNew.setCreater(TokenManager.getAdminId());
|
|
|
- billNew.setCreater("1");
|
|
|
int result = billNewMapper.insertSelective(billNew);
|
|
|
|
|
|
//修改订单结算金额和结算状态
|
|
|
@@ -165,16 +183,13 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Integer changeRefund(TOrderRefund refund) {
|
|
|
+ public Integer updateChangeRefund(TOrderRefund refund) {
|
|
|
//查看当前退单状态
|
|
|
TOrderRefund d = refundMapper.selectByPrimaryKey(refund.getId());
|
|
|
if(d.getRefundStatus() != 0){
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- //TODO 这里是否要修改订单状态待确定
|
|
|
-
|
|
|
//修改退单审核状态
|
|
|
return refundMapper.updateRefundById(refund);
|
|
|
}
|