Browse Source

FIX: 快递鸟兼容直播订房

xdd 2 weeks ago
parent
commit
e36e8aeb65

+ 4 - 1
fs-admin/src/main/java/com/fs/live/controller/LiveOrderController.java

@@ -44,6 +44,7 @@ import com.fs.store.service.IFsExpressService;
 import com.fs.store.service.IFsUserService;
 import com.fs.store.service.IFsUserService;
 import com.fs.task.LiveTask;
 import com.fs.task.LiveTask;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import org.apache.http.util.Asserts;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -442,8 +443,10 @@ public class LiveOrderController extends BaseController
     public AjaxResult editDeliveryId(@RequestBody FsStoreDelivers deliveryDTO) {
     public AjaxResult editDeliveryId(@RequestBody FsStoreDelivers deliveryDTO) {
         LiveOrder liveOrder = liveOrderService.selectLiveOrderByOrderId(String.valueOf(deliveryDTO.getOrderId()));
         LiveOrder liveOrder = liveOrderService.selectLiveOrderByOrderId(String.valueOf(deliveryDTO.getOrderId()));
 
 
+        Asserts.notNull(deliveryDTO.getDeliverId(),"快递号不能为空!");
+        Asserts.notNull(deliveryDTO.getDeliverSn(),"快递类型不能为空!");
+
         liveOrder.setDeliverySn(deliveryDTO.getDeliverId());
         liveOrder.setDeliverySn(deliveryDTO.getDeliverId());
-        liveOrder.setDeliveryName(deliveryDTO.getDeliverName());
         liveOrder.setDeliveryCode(deliveryDTO.getDeliverSn());
         liveOrder.setDeliveryCode(deliveryDTO.getDeliverSn());
         liveOrderService.updateLiveOrder(liveOrder);
         liveOrderService.updateLiveOrder(liveOrder);