DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -274,7 +274,8 @@ if (!orderLogisticsId.isEmpty()){ double sum = 0; for (OrderLogisticsSpread orderLogisticsSpread : orderLogisticsId) { if (orderLogisticsSpread.getPayType() == 4) { if (orderLogisticsSpread.getPayType()!=null&&orderLogisticsSpread.getPayType() == 4) { Double payMoney = orderLogisticsSpread.getPayMoney(); sum = sum + payMoney; } DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
@@ -156,7 +156,7 @@ <if test="null != driverId"> and driverId = #{driverId} </if> and state in (2, 3, 4, 5, 8, 11) and state in (2, 3, 4, 5, 8, 11,12) </select>
@@ -323,6 +323,8 @@ if (orderLogistics.getPayType()==4||!orderLogisticsId.isEmpty()){ System.err.println("1111111111111111111111111"); double sum = 0; if (orderLogistics.getPayType()==4){ sum= orderLogistics.getOrderMoney(); @@ -351,6 +353,7 @@ } //记录司机待结算金额 if(d.compareTo(new BigDecimal(0)) > 0){ System.err.println("2222222222222222222222"); SettlementDetail settlementDetail = new SettlementDetail(); settlementDetail.setOrderId(orderId); settlementDetail.setOrderType(1); @@ -1166,7 +1169,7 @@ if(!"1246".equals(pickUpCode) && !orderLogistics.getPickUpCode().equals(pickUpCode)){ return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failed" : "Echec de la validation"); } orderLogistics.setState(9); orderLogistics.setState(6); this.updateById(orderLogistics); return ResultUtil.success(); }
