取消运单

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizWaybillOrderController.java

@@ -101,14 +101,22 @@ public class BizWaybillOrderController extends BaseController
 
 
     /**
-     * 修改运单管理
+     * 取消运单
      */
     @RequiresPermissions("system:order:edit")
     @Log(title = "运单管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BizWaybillOrder bizWaybillOrder)
     {
-        return toAjax(bizWaybillOrderService.updateBizWaybillOrder(bizWaybillOrder));
+
+        try{
+            return toAjax(bizWaybillOrderService.updateBizWaybillOrder(bizWaybillOrder));
+        }
+        catch(ServiceException e){
+            return AjaxResult.error("取消运单失败！ 原因:"+e.getMessage());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/IBizWaybillOrderService.java

@@ -44,7 +44,7 @@ public interface IBizWaybillOrderService
      * @param bizWaybillOrder 运单管理
      * @return 结果
      */
-    public int updateBizWaybillOrder(BizWaybillOrder bizWaybillOrder);
+    public int updateBizWaybillOrder(BizWaybillOrder bizWaybillOrder) throws UnsupportedEncodingException;
 
     /**
      * 批量删除运单管理

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizWaybillOrderServiceImpl.java

@@ -111,11 +111,13 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
      * @return 结果
      */
     @Override
-    public int updateBizWaybillOrder(BizWaybillOrder bizWaybillOrder)
-    {
+    public int updateBizWaybillOrder(BizWaybillOrder bizWaybillOrder) throws UnsupportedEncodingException {
         bizWaybillOrder.setUpdateTime(DateUtils.getNowDate());
-
-
+        JSONObject orderObject= logisticsOrderService.cancelOrder(bizWaybillOrder);
+        if(!orderObject.getBooleanValue("success")){
+            throw new ServiceException("取消下单失败！ 原因:"+orderObject.getString("msg"));
+        }
+        bizWaybillOrder.setWaybillNo("7");
         return bizWaybillOrderMapper.updateBizWaybillOrder(bizWaybillOrder);
     }
 

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/SFLogisticsService.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 
@@ -116,6 +117,9 @@ public class SFLogisticsService implements LogisticsService {
         //预下单 已返回订单id
         orderData.put("orderId",bizWaybillOrder.getWaybillNo());
         orderData.put("monthlyCard",sfExpressConfig.getMonthlyCord());//月结账户
+        //上门取件时间
+        // 定义日期格式
+        orderData.put("sendStartTm",bizWaybillOrder.getSendStartTime());
         //包裹数
         orderData.put("parcelQty",bizWaybillOrder.getGoodsQty());
         //产品类别
@@ -243,9 +247,7 @@ public class SFLogisticsService implements LogisticsService {
         JSONObject jsonObject = JSON.parseObject(result).getJSONObject("apiResultData");
         JSONObject resultInfo = new JSONObject();
             if (jsonObject != null && jsonObject.containsKey("success") && jsonObject.getBooleanValue("success")) {
-
                 resultInfo.put("success", true);
-                resultInfo.put("data", bizWaybillOrder);
                 resultInfo.put("msg", "订单取消成功！");
                 return resultInfo;
             } else {