取消运单

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

@@ -110,7 +110,7 @@ public class BizWaybillOrderController extends BaseController
     {
 
         try{
-            return toAjax(bizWaybillOrderService.updateBizWaybillOrder(bizWaybillOrder));
+            return toAjax(bizWaybillOrderService.canceleBizWaybillOrder(bizWaybillOrder));
         }
         catch(ServiceException e){
             return AjaxResult.error("取消运单失败！ 原因:"+e.getMessage());

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/mapper/BizWaybillOrderMapper.java

@@ -67,4 +67,7 @@ public interface BizWaybillOrderMapper
     public BizWaybillOrder selectBizWaybillOrderByQuery(BizWaybillOrder query);
 
     void updateBizWaybillOrderState(BizWaybillOrder bizWaybillOrder);
+
+
+    int canceleBizWaybillOrder(BizWaybillOrder bizWaybillOrder);
 }

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

@@ -111,14 +111,9 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
      * @return 结果
      */
     @Override
-    public int updateBizWaybillOrder(BizWaybillOrder bizWaybillOrder) throws UnsupportedEncodingException {
+    public int updateBizWaybillOrder(BizWaybillOrder bizWaybillOrder){
         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);
+        return  bizWaybillOrderMapper.updateBizWaybillOrder(bizWaybillOrder);
     }
 
     /**
@@ -155,4 +150,15 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
          bizWaybillOrderMapper.updateBizWaybillOrderState(bizWaybillOrder);
 
     }
+
+    @Override
+    public int canceleBizWaybillOrder(BizWaybillOrder bizWaybillOrder) throws UnsupportedEncodingException {
+        JSONObject orderObject= logisticsOrderService.cancelOrder(bizWaybillOrder);
+        if(!orderObject.getBooleanValue("success")){
+            throw new ServiceException("取消下单失败！ 原因:"+orderObject.getString("msg"));
+        }
+        bizWaybillOrder.setWaybillNo("7");
+        return bizWaybillOrderMapper.canceleBizWaybillOrder(bizWaybillOrder);
+
+    }
 }

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/BizWaybillOrderMapper.xml

@@ -317,4 +317,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where external_waybill_no = #{externalWaybillNo}
     </update>
+
+
+    <update id="canceleBizWaybillOrder" parameterType="com.ruoyi.logistics.domain.BizWaybillOrder">
+        update biz_waybill_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="waybillNo != null">waybill_no = #{waybillNo},</if>
+            <if test="externalWaybillNo != null">external_waybill_no = #{externalWaybillNo},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
+            <if test="senderName != null">sender_name = #{senderName},</if>
+            <if test="senderPhone != null">sender_phone = #{senderPhone},</if>
+            <if test="senderProvince != null">sender_province = #{senderProvince},</if>
+            <if test="senderCity != null">sender_city = #{senderCity},</if>
+            <if test="senderCounty != null">sender_county = #{senderCounty},</if>
+            <if test="senderAddress != null">sender_address = #{senderAddress},</if>
+            <if test="receiverName != null">receiver_name = #{receiverName},</if>
+            <if test="receiverPhone != null">receiver_phone = #{receiverPhone},</if>
+            <if test="receiverProvince != null">receiver_province = #{receiverProvince},</if>
+            <if test="receiverCity != null">receiver_city = #{receiverCity},</if>
+            <if test="receiverCounty != null">receiver_county = #{receiverCounty},</if>
+            <if test="receiverAddress != null">receiver_address = #{receiverAddress},</if>
+            <if test="goodsName != null">goods_name = #{goodsName},</if>
+            <if test="goodsWeight != null">goods_weight = #{goodsWeight},</if>
+            <if test="goodsVolume != null">goods_volume = #{goodsVolume},</if>
+            <if test="goodsQty != null">goods_qty = #{goodsQty},</if>
+            <if test="orderStatus != null">order_status = #{orderStatus},</if>
+            <if test="pickupType != null">pickup_type = #{pickupType},</if>
+            <if test="sendStartTime != null">send_start_time = #{sendStartTime},</if>
+            <if test="sendEndTime != null">send_end_time = #{sendEndTime},</if>
+            <if test="pickupTime != null">pickup_time = #{pickupTime},</if>
+            <if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
+            <if test="signTime != null">sign_time = #{signTime},</if>
+            <if test="cancelReason != null">cancel_reason = #{cancelReason},</if>
+            <if test="parentWaybillId != null">parent_waybill_id = #{parentWaybillId},</if>
+            <if test="invoiceFlag != null">invoice_flag = #{invoiceFlag},</if>
+            <if test="adjustFlag != null">adjust_flag = #{adjustFlag},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+        </trim>
+        where waybill_id = #{waybillId}
+    </update>
+
 </mapper>