约可拉运吨数接口

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -27,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -135,4 +136,10 @@ public class GoodsOrderController {
     public Result<String> orderCancel(@RequestParam(value = "orderNo") String orderNo) {
         return Result.ok(orderGoodsService.orderCancel(orderNo));
     }
+
+    @ApiOperation(value = "获取当前订单可取消吨数", notes = "<br>By:胡宇帆")
+    @GetMapping("/orderCancelResidueWeight")
+    public Result<BigDecimal> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType) {
+        return Result.ok(orderGoodsService.orderCancelResidueWeight(orderNo,optionType));
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -77,4 +77,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
                                                @Param("confirmTime")String confirmTime,
                                                @Param("list")List<String> orderGoodsNoList
     );
+
+    List<OrderChild> selectResidueWeight(String orderNo);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -258,6 +258,13 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         );
     }
 
+    @Override
+    public List<OrderChild> selectResidueWeight(String orderNo) {
+        return baseMapper.selectList(lambdaQuery().eq(OrderChild::getOrderNo,orderNo)
+                .lt(OrderChild::getStatus, OrderChildEnum.Status.ARRIVE_SEND.getCode())
+        );
+    }
+
     @Override
     public List<OrderChild> getOrderChildByOrderNo(String orderNo) {
         LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper();

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -36,7 +36,8 @@ public interface OrderGoodsService {
     List<OrderGoods> getOrderGoodsList(String orderNo, LocalDateTime lastArriveSendTime);
 
     String orderCancel(String orderNo);
-    String orderCancel();
+
+    BigDecimal orderCancelResidueWeight(String orderNo,String optionType);
 
     void updateEditOrderGoods(UpdateEditOrderGoodsParam param);
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.order.params.UpdateEditOrderGoodsParam;
 import com.clx.order.vo.feign.FeignOrderVO;
+import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
+import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OrderGoodsDriverTruck;
 import com.clx.performance.model.OrderGoodsTruckBind;
@@ -62,6 +65,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Autowired
     private UserClxFeign userClxFeign;
 
+    @Autowired
+    private OrderChildDao orderChildDao;
+
     @Override
     public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
         OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo).map(orderGoodsStruct::convert).get();
@@ -193,8 +199,25 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         }
     }
 
-    public String getOrderRe(String orderNo) {
-        return "";
+    @Override
+    public BigDecimal orderCancelResidueWeight(String orderNo, String optionType) {
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
+
+        if (StringUtils.equals(optionType,"1")) {
+            return new BigDecimal(orderInfoFeign.getResidueWeight());
+        } else {
+            String residueWeight = orderInfoFeign.getResidueWeight();
+            List<OrderChild> orderChildList = orderChildDao.selectResidueWeight(orderNo);
+            BigDecimal childResidueWeight = orderChildList.stream().map(OrderChild::getWeight).reduce(BigDecimal::add).get();
+            return childResidueWeight.add(new BigDecimal(residueWeight));
+        }
+
+    }
+
+
+    @Override
+    public void updateEditOrderGoods(UpdateEditOrderGoodsParam param) {
+
     }